feat(sid): generating uuid to set sid in statements as default

re #27
roggervalf · Oct 10, 2020 · c23d6e6 · c23d6e6
1 parent 9e83b7c
commit c23d6e6
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 22 deletions.
diff --git a/src/ActionBasedPolicy.test.ts b/src/ActionBasedPolicy.test.ts
@@ -32,7 +32,9 @@ describe('ActionBasedPolicy Class', () => {
         }
       ];
       const policy = new ActionBasedPolicy(statements);
-      expect(policy.getStatements()).toEqual(statements);
+      const exportedStatements = policy.getStatements();
+      expect(exportedStatements).toMatchObject(statements);
+      expect(exportedStatements[0].sid).not.toBeFalsy();
     });
   });
 

diff --git a/src/ActionBasedPolicy.ts b/src/ActionBasedPolicy.ts
@@ -14,11 +14,15 @@ export class ActionBasedPolicy {
     config: ActionBasedType[],
     conditionResolver?: ConditionResolver
   ) {
-    const statementInstances = config.map(s => new ActionBased(s));
+    const statementInstances = config.map(
+      statement => new ActionBased(statement)
+    );
     this.allowStatements = statementInstances.filter(s => s.effect === 'allow');
     this.denyStatements = statementInstances.filter(s => s.effect === 'deny');
     this.conditionResolver = conditionResolver;
-    this.statements = config;
+    this.statements = this.statements = statementInstances.map(statement =>
+      statement.getStatement()
+    );
   }
   getStatements(): ActionBasedType[] {
     return this.statements;

diff --git a/src/ActionBasedStatement.ts b/src/ActionBasedStatement.ts
@@ -19,7 +19,7 @@ class ActionBased extends Statement {
           ? [action.notAction]
           : action.notAction;
     }
-    this.statement = action;
+    this.statement = { ...action, sid: this.sid };
   }
 
   getStatement(): ActionBasedType {

diff --git a/src/IdentityBasedPolicy.test.ts b/src/IdentityBasedPolicy.test.ts
@@ -35,7 +35,9 @@ describe('IdentityBasedPolicy Class', () => {
         }
       ];
       const policy = new IdentityBasedPolicy(statements);
-      expect(policy.getStatements()).toEqual(statements);
+      const exportedStatements = policy.getStatements();
+      expect(exportedStatements).toMatchObject(statements);
+      expect(exportedStatements[0].sid).not.toBeFalsy();
     });
   });
 

diff --git a/src/IdentityBasedPolicy.ts b/src/IdentityBasedPolicy.ts
@@ -14,11 +14,15 @@ export class IdentityBasedPolicy {
     config: IdentityBasedType[],
     conditionResolver?: ConditionResolver
   ) {
-    const statementInstances = config.map(s => new IdentityBased(s));
+    const statementInstances = config.map(
+      statement => new IdentityBased(statement)
+    );
     this.allowStatements = statementInstances.filter(s => s.effect === 'allow');
     this.denyStatements = statementInstances.filter(s => s.effect === 'deny');
     this.conditionResolver = conditionResolver;
-    this.statements = config;
+    this.statements = statementInstances.map(statement =>
+      statement.getStatement()
+    );
   }
   getStatements(): IdentityBasedType[] {
     return this.statements;

diff --git a/src/IdentityBasedStatement.ts b/src/IdentityBasedStatement.ts
@@ -41,7 +41,7 @@ class IdentityBased extends Statement {
           ? [identity.notAction]
           : identity.notAction;
     }
-    this.statement = identity;
+    this.statement = { ...identity, sid: this.sid };
   }
 
   getStatement(): IdentityBasedType {

diff --git a/src/ResourceBasedPolicy.test.ts b/src/ResourceBasedPolicy.test.ts
@@ -38,7 +38,9 @@ describe('ResourceBasedPolicy Class', () => {
         }
       ];
       const policy = new ResourceBasedPolicy(statements);
-      expect(policy.getStatements()).toEqual(statements);
+      const exportedStatements = policy.getStatements();
+      expect(exportedStatements).toMatchObject(statements);
+      expect(exportedStatements[0].sid).not.toBeFalsy();
     });
   });
 

