Merge pull request #143 from thiagobustamante/master

Fix #138
TreeGateway · May 28, 2018 · cb07b93 · cb07b93
2 parents 2cf7cb0 + 4d5caae
commit cb07b93
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tree-gateway",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "homepage": "http://treegateway.org",
   "description": "The Tree Gateway API Gateway",
   "author": "Thiago da Rosa de Bustamante <trbustamante@gmail.com>",

diff --git a/src/pipeline/group.ts b/src/pipeline/group.ts
@@ -143,7 +143,16 @@ export function buildGroupDenyTest(request: string, groups: Array<Group>, names:
                     if (i > 0) {
                         func.push(`&&`);
                     }
-                    func.push(`!(mm.isMatch(${request}.path, '${normalizePath(path)}'))`);
+                    if (path && path.indexOf('&') > 0) {
+                        const expressions = path.split('&')
+                                            .map(p => normalizePath(p))
+                                            .filter(p => p.trim().length > 0)
+                                            .map(p => `'${p}'`)
+                                            .join(',');
+                        func.push(`!(mm.all(${request}.path, [${expressions}]))`);
+                    } else {
+                        func.push(`!(mm.isMatch(${request}.path, '${normalizePath(path)}'))`);
+                    }
                 });
                 func.push(`)`);
             }