@j-schreiber/sf-cli-security-audit 0.3.0 → 0.4.1

package/lib/libs/{policies → core/registries}/rules/enforceUserPermsClassificationOnProfiles.js

@@ -1,6 +1,7 @@
 import { Messages } from '@salesforce/core';
 import { isNullish } from '../../utils.js';
-import { permissionAllowedInPreset, PolicyRiskLevel } from '../types.js';
+import { PermissionRiskLevel } from '../../classification-types.js';
+import { permissionAllowedInPreset } from '../../policy-types.js';
 import PolicyRule from './policyRule.js';
 const messages = Messages.loadMessages('@j-schreiber/sf-cli-security-audit', 'rules.enforceClassificationPresets');
 export default class EnforceUserPermsClassificationOnProfiles extends PolicyRule {
@@ -16,7 +17,7 @@ export default class EnforceUserPermsClassificationOnProfiles extends PolicyRule
                     const identifier = [profile.name, userPerm.name];
                     const classifiedUserPerm = this.resolveUserPermission(userPerm.name);
                     if (classifiedUserPerm) {
-                        if (classifiedUserPerm.classification === PolicyRiskLevel.BLOCKED) {
+                        if (classifiedUserPerm.classification === PermissionRiskLevel.BLOCKED) {
                             result.violations.push({
                                 identifier,
                                 message: messages.getMessage('violations.permission-is-blocked'),
@@ -31,7 +32,7 @@ export default class EnforceUserPermsClassificationOnProfiles extends PolicyRule
                                 ]),
                             });
                         }
-                        else if (classifiedUserPerm.classification === PolicyRiskLevel.UNKNOWN) {
+                        else if (classifiedUserPerm.classification === PermissionRiskLevel.UNKNOWN) {
                             result.warnings.push({
                                 identifier,
                                 message: messages.getMessage('warnings.permission-unknown'),

package/lib/libs/core/registries/rules/enforceUserPermsClassificationOnProfiles.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"enforceUserPermsClassificationOnProfiles.js","sourceRoot":"","sources":["../../../../../src/libs/core/registries/rules/enforceUserPermsClassificationOnProfiles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,UAA2B,MAAM,iBAAiB,CAAC;AAE1D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,oCAAoC,CAAC,CAAC;AAEnH,MAAM,CAAC,OAAO,OAAO,wCAAyC,SAAQ,UAA2B;IAC/F,YAAmB,IAAiB;QAClC,KAAK,CAAC,IAAI,CAAC,CAAC;IACd,CAAC;IAEM,GAAG,CAAC,OAA0C;QACnD,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QACjC,MAAM,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;QAClD,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAClD,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;gBACjD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;oBACpD,MAAM,UAAU,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;oBACjD,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;oBACrE,IAAI,kBAAkB,EAAE,CAAC;wBACvB,IAAI,kBAAkB,CAAC,cAAc,KAAK,mBAAmB,CAAC,OAAO,EAAE,CAAC;4BACtE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC;gCACrB,UAAU;gCACV,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,kCAAkC,CAAC;6BACjE,CAAC,CAAC;wBACL,CAAC;6BAAM,IAAI,CAAC,yBAAyB,CAAC,kBAAkB,CAAC,cAAc,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;4BACzF,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC;gCACrB,UAAU;gCACV,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,2CAA2C,EAAE;oCACxE,kBAAkB,CAAC,cAAc;oCACjC,OAAO,CAAC,MAAM;iCACf,CAAC;6BACH,CAAC,CAAC;wBACL,CAAC;6BAAM,IAAI,kBAAkB,CAAC,cAAc,KAAK,mBAAmB,CAAC,OAAO,EAAE,CAAC;4BAC7E,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;gCACnB,UAAU;gCACV,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,6BAA6B,CAAC;6BAC5D,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;4BACnB,UAAU;4BACV,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,+CAA+C,CAAC;yBAC9E,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;CACF"}

package/lib/libs/core/registries/rules/noUserCanSelfAuthorize.d.ts

@@ -0,0 +1,7 @@
+import { PartialPolicyRuleResult, RuleAuditContext } from '../types.js';
+import { ResolvedConnectedApp } from '../connectedApps.js';
+import PolicyRule, { RuleOptions } from './policyRule.js';
+export default class NoUserCanSelfAuthorize extends PolicyRule<ResolvedConnectedApp> {
+    constructor(opts: RuleOptions);
+    run(context: RuleAuditContext<ResolvedConnectedApp>): Promise<PartialPolicyRuleResult>;
+}

package/lib/libs/core/registries/rules/noUserCanSelfAuthorize.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"noUserCanSelfAuthorize.js","sourceRoot":"","sources":["../../../../../src/libs/core/registries/rules/noUserCanSelfAuthorize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,OAAO,UAA2B,MAAM,iBAAiB,CAAC;AAE1D,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,qBAAqB,CAAC,CAAC;AAEpG,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,UAAgC;IAClF,YAAmB,IAAiB;QAClC,KAAK,CAAC,IAAI,CAAC,CAAC;IACd,CAAC;IAEM,GAAG,CAAC,OAA+C;QACxD,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QACjC,MAAM,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC;QACvD,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACnD,IAAI,CAAC,GAAG,CAAC,6BAA6B,EAAE,CAAC;gBACvC,IAAI,GAAG,CAAC,2BAA2B,EAAE,CAAC;oBACpC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;wBACnB,UAAU,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC;wBACtB,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,yDAAyD,CAAC;qBACxF,CAAC,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC;wBACrB,UAAU,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC;wBACtB,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,qCAAqC,CAAC;qBACpE,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;CACF"}

package/lib/libs/{policies → core/registries}/rules/policyRule.d.ts

@@ -1,16 +1,16 @@
-import { PartialPolicyRuleResult, RowLevelPolicyRule, RuleAuditContext } from '../interfaces/policyRuleInterfaces.js';
-import { AuditRunConfig, NamedPermissionsClassification } from '../../config/audit-run/schema.js';
+import { PartialPolicyRuleResult, RowLevelPolicyRule, RuleAuditContext } from '../types.js';
+import { AuditRunConfig, NamedPermissionsClassification } from '../../file-mgmt/schema.js';
 export type RuleOptions = {
     auditContext: AuditRunConfig;
     ruleDisplayName: string;
     ruleConfig?: unknown;
 };
-export default abstract class PolicyRule implements RowLevelPolicyRule {
+export default abstract class PolicyRule<EntityType> implements RowLevelPolicyRule<EntityType> {
     auditContext: AuditRunConfig;
     ruleDisplayName: string;
     constructor(opts: RuleOptions);
     protected initResult(): PartialPolicyRuleResult;
     protected resolveUserPermission(permName: string): NamedPermissionsClassification | undefined;
     protected resolveCustomPermission(permName: string): NamedPermissionsClassification | undefined;
-    abstract run(context: RuleAuditContext): Promise<PartialPolicyRuleResult>;
+    abstract run(context: RuleAuditContext<EntityType>): Promise<PartialPolicyRuleResult>;
 }

package/lib/libs/core/registries/rules/policyRule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"policyRule.js","sourceRoot":"","sources":["../../../../../src/libs/core/registries/rules/policyRule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAK5C,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAQ7D,MAAM,CAAC,OAAO,OAAgB,UAAU;IAC/B,YAAY,CAAiB;IAC7B,eAAe,CAAS;IAE/B,YAAmB,IAAiB;QAClC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACtC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;IAC9C,CAAC;IAES,UAAU;QAClB,OAAO;YACL,QAAQ,EAAE,IAAI,CAAC,eAAe;YAC9B,UAAU,EAAE,IAAI,KAAK,EAAuB;YAC5C,eAAe,EAAE,IAAI,KAAK,EAA2B;YACrD,QAAQ,EAAE,IAAI,KAAK,EAAwB;YAC3C,MAAM,EAAE,IAAI,KAAK,EAAwB;SAC1C,CAAC;IACJ,CAAC;IAES,qBAAqB,CAAC,QAAgB;QAC9C,OAAO,kBAAkB,CACvB,QAAQ,EACR,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,eAAe,EAAE,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CACjF,CAAC;IACJ,CAAC;IAES,uBAAuB,CAAC,QAAgB;QAChD,OAAO,kBAAkB,CACvB,QAAQ,EACR,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,iBAAiB,EAAE,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CACnF,CAAC;IACJ,CAAC;CAGF;AAED,SAAS,kBAAkB,CACzB,QAAgB,EAChB,IAAgC;IAEhC,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AACxD,CAAC"}

package/lib/libs/{policies/interfaces/policyRuleInterfaces.d.ts → core/registries/types.d.ts}

@@ -1,13 +1,21 @@
 import { Connection } from '@salesforce/core';
-import { AuditPolicyResult, PolicyRuleExecutionResult } from '../../audit/types.js';
-import { Optional } from '../../utils.js';
+import { AuditPolicyResult, PolicyRuleExecutionResult } from '../result-types.js';
+import { Optional } from '../utils.js';
+export declare const RuleRegistries: {
+    ConnectedApps: import("./connectedApps.js").default;
+    Profiles: import("./profiles.js").default;
+    PermissionSets: import("./permissionSets.js").default;
+};
 /**
  * A rule must only implement a subset of the rule result. All optional
  * properties are completed by the policy.
  */
 export type PartialPolicyRuleResult = Optional<PolicyRuleExecutionResult, 'isCompliant' | 'compliantEntities' | 'violatedEntities'>;
-export type RowLevelPolicyRule = {
-    run(context: RuleAuditContext): Promise<PartialPolicyRuleResult>;
+/**
+ *
+ */
+export type RowLevelPolicyRule<ResolvedEntityType> = {
+    run(context: RuleAuditContext<ResolvedEntityType>): Promise<PartialPolicyRuleResult>;
 };
 export type IPolicy = {
     run(context: AuditContext): Promise<AuditPolicyResult>;
@@ -18,10 +26,10 @@ export type AuditContext = {
      */
     targetOrgConnection: Connection;
 };
-export type RuleAuditContext = AuditContext & {
+export type RuleAuditContext<T> = AuditContext & {
     /**
      * Resolved entities from the policy. Can be permission sets,
      * profiles, users, connected apps, etc.
      */
-    resolvedEntities: Record<string, unknown>;
+    resolvedEntities: Record<string, T>;
 };

package/lib/libs/core/registries/types.js

@@ -0,0 +1,9 @@
+import { ConnectedAppsRegistry } from './connectedApps.js';
+import { PermissionSetsRegistry } from './permissionSets.js';
+import { ProfilesRegistry } from './profiles.js';
+export const RuleRegistries = {
+    ConnectedApps: ConnectedAppsRegistry,
+    Profiles: ProfilesRegistry,
+    PermissionSets: PermissionSetsRegistry,
+};
+//# sourceMappingURL=types.js.map

package/lib/libs/core/registries/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/libs/core/registries/types.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,aAAa,EAAE,qBAAqB;IACpC,QAAQ,EAAE,gBAAgB;IAC1B,cAAc,EAAE,sBAAsB;CACvC,CAAC"}

package/lib/libs/{audit/types.d.ts → core/result-types.d.ts}

@@ -35,6 +35,9 @@ export type EntityResolveError = {
      */
     message: string;
 };
+/**
+ * Generic message for a particular element of a rule
+ */
 export type RuleComponentMessage = {
     /**
      * Path to a component. This can be a developer name of a connected app,
@@ -46,6 +49,9 @@ export type RuleComponentMessage = {
      */
     message: string;
 };
+/**
+ *
+ */
 export type PolicyRuleSkipResult = {
     /**
      * Identifier of the rule, as it is configured in the policy.yml.
@@ -56,6 +62,10 @@ export type PolicyRuleSkipResult = {
      */
     skipReason: string;
 };
+/**
+ * Full execution summary of a single rule. Includes audited entities,
+ * violations, execution errors, etc.
+ */
 export type PolicyRuleExecutionResult = {
     /**
      * Identifier of the rule, as it is configured in the policy.yml.
@@ -94,6 +104,10 @@ export type PolicyRuleExecutionResult = {
      */
     warnings: RuleComponentMessage[];
 };
+/**
+ * Full execution result of a policy. Contains full results of each executed
+ * rule and more information about skipped rules, audited entities, etc.
+ */
 export type AuditPolicyResult = {
     /**
      * Flag that indicates, if the policy was executed.
@@ -132,6 +146,9 @@ export type AuditPolicyResult = {
      */
     ignoredEntities: EntityResolveError[];
 };
+/**
+ * The final audit result, contains all policy results.
+ */
 export type AuditResult = {
     /**
      * All executed policies were compliant.

package/lib/libs/core/result-types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=result-types.js.map

package/lib/libs/core/result-types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"result-types.js","sourceRoot":"","sources":["../../../src/libs/core/result-types.ts"],"names":[],"mappings":""}

package/lib/libs/{utils.d.ts → core/utils.d.ts}

@@ -1,3 +1,3 @@
-export declare function isEmpty(anyRecord?: Record<string, unknown>): boolean;
+export declare function isEmpty(anything?: unknown): boolean;
 export declare function isNullish(anything: unknown): boolean;
 export type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;

package/lib/libs/core/utils.js

@@ -0,0 +1,13 @@
+export function isEmpty(anything) {
+    if (isNullish(anything)) {
+        return true;
+    }
+    if (typeof anything === 'object') {
+        return Object.entries(anything).length === 0;
+    }
+    return false;
+}
+export function isNullish(anything) {
+    return !(Boolean(anything) && anything !== null);
+}
+//# sourceMappingURL=utils.js.map

package/lib/libs/core/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/libs/core/utils.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,OAAO,CAAC,QAAkB;IACxC,IAAI,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACjC,OAAO,MAAM,CAAC,OAAO,CAAC,QAAS,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,QAAiB;IACzC,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,KAAK,IAAI,CAAC,CAAC;AACnD,CAAC"}

package/lib/libs/policies/auditRun.d.ts

@@ -1,19 +1,36 @@
+import EventEmitter from 'node:events';
 import { Connection } from '@salesforce/core';
-import { AuditResult } from '../audit/types.js';
-import { AuditRunConfig } from '../config/audit-run/schema.js';
+import { AuditResult } from '../core/result-types.js';
+import { AuditRunConfig } from '../core/file-mgmt/schema.js';
+import Policy from './policy.js';
+type PolicyMap = Record<string, Policy>;
 export declare function startAuditRun(directoryPath: string): AuditRun;
+export type EntityResolveEvent = {
+    total: number;
+    resolved: number;
+    policyName: string;
+};
 /**
  * Instance of an audit run that manages high-level operations
  */
-export default class AuditRun {
+export default class AuditRun extends EventEmitter {
     configs: AuditRunConfig;
+    private executablePolicies?;
     constructor(configs: AuditRunConfig);
     /**
-     * Executes an initialised audit run. This runs enabled policies
-     * in parallel and runs all enabled rules per policy.
+     * Loads all policies, resolves entities and caches the results.
+     *
+     * @param targetOrgConnection
+     */
+    resolve(targetOrgConnection: Connection): Promise<PolicyMap>;
+    /**
+     * Executes an initialised audit run. Resolves policies entities
+     * and executes all rules.
      *
      * @param targetOrgConnection
      * @returns
      */
     execute(targetCon: Connection): Promise<Omit<AuditResult, 'orgId'>>;
+    private loadPolicies;
 }
+export {};

package/lib/libs/policies/auditRun.js

@@ -1,35 +1,74 @@
+// import fs from 'node:fs';
+import EventEmitter from 'node:events';
+import { loadAuditConfig } from '../core/file-mgmt/auditConfigFileManager.js';
 import ProfilePolicy from './profilePolicy.js';
 import PermissionSetPolicy from './permissionSetPolicy.js';
 import ConnectedAppPolicy from './connectedAppPolicy.js';
-import AuditConfig from './initialisation/auditConfig.js';
 export function startAuditRun(directoryPath) {
-    const conf = AuditConfig.load(directoryPath);
+    const conf = loadAuditConfig(directoryPath);
     return new AuditRun(conf);
 }
 /**
  * Instance of an audit run that manages high-level operations
  */
-export default class AuditRun {
+export default class AuditRun extends EventEmitter {
     configs;
+    executablePolicies;
     constructor(configs) {
+        super();
         this.configs = configs;
     }
     /**
-     * Executes an initialised audit run. This runs enabled policies
-     * in parallel and runs all enabled rules per policy.
+     * Loads all policies, resolves entities and caches the results.
+     *
+     * @param targetOrgConnection
+     */
+    async resolve(targetOrgConnection) {
+        if (this.executablePolicies) {
+            return this.executablePolicies;
+        }
+        this.executablePolicies = this.loadPolicies(this.configs);
+        const resolveResultPromises = [];
+        Object.values(this.executablePolicies).forEach((executable) => {
+            resolveResultPromises.push(executable.resolve({ targetOrgConnection }));
+        });
+        await Promise.all(resolveResultPromises);
+        return this.executablePolicies;
+    }
+    /**
+     * Executes an initialised audit run. Resolves policies entities
+     * and executes all rules.
      *
      * @param targetOrgConnection
      * @returns
      */
     async execute(targetCon) {
-        const executablePolicies = resolvePolicies(this.configs);
-        const results = await runPolicies(executablePolicies, targetCon);
+        this.executablePolicies = await this.resolve(targetCon);
+        const results = await runPolicies(this.executablePolicies, targetCon);
         return {
             auditDate: new Date().toISOString(),
             isCompliant: isCompliant(results),
             policies: results,
         };
     }
+    loadPolicies(config) {
+        const pols = {};
+        if (config.policies.Profiles) {
+            pols.Profiles = new ProfilePolicy(config.policies.Profiles.content, config);
+        }
+        if (config.policies.PermissionSets) {
+            pols.PermissionSets = new PermissionSetPolicy(config.policies.PermissionSets.content, config);
+        }
+        if (config.policies.ConnectedApps) {
+            pols.ConnectedApps = new ConnectedAppPolicy(config.policies.ConnectedApps.content, config);
+        }
+        Object.entries(pols).forEach(([policyName, policy]) => {
+            policy.addListener('entityresolve', (resolveStats) => {
+                this.emit(`entityresolve-${policyName}`, { policyName, ...resolveStats });
+            });
+        });
+        return pols;
+    }
 }
 function isCompliant(results) {
     const list = Object.values(results);
@@ -50,17 +89,4 @@ async function runPolicies(policies, targetOrgConnection) {
     });
     return results;
 }
-function resolvePolicies(config) {
-    const pols = {};
-    if (config.policies.Profiles) {
-        pols.Profiles = new ProfilePolicy(config.policies.Profiles.content, config);
-    }
-    if (config.policies.PermissionSets) {
-        pols.PermissionSets = new PermissionSetPolicy(config.policies.PermissionSets.content, config);
-    }
-    if (config.policies.ConnectedApps) {
-        pols.ConnectedApps = new ConnectedAppPolicy(config.policies.ConnectedApps.content, config);
-    }
-    return pols;
-}
 //# sourceMappingURL=auditRun.js.map

package/lib/libs/policies/auditRun.js.map

@@ -1 +1 @@
-{"version":3,"file":"auditRun.js","sourceRoot":"","sources":["../../../src/libs/policies/auditRun.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auditRun.js","sourceRoot":"","sources":["../../../src/libs/policies/auditRun.ts"],"names":[],"mappings":"AAAA,4BAA4B;AAC5B,OAAO,YAAY,MAAM,aAAa,CAAC;AAIvC,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAE/C,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAKzD,MAAM,UAAU,aAAa,CAAC,aAAqB;IACjD,MAAM,IAAI,GAAG,eAAe,CAAC,aAAa,CAAC,CAAC;IAC5C,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC;AAQD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,YAAY;IAGtB;IAFlB,kBAAkB,CAAa;IAEvC,YAA0B,OAAuB;QAC/C,KAAK,EAAE,CAAC;QADgB,YAAO,GAAP,OAAO,CAAgB;IAEjD,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,OAAO,CAAC,mBAA+B;QAClD,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC,kBAAkB,CAAC;QACjC,CAAC;QACD,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1D,MAAM,qBAAqB,GAAwC,EAAE,CAAC;QACtE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YAC5D,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC;QAC1E,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;QACzC,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,OAAO,CAAC,SAAqB;QACxC,IAAI,CAAC,kBAAkB,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACxD,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;QACtE,OAAO;YACL,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACnC,WAAW,EAAE,WAAW,CAAC,OAAO,CAAC;YACjC,QAAQ,EAAE,OAAO;SAClB,CAAC;IACJ,CAAC;IAEO,YAAY,CAAC,MAAsB;QACzC,MAAM,IAAI,GAAc,EAAE,CAAC;QAC3B,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;YAC7B,IAAI,CAAC,QAAQ,GAAG,IAAI,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC9E,CAAC;QACD,IAAI,MAAM,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC;YACnC,IAAI,CAAC,cAAc,GAAG,IAAI,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAChG,CAAC;QACD,IAAI,MAAM,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC;YAClC,IAAI,CAAC,aAAa,GAAG,IAAI,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC7F,CAAC;QACD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC,EAAE,EAAE;YACpD,MAAM,CAAC,WAAW,CAAC,eAAe,EAAE,CAAC,YAAoD,EAAE,EAAE;gBAC3F,IAAI,CAAC,IAAI,CAAC,iBAAiB,UAAU,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,YAAY,EAAE,CAAC,CAAC;YAC5E,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED,SAAS,WAAW,CAAC,OAAmB;IACtC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACpC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,CAAC,OAAO,IAAI,UAAU,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;AACtG,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,QAAmB,EAAE,mBAA+B;IAC7E,MAAM,YAAY,GAAsC,EAAE,CAAC;IAC3D,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE,EAAE;QAC3D,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC7B,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IACH,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACpD,MAAM,OAAO,GAAe,EAAE,CAAC;IAC/B,WAAW,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;QACnC,MAAM,SAAS,GAAG,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;QAClE,OAAO,CAAC,SAAS,CAAC,GAAG,YAAY,CAAC;IACpC,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/lib/libs/policies/connectedAppPolicy.d.ts

@@ -1,18 +1,9 @@
-import RuleRegistry from '../config/registries/ruleRegistry.js';
-import { AuditRunConfig, BasePolicyFileContent } from '../config/audit-run/schema.js';
-import { AuditContext } from './interfaces/policyRuleInterfaces.js';
+import { AuditRunConfig, BasePolicyFileContent } from '../core/file-mgmt/schema.js';
+import { AuditContext } from '../core/registries/types.js';
 import Policy, { ResolveEntityResult } from './policy.js';
-export type ResolvedConnectedApp = {
-    name: string;
-    origin: 'Installed' | 'OauthToken' | 'Owned';
-    onlyAdminApprovedUsersAllowed: boolean;
-    overrideByApiSecurityAccess: boolean;
-    useCount: number;
-    users: string[];
-};
 export default class ConnectedAppPolicy extends Policy {
     config: BasePolicyFileContent;
     auditConfig: AuditRunConfig;
-    constructor(config: BasePolicyFileContent, auditConfig: AuditRunConfig, registry?: RuleRegistry);
+    constructor(config: BasePolicyFileContent, auditConfig: AuditRunConfig, registry?: import("../core/registries/connectedApps.js").default);
     protected resolveEntities(context: AuditContext): Promise<ResolveEntityResult>;
 }

package/lib/libs/policies/connectedAppPolicy.js

@@ -1,11 +1,11 @@
-import ConnectedAppsRuleRegistry from '../config/registries/connectedApps.js';
-import { CONNECTED_APPS_QUERY, OAUTH_TOKEN_QUERY } from '../config/queries.js';
-import MdapiRetriever from '../mdapiRetriever.js';
-import Policy from './policy.js';
+import { CONNECTED_APPS_QUERY, OAUTH_TOKEN_QUERY } from '../core/constants.js';
+import { RuleRegistries } from '../core/registries/types.js';
+import MDAPI from '../core/mdapi/mdapiRetriever.js';
+import Policy, { getTotal } from './policy.js';
 export default class ConnectedAppPolicy extends Policy {
     config;
     auditConfig;
-    constructor(config, auditConfig, registry = new ConnectedAppsRuleRegistry()) {
+    constructor(config, auditConfig, registry = RuleRegistries.ConnectedApps) {
         super(config, auditConfig, registry);
         this.config = config;
         this.auditConfig = auditConfig;
@@ -14,19 +14,22 @@ export default class ConnectedAppPolicy extends Policy {
     async resolveEntities(context) {
         const successfullyResolved = {};
         const ignoredEntities = {};
-        const metadataApi = new MdapiRetriever(context.targetOrgConnection);
-        let overrideByApiSecurityAccess = false;
-        const apiSecurityAccessSetting = await metadataApi.retrieveConnectedAppSetting();
-        if (apiSecurityAccessSetting && apiSecurityAccessSetting.enableAdminApprovedAppsOnly) {
-            overrideByApiSecurityAccess = true;
-        }
+        const metadataApi = new MDAPI(context.targetOrgConnection);
+        this.emit('entityresolve', {
+            total: 0,
+            resolved: 0,
+        });
         const installedApps = await context.targetOrgConnection.query(CONNECTED_APPS_QUERY);
+        this.emit('entityresolve', {
+            total: installedApps.totalSize,
+            resolved: 0,
+        });
         installedApps.records.forEach((installedApp) => {
             successfullyResolved[installedApp.Name] = {
                 name: installedApp.Name,
                 origin: 'Installed',
                 onlyAdminApprovedUsersAllowed: installedApp.OptionsAllowAdminApprovedUsersOnly,
-                overrideByApiSecurityAccess,
+                overrideByApiSecurityAccess: false,
                 useCount: 0,
                 users: [],
             };
@@ -38,7 +41,7 @@ export default class ConnectedAppPolicy extends Policy {
                     name: token.AppName,
                     origin: 'OauthToken',
                     onlyAdminApprovedUsersAllowed: false,
-                    overrideByApiSecurityAccess,
+                    overrideByApiSecurityAccess: false,
                     useCount: token.UseCount,
                     users: [token.User.Username],
                 };
@@ -50,8 +53,26 @@ export default class ConnectedAppPolicy extends Policy {
                 }
             }
         });
+        this.emit('entityresolve', {
+            total: Object.keys(successfullyResolved).length,
+            resolved: 0,
+        });
+        let overrideByApiSecurityAccess = false;
+        const apiSecurityAccessSetting = await metadataApi.resolveSingleton('ConnectedAppSettings');
+        if (apiSecurityAccessSetting && apiSecurityAccessSetting.enableAdminApprovedAppsOnly) {
+            overrideByApiSecurityAccess = true;
+        }
+        Object.values(successfullyResolved).forEach((conApp) => {
+            // eslint-disable-next-line no-param-reassign
+            conApp.overrideByApiSecurityAccess = overrideByApiSecurityAccess;
+        });
+        const result = { resolvedEntities: successfullyResolved, ignoredEntities: Object.values(ignoredEntities) };
+        this.emit('entityresolve', {
+            total: getTotal(result),
+            resolved: getTotal(result),
+        });
         // also query from tooling, to get additional information info
-        return { resolvedEntities: successfullyResolved, ignoredEntities: Object.values(ignoredEntities) };
+        return result;
     }
 }
 //# sourceMappingURL=connectedAppPolicy.js.map

package/lib/libs/policies/connectedAppPolicy.js.map

@@ -1 +1 @@
-{"version":3,"file":"connectedAppPolicy.js","sourceRoot":"","sources":["../../../src/libs/policies/connectedAppPolicy.ts"],"names":[],"mappings":"AACA,OAAO,yBAAyB,MAAM,uCAAuC,CAAC;AAG9E,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,cAAc,MAAM,sBAAsB,CAAC;AAElD,OAAO,MAA+B,MAAM,aAAa,CAAC;AAY1D,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,MAAM;IAE3C;IACA;IAFT,YACS,MAA6B,EAC7B,WAA2B,EAClC,WAAyB,IAAI,yBAAyB,EAAE;QAExD,KAAK,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;QAJ9B,WAAM,GAAN,MAAM,CAAuB;QAC7B,gBAAW,GAAX,WAAW,CAAgB;IAIpC,CAAC;IAED,kDAAkD;IACxC,KAAK,CAAC,eAAe,CAAC,OAAqB;QACnD,MAAM,oBAAoB,GAAyC,EAAE,CAAC;QACtE,MAAM,eAAe,GAAuC,EAAE,CAAC;QAC/D,MAAM,WAAW,GAAG,IAAI,cAAc,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QACpE,IAAI,2BAA2B,GAAG,KAAK,CAAC;QACxC,MAAM,wBAAwB,GAAG,MAAM,WAAW,CAAC,2BAA2B,EAAE,CAAC;QACjF,IAAI,wBAAwB,IAAI,wBAAwB,CAAC,2BAA2B,EAAE,CAAC;YACrF,2BAA2B,GAAG,IAAI,CAAC;QACrC,CAAC;QACD,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAe,oBAAoB,CAAC,CAAC;QAClG,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;YAC7C,oBAAoB,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG;gBACxC,IAAI,EAAE,YAAY,CAAC,IAAI;gBACvB,MAAM,EAAE,WAAW;gBACnB,6BAA6B,EAAE,YAAY,CAAC,kCAAkC;gBAC9E,2BAA2B;gBAC3B,QAAQ,EAAE,CAAC;gBACX,KAAK,EAAE,EAAE;aACV,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAa,iBAAiB,CAAC,CAAC;QAC/F,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACxC,IAAI,oBAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,SAAS,EAAE,CAAC;gBACtD,oBAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG;oBACpC,IAAI,EAAE,KAAK,CAAC,OAAO;oBACnB,MAAM,EAAE,YAAY;oBACpB,6BAA6B,EAAE,KAAK;oBACpC,2BAA2B;oBAC3B,QAAQ,EAAE,KAAK,CAAC,QAAQ;oBACxB,KAAK,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;iBAC7B,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,oBAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC;gBAC/D,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC7E,oBAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACtE,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QACH,8DAA8D;QAC9D,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;IACrG,CAAC;CACF"}
+{"version":3,"file":"connectedAppPolicy.js","sourceRoot":"","sources":["../../../src/libs/policies/connectedAppPolicy.ts"],"names":[],"mappings":"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"}

package/lib/libs/policies/permissionSetPolicy.d.ts

@@ -1,16 +1,10 @@
-import { PermissionSet } from '@jsforce/jsforce-node/lib/api/metadata.js';
-import { AuditRunConfig, PermSetsPolicyFileContent } from '../config/audit-run/schema.js';
-import RuleRegistry from '../config/registries/ruleRegistry.js';
-import { AuditContext } from './interfaces/policyRuleInterfaces.js';
+import { AuditRunConfig, PermSetsPolicyFileContent } from '../core/file-mgmt/schema.js';
+import { AuditContext } from '../core/registries/types.js';
 import Policy, { ResolveEntityResult } from './policy.js';
-export type ResolvedPermissionSet = {
-    name: string;
-    preset: string;
-    metadata: PermissionSet;
-};
 export default class PermissionSetPolicy extends Policy {
     config: PermSetsPolicyFileContent;
     auditContext: AuditRunConfig;
-    constructor(config: PermSetsPolicyFileContent, auditContext: AuditRunConfig, registry?: RuleRegistry);
+    private totalEntities;
+    constructor(config: PermSetsPolicyFileContent, auditContext: AuditRunConfig, registry?: import("../core/registries/permissionSets.js").default);
     protected resolveEntities(context: AuditContext): Promise<ResolveEntityResult>;
 }

package/lib/libs/policies/permissionSetPolicy.js

@@ -1,33 +1,40 @@
 import { Messages } from '@salesforce/core';
-import MdapiRetriever from '../mdapiRetriever.js';
-import PermSetsRuleRegistry from '../config/registries/permissionSets.js';
-import Policy from './policy.js';
-import { PermissionRiskLevelPresets } from './types.js';
+import MDAPI from '../core/mdapi/mdapiRetriever.js';
+import { RuleRegistries } from '../core/registries/types.js';
+import { ProfilesRiskPreset } from '../core/policy-types.js';
+import Policy, { getTotal } from './policy.js';
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@j-schreiber/sf-cli-security-audit', 'policies.general');
 export default class PermissionSetPolicy extends Policy {
     config;
     auditContext;
-    constructor(config, auditContext, registry = new PermSetsRuleRegistry()) {
+    totalEntities;
+    constructor(config, auditContext, registry = RuleRegistries.PermissionSets) {
         super(config, auditContext, registry);
         this.config = config;
         this.auditContext = auditContext;
+        this.totalEntities = this.config.permissionSets ? Object.keys(this.config.permissionSets).length : 0;
     }
     async resolveEntities(context) {
+        this.emit('entityresolve', {
+            total: this.totalEntities,
+            resolved: 0,
+        });
         const successfullyResolved = {};
         const unresolved = {};
-        const retriever = new MdapiRetriever(context.targetOrgConnection);
-        const resolvedPermsets = await retriever.retrievePermissionsets(filterCategorizedPermsets(this.config.permissionSets));
-        Object.entries(resolvedPermsets).forEach(([permsetName, resolvedPermset]) => {
-            successfullyResolved[permsetName] = {
-                metadata: resolvedPermset,
-                preset: this.config.permissionSets[permsetName].preset,
-                name: permsetName,
-            };
-        });
+        const retriever = new MDAPI(context.targetOrgConnection);
+        const resolvedPermsets = await retriever.resolve('PermissionSet', filterCategorizedPermsets(this.config.permissionSets));
         Object.entries(this.config.permissionSets).forEach(([key, val]) => {
-            if (successfullyResolved[key] === undefined) {
-                if (val.preset === PermissionRiskLevelPresets.UNKNOWN) {
+            const resolved = resolvedPermsets[key];
+            if (resolved) {
+                successfullyResolved[key] = {
+                    metadata: resolved,
+                    preset: this.config.permissionSets[key].preset,
+                    name: key,
+                };
+            }
+            else if (successfullyResolved[key] === undefined) {
+                if (val.preset === ProfilesRiskPreset.UNKNOWN) {
                     unresolved[key] = { name: key, message: messages.getMessage('preset-unknown', ['Permission Set']) };
                 }
                 else {
@@ -35,13 +42,18 @@ export default class PermissionSetPolicy extends Policy {
                 }
             }
         });
-        return { resolvedEntities: successfullyResolved, ignoredEntities: Object.values(unresolved) };
+        const result = { resolvedEntities: successfullyResolved, ignoredEntities: Object.values(unresolved) };
+        this.emit('entityresolve', {
+            total: this.totalEntities,
+            resolved: getTotal(result),
+        });
+        return result;
     }
 }
 function filterCategorizedPermsets(permSets) {
     const filteredNames = [];
     Object.entries(permSets).forEach(([key, val]) => {
-        if (val.preset !== PermissionRiskLevelPresets.UNKNOWN) {
+        if (val.preset !== ProfilesRiskPreset.UNKNOWN) {
             filteredNames.push(key);
         }
     });

package/lib/libs/policies/permissionSetPolicy.js.map

@@ -1 +1 @@
-{"version":3,"file":"permissionSetPolicy.js","sourceRoot":"","sources":["../../../src/libs/policies/permissionSetPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,cAAc,MAAM,sBAAsB,CAAC;AAClD,OAAO,oBAAoB,MAAM,wCAAwC,CAAC;AAK1E,OAAO,MAA+B,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAExD,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,kBAAkB,CAAC,CAAC;AAOjG,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,MAAM;IAE5C;IACA;IAFT,YACS,MAAiC,EACjC,YAA4B,EACnC,WAAyB,IAAI,oBAAoB,EAAE;QAEnD,KAAK,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;QAJ/B,WAAM,GAAN,MAAM,CAA2B;QACjC,iBAAY,GAAZ,YAAY,CAAgB;IAIrC,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,OAAqB;QACnD,MAAM,oBAAoB,GAA0C,EAAE,CAAC;QACvE,MAAM,UAAU,GAAuC,EAAE,CAAC;QAC1D,MAAM,SAAS,GAAG,IAAI,cAAc,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QAClE,MAAM,gBAAgB,GAAG,MAAM,SAAS,CAAC,sBAAsB,CAC7D,yBAAyB,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CACtD,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,EAAE,eAAe,CAAC,EAAE,EAAE;YAC1E,oBAAoB,CAAC,WAAW,CAAC,GAAG;gBAClC,QAAQ,EAAE,eAAe;gBACzB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,MAAM;gBACtD,IAAI,EAAE,WAAW;aAClB,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE;YAChE,IAAI,oBAAoB,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;gBAC5C,IAAI,GAAG,CAAC,MAAM,KAAK,0BAA0B,CAAC,OAAO,EAAE,CAAC;oBACtD,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC;gBACtG,CAAC;qBAAM,CAAC;oBACN,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBACpF,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;IAChG,CAAC;CACF;AAED,SAAS,yBAAyB,CAAC,QAA8B;IAC/D,MAAM,aAAa,GAAa,EAAE,CAAC;IACnC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE;QAC9C,IAAI,GAAG,CAAC,MAAM,KAAK,0BAA0B,CAAC,OAAO,EAAE,CAAC;YACtD,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,aAAa,CAAC;AACvB,CAAC"}
+{"version":3,"file":"permissionSetPolicy.js","sourceRoot":"","sources":["../../../src/libs/policies/permissionSetPolicy.ts"],"names":[],"mappings":"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"}