diff --git a/src/ResourceBasedPolicy.ts b/src/ResourceBasedPolicy.ts
@@ -14,11 +14,15 @@ export class ResourceBasedPolicy {
     config: ResourceBasedType[],
     conditionResolver?: ConditionResolver
   ) {
-    const statementInstances = config.map(s => new ResourceBased(s));
+    const statementInstances = config.map(
+      statement => new ResourceBased(statement)
+    );
     this.allowStatements = statementInstances.filter(s => s.effect === 'allow');
     this.denyStatements = statementInstances.filter(s => s.effect === 'deny');
     this.conditionResolver = conditionResolver;
-    this.statements = config;
+    this.statements = statementInstances.map(statement =>
+      statement.getStatement()
+    );
   }
   getStatements(): ResourceBasedType[] {
     return this.statements;

diff --git a/src/ResourceBasedStatement.ts b/src/ResourceBasedStatement.ts
@@ -57,7 +57,7 @@ class ResourceBased extends Statement {
           ? [identity.notPrincipal]
           : identity.notPrincipal;
     }
-    this.statement = identity;
+    this.statement = { ...identity, sid: this.sid };
   }
 
   getStatement(): ResourceBasedType {

diff --git a/src/Statement.ts b/src/Statement.ts
@@ -6,6 +6,7 @@ import {
   MatchConditionInterface
 } from './types';
 import { getValueFromPath } from './utils/getValueFromPath';
+import { generateUUID } from './utils/generateUUID';
 
 const reDelimiters = /\${([^}]*)}/g;
 const trim = / +(?= )|^\s+|\s+$/g;
@@ -27,10 +28,16 @@ export function applyContext(str: string, context?: Context): string {
 }
 
 class Statement {
-  effect: EffectBlock;
+  protected sid: string;
   protected readonly condition?: ConditionBlock;
+  effect: EffectBlock;
 
-  constructor({ effect = 'allow', condition }: StatementInterface) {
+  constructor({ sid, effect = 'allow', condition }: StatementInterface) {
+    if (!sid) {
+      this.sid = generateUUID();
+    } else {
+      this.sid = sid;
+    }
     this.effect = effect;
     this.condition = condition;
   }

diff --git a/src/utils/generateUUID.ts b/src/utils/generateUUID.ts
@@ -1,9 +1,9 @@
 import { MersenneTwister } from './mersenneTwister';
 
-const replacePlaceholders = (placeholder: string): string => {
-  const mersenne = new MersenneTwister();
-  const random = Math.floor(mersenne.randomInt32() * (1.0 / 4294967296.0) * 15);
-  // Workaround problem in Float point arithmetics for e.g. 6681493 / 0.01
+const replacePlaceholders = (mersenne: MersenneTwister) => (
+  placeholder: string
+): string => {
+  const random = Math.floor(mersenne.randomReal2() * 16);
 
   const value = placeholder === 'x' ? random : (random & 0x3) | 0x8;
   return value.toString(16);
@@ -18,14 +18,15 @@ const replacePlaceholders = (placeholder: string): string => {
  * @example
  * ```javascript
  * generateUUID()
- * // => 84cc8800-6000-4555-844b-bbb333888888
+ * // => 49e71c40-9b21-4371-9699-2def33f62e66
  *
  * generateUUID()
- * // => 3dd002aa-2111-4000-b333-777666666666
+ * // => da94f128-4247-48e3-bc73-d0cae46b5093
  * ```
  */
 export function generateUUID(): string {
+  const mersenne = new MersenneTwister();
   const RFC4122_TEMPLATE = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx';
 
-  return RFC4122_TEMPLATE.replace(/[xy]/g, replacePlaceholders);
+  return RFC4122_TEMPLATE.replace(/[xy]/g, replacePlaceholders(mersenne));
 }
diff --git a/src/utils/isSymbol.ts b/src/utils/isSymbol.ts
@@ -8,12 +8,13 @@ import { getTag } from './getTag';
  * @param {*} value The value to check.
  * @returns {boolean} Returns `true` if `value` is a symbol, else `false`.
  * @example
- *
+ * ```javascript
  * isSymbol(Symbol())
  * // => true
  *
  * isSymbol('abc')
  * // => false
+ * ```
  */
 export function isSymbol(value?: any): boolean {
   const type = typeof value;