free-be-account 0.0.27 → 0.0.29

package/index.js

@@ -27,16 +27,15 @@ try {
 let __app_service_list_saved = false;
 let __saved_service_list;
 
-const __getServiceList = async (res, filter = { Enabled: true }, scopeFilter) => {
+const __getServiceList = async (res, filter, scopeFilter) => {
     // add app.serviceList into db if not yet
     if (!__app_service_list_saved) {
         await res.app.modules.account.utils.saveServiceList(res.app);
-        __app_service_list_saved = true;
-    } else if (!filter){
+    } else if (!filter) {
         return __saved_service_list;
     }
 
-    const allPerms = await res.app.models.permission.find(filter).lean();
+    const allPerms = await res.app.models.permission.find(filter ? { ...filter, Enabled: true } : { Enabled: true }).lean();
 
     const permList = {};
     if (allPerms && allPerms.length > 0) {
@@ -60,7 +59,7 @@ const __getServiceList = async (res, filter = { Enabled: true }, scopeFilter) =>
                     },
                     ((doc.Scope || []).length <= 0) ? {} : {
                         Scope: doc.Scope.map(sc => {
-                            const dso = app.getContainerContent('DataScope').find(ds => ds.Name === sc.Name);
+                            const dso = res.app.getContainerContent('DataScope').find(ds => ds.Name === sc.Name);
 
                             if (!dso) {
                                 return {};
@@ -97,8 +96,9 @@ const __getServiceList = async (res, filter = { Enabled: true }, scopeFilter) =>
         })
     }
 
-    if (!filter) {
+    if (!filter && !__app_service_list_saved) {
         __saved_service_list = permList;
+        __app_service_list_saved = true;
     }
 
     return permList;
@@ -1041,10 +1041,33 @@ module.exports = (app) => ({
                     const uuid = uuidv1();
 
                     res.app.cache.put(`captcha_${uuid}`, captcha.text, m.config.captcha.cache || 300000);
-                    const matches = captcha.data.match(/d="([^"]*)"/g);
+
+                    const pathAndStrokeList = [];
+                    // 1. 先把每个 <path .../> 整体拎出来
+                    const pathRE = /<path\b[^>]*\/>/gi;
+
+                    // 2. 对每个标签再抽属性（顺序无关，可缺）
+                    const attrRE = /\b(d|stroke|fill)=["']([^"']*)["']/gi;
+
+                    let pathMatch;
+
+                    while ((pathMatch = pathRE.exec(captcha.data)) !== null) {
+                        const obj = { p: undefined, s: undefined, f: undefined };
+                        let attrMatch;
+                        attrRE.lastIndex = 0;          // 重置内层正则
+                        while ((attrMatch = attrRE.exec(pathMatch[0])) !== null) {
+                            const [, key, val] = attrMatch;
+                            if (key === 'd')      obj.p = val;
+                            if (key === 'stroke') obj.s = val;
+                            if (key === 'fill')   obj.f = val;
+                        }
+                        
+                        pathAndStrokeList.push(obj);
+                    }
 
                     res.endWithData({
-                        captcha: matches.map((m) => m.replace('d="', '').replace('"', '')),
+                        captcha: pathAndStrokeList,
+                        f: m.config.captcha.options.background,
                         id: uuid,
                     });
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "free-be-account",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "main": "index.js",
   "license": "UNLICENSED",
   "repository": {

package/utils.js

@@ -210,6 +210,38 @@ async function saveServiceList (app, clean=false) {
     await checkService(serviceList, undefined, '');
 }
 
+/**
+ * 给指定的静态资源文件添加权限控制记录
+ * 
+ * @param {String or Array} assets asset file(s)
+ * @param {String or Object} user The current user
+ * @param {String} users Users
+ * @param {String} perms Permissions
+ * @param {String} refs Referers
+ * @returns
+ */
+async function addPermControlToAssetFiles(afile, user, users, perms, refs) {
+    if (!afile) return;
+
+    if (!Array.isArray(afile)) {
+        afile = [afile];
+    }
+
+    for (let i = 0; i < afile.length; i += 1) {
+        const af = afile[i];
+
+        const assetsFilePath = af.split(/[\\|/]/g).slice(-2).join('/');
+        await app.models.staticResourcePermissionControl.create({
+            User: user?.id || user,
+            ResourcePath: assetsFilePath,
+
+            Users: users || '',
+            Permissions: perms || '',
+            Referers: refs || '',
+        });
+    }
+}
+
 module.exports = {
     clearPermission,
     getPermissionPathList,
@@ -218,4 +250,5 @@ module.exports = {
     getClearPwd,
     crypto,
     saveServiceList,
+    addPermControlToAssetFiles,
 }