Add policy definitions and attachments to request context, change pol…

…icy executor to use them from context instead of directly from repo

services/package.json

@@ -3,6 +3,7 @@
     "version": "1.0.0",
     "scripts": {
         "test": "jest --config jest.config.js",
+        "test:debug": "node --inspect-brk node_modules/.bin/jest --runInBand --config jest.config.js",
         "test:e2e": "jest --config jest.config.e2e.js",
         "test:full": "jest --config jest.config.full.js",
         "build": "tsc",
@@ -43,6 +44,7 @@
         "@types/jest": "^25.1.3",
         "@types/node": "^13.7.4",
         "@types/pino": "^5.15.5",
+        "@types/xml2js": "^0.4.5",
         "apollo-server-testing": "^2.10.1",
         "docker-compose": "^0.23.3",
         "graphql-request": "^1.8.2",
@@ -53,6 +55,7 @@
         "nock": "^12.0.1",
         "ts-jest": "^25.2.1",
         "ts-node-dev": "^1.0.0-pre.44",
-        "typescript": "^3.7.5"
+        "typescript": "^3.7.5",
+        "xml2js": "^0.4.23"
     }
 }

services/src/gateway.ts

@@ -12,21 +12,16 @@ import {
     ResourceRepository,
     CompositeResourceRepository,
 } from './modules/resource-repository';
-import {PolicyExecutor} from './modules/directives/policy/policy-executor';
 
 async function run() {
     logger.info('Stitch gateway booting up...');
 
-    const resourceRepository = getResourceRepository();
-
     const {server, dispose} = createStitchGateway({
-        resourceGroups: pollForUpdates(resourceRepository, config.resourceUpdateInterval),
+        resourceGroups: pollForUpdates(getResourceRepository(), config.resourceUpdateInterval),
         tracing: config.enableGraphQLTracing,
         playground: config.enableGraphQLPlayground,
         introspection: config.enableGraphQLIntrospection,
     });
-    await resourceRepository.initializePolicyAttachments();
-    PolicyExecutor.repo = resourceRepository;
 
     const app = fastify();
     app.register(fastifyMetrics, {endpoint: '/metrics'});

services/src/modules/directives/policy/opa.ts

@@ -15,7 +15,7 @@ export async function evaluate(ctx: PolicyExecutionContext): Promise<PolicyExecu
 
 async function getWasmPolicy(ctx: PolicyExecutionContext): Promise<any> {
     const filename = getCompiledFilename({namespace: ctx.namespace, name: ctx.name});
-    const wasm = ctx.repo.getPolicyAttachment(filename);
+    const wasm = ctx.policyAttachments[filename];
 
     const rego = new Rego();
     return rego.load_policy(wasm);

services/src/modules/directives/policy/policy-executor.ts

@@ -1,7 +1,7 @@
 import {GraphQLResolveInfo} from 'graphql';
 import {RequestContext} from '../../context';
 import {Policy, GraphQLArguments} from './types';
-import {ResourceRepository, Policy as PolicyDefinition, PolicyArgsObject} from '../../resource-repository';
+import {Policy as PolicyDefinition, PolicyArgsObject, PolicyAttachments} from '../../resource-repository';
 import {evaluate as evaluateOpa} from './opa';
 import {injectParameters} from '../../paramInjection';
 
@@ -10,8 +10,8 @@ const typeEvaluators = {
 };
 
 export class PolicyExecutor {
-    static repo: ResourceRepository;
     private policyDefinitions: PolicyDefinition[];
+    private policyAttachments: PolicyAttachments;
 
     constructor(
         protected policies: Policy[],
@@ -21,7 +21,8 @@ export class PolicyExecutor {
         protected info: GraphQLResolveInfo
     ) {
         // TODO: add jwt data
-        this.policyDefinitions = PolicyExecutor.repo.getResourceGroup().policies;
+        this.policyDefinitions = context.policies;
+        this.policyAttachments = context.policyAttachments;
     }
 
     async validatePolicies() {
@@ -37,7 +38,7 @@ export class PolicyExecutor {
         const evaluate = typeEvaluators[policyDefinition.type];
         if (!evaluate) throw new Error(`Unsupported policy type ${policyDefinition.type}`);
 
-        const {done, allow} = await evaluate({...policy, args, repo: PolicyExecutor.repo});
+        const {done, allow} = await evaluate({...policy, args, policyAttachments: this.policyAttachments});
         if (!done) throw new Error('in-line query evaluation not yet supported');
 
         if (!allow) throw new Error(`Unauthorized by policy ${policy.name} in namespace ${policy.namespace}`);

services/src/modules/directives/policy/types.ts

@@ -1,4 +1,4 @@
-import {PolicyArgsObject, ResourceRepository} from '../../resource-repository/types';
+import {PolicyArgsObject, PolicyAttachments} from '../../resource-repository/types';
 
 export type Policy = {
     namespace: string;
@@ -10,7 +10,7 @@ export type Policy = {
 export type PolicyExecutionContext = {
     namespace: string;
     name: string;
-    repo: ResourceRepository;
+    policyAttachments: PolicyAttachments;
     jwt?: JwtInput;
     args?: PolicyArgsObject;
     queries?: QueriesResults;

services/src/modules/graphqlService.ts

@@ -4,7 +4,7 @@ import {Observable, Subscription} from 'rxjs';
 import {shareReplay, map, take, tap, catchError, skip} from 'rxjs/operators';
 
 import {directiveMap} from './directives';
-import {ResourceGroup} from './resource-repository';
+import {ResourceGroup, Policy, PolicyAttachments} from './resource-repository';
 import {buildSchemaFromFederatedTypeDefs} from './buildFederatedSchema';
 import * as baseSchema from './baseSchema';
 import {ActiveDirectoryAuth} from './auth/activeDirectoryAuth';
@@ -86,6 +86,8 @@ export function createSchemaConfig(rg: ResourceGroup): GraphQLServiceConfig {
         schema,
         executor(requestContext) {
             requestContext.context.authenticationConfig = authenticationConfig;
+            requestContext.context.policies = rg.policies;
+            requestContext.context.policyAttachments = rg.policyAttachments;
 
             return execute({
                 document: requestContext.document,
@@ -106,5 +108,7 @@ const defaultSchema = {
 declare module './context' {
     interface RequestContext {
         authenticationConfig: AuthenticationConfig;
+        policies: Policy[];
+        policyAttachments: PolicyAttachments;
     }
 }

services/src/modules/resource-repository/composite.ts

@@ -1,4 +1,4 @@
-import {ResourceRepository, FetchLatestResult, ResourceGroup} from './types';
+import {ResourceRepository, FetchLatestResult} from './types';
 import {applyResourceGroupUpdates} from './updates';
 
 export class CompositeResourceRepository implements ResourceRepository {
@@ -13,30 +13,11 @@ export class CompositeResourceRepository implements ResourceRepository {
         }));
     }
 
-    getResourceGroup(): ResourceGroup {
-        const rgs = this.repositories.map(r => r.getResourceGroup());
-
-        return rgs.reduce((rg1, rg2) => applyResourceGroupUpdates(rg1, rg2));
-    }
-
     async update(): Promise<void> {
         throw new Error('Multiplexed resource repository cannot handle updates');
     }
 
     async writePolicyAttachment(): Promise<void> {
         throw new Error('Multiplexed resource repository cannot handle updates');
     }
-
-    public getPolicyAttachment(filename: string): Buffer {
-        for (const repo of this.repositories) {
-            const policyAttachment = repo.getPolicyAttachment(filename);
-            if (policyAttachment) return policyAttachment;
-        }
-
-        throw new Error(`Policy attachment with the filename ${filename} was not found`);
-    }
-
-    public async initializePolicyAttachments() {
-        await Promise.all(this.repositories.map(repo => repo.initializePolicyAttachments()));
-    }
 }

services/src/modules/resource-repository/fs.ts

@@ -3,14 +3,12 @@ import * as envVar from 'env-var';
 import {promises as fs} from 'fs';
 import * as path from 'path';
 import pLimit from 'p-limit';
-import * as config from '../config';
-import logger from '../logger';
-import {FetchLatestResult} from './types';
+import {FetchLatestResult, PolicyAttachments} from './types';
 
 export class FileSystemResourceRepository implements ResourceRepository {
     protected current?: {mtime: number; rg: ResourceGroup};
     protected policyAttachmentsDirInitialized = false;
-    protected policyAttachments: {[filename: string]: Buffer} = {};
+    protected policyAttachments: PolicyAttachments = {};
     protected policyAttachmentsRefreshedAt?: Date;
 
     constructor(protected pathToFile: string, protected policyAttachmentsFolderPath: string) {}
@@ -26,11 +24,10 @@ export class FileSystemResourceRepository implements ResourceRepository {
         const rg = JSON.parse(contents) as ResourceGroup;
         this.current = {mtime: stats.mtimeMs, rg};
 
-        return {isNew: true, resourceGroup: rg};
-    }
+        await this.refreshPolicyAttachments();
+        rg.policyAttachments = {...this.policyAttachments};
 
-    getResourceGroup(): ResourceGroup {
-        return this.current!.rg;
+        return {isNew: true, resourceGroup: rg};
     }
 
     async update(rg: ResourceGroup): Promise<void> {
@@ -44,30 +41,6 @@ export class FileSystemResourceRepository implements ResourceRepository {
         await fs.writeFile(filePath, content);
     }
 
-    public getPolicyAttachment(filename: string): Buffer {
-        return this.policyAttachments[filename];
-    }
-
-    public async initializePolicyAttachments() {
-        try {
-            await this.refreshPolicyAttachments();
-        } catch (err) {
-            logger.fatal({err}, 'Failed fetching fs policy attachments on startup');
-            throw err;
-        }
-
-        setInterval(async () => {
-            try {
-                await this.refreshPolicyAttachments();
-            } catch (err) {
-                logger.error(
-                    {err},
-                    `Failed refreshing fs policy attachments, last successful refresh was at ${this.policyAttachmentsRefreshedAt}`
-                );
-            }
-        }, config.resourceUpdateInterval);
-    }
-
     private async refreshPolicyAttachments() {
         const newRefreshedAt = new Date();
 

services/src/modules/resource-repository/s3.ts

@@ -1,9 +1,7 @@
 import * as AWS from 'aws-sdk';
 import * as envVar from 'env-var';
 import pLimit from 'p-limit';
-import * as config from '../config';
-import logger from '../logger';
-import {ResourceRepository, ResourceGroup, FetchLatestResult} from './types';
+import {ResourceRepository, ResourceGroup, FetchLatestResult, PolicyAttachments} from './types';
 
 interface S3ResourceRepositoryConfig {
     s3: AWS.S3;
@@ -15,7 +13,7 @@ type FileDetails = {filename: string; updatedAt: Date};
 
 export class S3ResourceRepository implements ResourceRepository {
     protected current?: {etag?: string; rg: ResourceGroup};
-    protected policyAttachments: {[filename: string]: Buffer} = {};
+    protected policyAttachments: PolicyAttachments = {};
     protected policyAttachmentsRefreshedAt?: Date;
 
     constructor(protected config: S3ResourceRepositoryConfig) {}
@@ -48,16 +46,15 @@ export class S3ResourceRepository implements ResourceRepository {
         const rg = JSON.parse(bodyRaw) as ResourceGroup;
         this.current = {etag: response.ETag, rg};
 
+        await this.refreshPolicyAttachments();
+        rg.policyAttachments = {...this.policyAttachments};
+
         return {
             isNew: true,
             resourceGroup: rg,
         };
     }
 
-    getResourceGroup(): ResourceGroup {
-        return this.current!.rg;
-    }
-
     async update(rg: ResourceGroup): Promise<void> {
         await this.config.s3
             .putObject({
@@ -80,30 +77,6 @@ export class S3ResourceRepository implements ResourceRepository {
             .promise();
     }
 
-    public getPolicyAttachment(filename: string): Buffer {
-        return this.policyAttachments[filename];
-    }
-
-    public async initializePolicyAttachments() {
-        try {
-            await this.refreshPolicyAttachments();
-        } catch (err) {
-            logger.fatal({err}, 'Failed fetching s3 policy attachments on startup');
-            throw err;
-        }
-
-        setInterval(async () => {
-            try {
-                await this.refreshPolicyAttachments();
-            } catch (err) {
-                logger.error(
-                    {err},
-                    `Failed refreshing s3 policy attachments, last successful refresh was at ${this.policyAttachmentsRefreshedAt}`
-                );
-            }
-        }, config.resourceUpdateInterval);
-    }
-
     private async refreshPolicyAttachments() {
         const newRefreshedAt = new Date();
 

services/src/modules/resource-repository/types.ts

@@ -3,6 +3,7 @@ export interface ResourceGroup {
     upstreams: Upstream[];
     upstreamClientCredentials: UpstreamClientCredentials[];
     policies: Policy[];
+    policyAttachments?: PolicyAttachments;
 }
 
 export interface Resource {
@@ -70,13 +71,12 @@ export interface FetchLatestResult {
     resourceGroup: ResourceGroup;
 }
 
+export type PolicyAttachments = {[filename: string]: Buffer};
+
 export interface ResourceRepository {
     fetchLatest(): Promise<FetchLatestResult>;
-    getResourceGroup(): ResourceGroup;
     update(rg: ResourceGroup): Promise<void>;
     writePolicyAttachment(filename: string, content: Buffer): Promise<void>;
-    getPolicyAttachment(filename: string): Buffer;
-    initializePolicyAttachments(): Promise<void>;
 }
 
 enum AuthType {