Second iteration

services/src/modules/baseSchema.ts

@@ -3,6 +3,7 @@ import GraphQLJSON, {GraphQLJSONObject} from 'graphql-type-json';
 import {GraphQLDate, GraphQLDateTime, GraphQLTime} from 'graphql-iso-date';
 import {concatAST} from 'graphql';
 import {sdl as directivesSdl} from './directives';
+import {GraphQLResolverMap} from 'apollo-graphql';
 
 export const baseTypeDef = gql`
     scalar JSON
@@ -11,11 +12,19 @@ export const baseTypeDef = gql`
     scalar Date
     scalar Time
     scalar DateTime
+
+    type PolicyResult {
+        allow: Boolean!
+    }
+
+    type Policy {
+        default: PolicyResult!
+    }
 `;
 
 export const typeDef = concatAST([baseTypeDef, directivesSdl]);
 
-export const resolvers = {
+export const resolvers: GraphQLResolverMap<{}> = {
     JSON: GraphQLJSON,
     JSONObject: GraphQLJSONObject,
     Date: GraphQLDate,

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

@@ -21,8 +21,8 @@ async function getWasmPolicy(ctx: PolicyExecutionContext): Promise<any> {
     return rego.load_policy(wasm);
 }
 
-function getInput(ctx: PolicyExecutionContext): PolicyInput {
-    const input: PolicyInput = {};
+function getInput(ctx: PolicyExecutionContext): PolicyOpaInput {
+    const input: PolicyOpaInput = {};
 
     if (ctx.jwt) input.jwt = ctx.jwt;
     if (ctx.args) input.args = ctx.args;
@@ -31,7 +31,7 @@ function getInput(ctx: PolicyExecutionContext): PolicyInput {
     return input;
 }
 
-type PolicyInput = {
+type PolicyOpaInput = {
     jwt?: JwtInput;
     args?: PolicyArgsObject;
     query?: QueryResults;

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

@@ -1,6 +1,6 @@
 import {GraphQLResolveInfo, graphql} from 'graphql';
 import {RequestContext} from '../../context';
-import {Policy, GraphQLArguments} from './types';
+import {Policy, GraphQLArguments, QueryResults} from './types';
 import {Policy as PolicyDefinition, PolicyArgsObject, PolicyAttachments, PolicyQuery} from '../../resource-repository';
 import {evaluate as evaluateOpa} from './opa';
 import {injectParameters} from '../../paramInjection';
@@ -29,7 +29,7 @@ export class PolicyExecutor {
         await Promise.all(this.policies.map(r => this.validatePolicy(r)));
     }
 
-    async validatePolicy(policy: Policy) {
+    async evaluatePolicy(policy: Policy): Promise<boolean> {
         const policyDefinition = this.getPolicyDefinition(policy.namespace, policy.name);
 
         const args = policyDefinition.args && this.preparePolicyArgs(policyDefinition.args, policy);
@@ -41,7 +41,11 @@ export class PolicyExecutor {
 
         const {done, allow} = await evaluate({...policy, args, query, policyAttachments: this.policyAttachments});
         if (!done) throw new Error('in-line query evaluation not yet supported');
+        return allow || false;
+    }
 
+    async validatePolicy(policy: Policy): Promise<void> {
+        const allow = await this.evaluatePolicy(policy);
         if (!allow) throw new Error(`Unauthorized by policy ${policy.name} in namespace ${policy.namespace}`);
     }
 
@@ -72,7 +76,10 @@ export class PolicyExecutor {
         return policyDefinition;
     }
 
-    private async evaluatePolicyQuery(query: PolicyQuery, args: PolicyArgsObject = {}): Promise<any> {
+    private async evaluatePolicyQuery(
+        query: PolicyQuery,
+        args: PolicyArgsObject = {}
+    ): Promise<QueryResults | undefined> {
         let variableValues =
             query.variables &&
             Object.entries(query.variables).reduce<{[key: string]: any}>((policyArgs, [varName, varValue]) => {
@@ -84,7 +91,17 @@ export class PolicyExecutor {
             }, {});
 
         // TODO: Run with admin permissions
-        const gqlResult = await graphql(this.info.schema, query.source, undefined, this.context, variableValues);
-        return gqlResult.data;
+        const context: RequestContext = {...this.context, ignorePolicies: true};
+        const gqlResult = await graphql(this.info.schema, query.gql, undefined, context, variableValues);
+        return gqlResult.data || undefined;
+    }
+}
+
+declare module '../../context' {
+    interface RequestContext {
+        /**
+         * This flag indicates that request should be resolved without invoking authorization policies evaluation
+         */
+        ignorePolicies: boolean;
     }
 }

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

@@ -19,13 +19,9 @@ export class PolicyQueryDirective extends SchemaDirectiveVisitor {
                 args: args,
             };
 
-            const executor = new PolicyExecutor([policy], parent, args, context, info);
-            try {
-                await executor.validatePolicies();
-                return {allow: true};
-            } catch (error) {
-                return {allow: false};
-            }
+            const executor = new PolicyExecutor([], parent, args, context, info);
+            const allow = await executor.evaluatePolicy(policy);
+            return {allow};
         };
     }
 }

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

@@ -11,8 +11,10 @@ export class PolicyDirective extends SchemaDirectiveVisitor {
         const policies = this.args.policies;
 
         field.resolve = async (parent: any, args: any, context: RequestContext, info: GraphQLResolveInfo) => {
-            const executor = new PolicyExecutor(policies, parent, args, context, info);
-            await executor.validatePolicies();
+            if (!context.ignorePolicies) {
+                const executor = new PolicyExecutor(policies, parent, args, context, info);
+                await executor.validatePolicies();
+            }
 
             return originalResolve.call(field, parent, args, context, info);
         };

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, Policy, PolicyAttachments} from './resource-repository';
+import {ResourceGroup, Policy, PolicyAttachments, Schema} from './resource-repository';
 import {buildSchemaFromFederatedTypeDefs} from './buildFederatedSchema';
 import * as baseSchema from './baseSchema';
 import {ActiveDirectoryAuth} from './auth/activeDirectoryAuth';
@@ -63,13 +63,10 @@ function buildPolicyGqlQuery(policy: Policy): DocumentNode {
         : '';
 
     return gql`
-        type PolicyResult {
-            allow: Boolean!
+        extend type Policy {
+            ${policy.metadata.namespace}___${policy.metadata.name}${argStr}: PolicyResult! @policyQuery(namespace: "${policy.metadata.namespace}", name: "${policy.metadata.name}")
         }
-
-        type Query {
-            policy___${policy.metadata.namespace}___${policy.metadata.name}${argStr}: PolicyResult! @policyQuery(namespace: "${policy.metadata.namespace}", name: "${policy.metadata.name}")
-        }`;
+        `;
 }
 
 export function createSchemaConfig(rg: ResourceGroup): GraphQLServiceConfig {
@@ -78,7 +75,7 @@ export function createSchemaConfig(rg: ResourceGroup): GraphQLServiceConfig {
     const upstreamClientCredentialsByAuthority = new Map(
         rg.upstreamClientCredentials.map(u => [u.activeDirectory.authority, u])
     );
-    const schemas = rg.schemas.length === 0 ? [defaultSchema] : rg.schemas;
+    const schemas = rg.schemas.length === 0 ? [defaultSchema] : [initialSchema, ...rg.schemas];
     const policies = rg.policies ?? [];
 
     const authenticationConfig: AuthenticationConfig = {
@@ -93,7 +90,7 @@ export function createSchemaConfig(rg: ResourceGroup): GraphQLServiceConfig {
 
     const schemaTypeDefs = schemas.map(s => [`${s.metadata.namespace}/${s.metadata.name}`, parse(s.schema)]);
     const policyQueryTypeDefs = policies.map(p => [
-        `policy___${p.metadata.namespace}___${p.metadata.name}`,
+        `${p.metadata.namespace}___${p.metadata.name}`,
         buildPolicyGqlQuery(p),
     ]);
     const schema = buildSchemaFromFederatedTypeDefs({
@@ -122,11 +119,26 @@ export function createSchemaConfig(rg: ResourceGroup): GraphQLServiceConfig {
     };
 }
 
-const defaultSchema = {
+const defaultSchema: Schema = {
     metadata: {namespace: '__internal__', name: 'default'},
     schema: 'type Query { default: String! @stub(value: "default") }',
 };
 
+const initialSchema: Schema = {
+    metadata: {
+        namespace: '__internal__',
+        name: '__initial__',
+    },
+    schema: `
+    type Query {
+        policy: Policy! @stub(value: {
+            default: {
+                allow: true
+            }
+        })
+    }`,
+};
+
 declare module './context' {
     interface RequestContext {
         authenticationConfig: AuthenticationConfig;

services/src/modules/paramInjection.ts

@@ -10,20 +10,20 @@ const paramRegex = /{(source|args|exports)\.(\w+(\.\w+)*)}/;
 
 function resolveTemplate(
     source: string,
-    template: string,
+    key: string,
     parent: any,
     args: GraphQLArguments,
     context: RequestContext,
     info: GraphQLResolveInfo
 ) {
-    const propPath = template.split('.');
+    const propPath = key.split('.');
     switch (source) {
         case 'source':
             return parent && R.path(propPath, parent);
         case 'args':
             return args && R.path(propPath, args);
         case 'exports':
-            return context.exports.resolve(info.parentType, parent, template);
+            return context.exports.resolve(info.parentType, parent, key);
         default:
             return null;
     }

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

@@ -48,11 +48,11 @@ export interface Policy extends Resource {
 }
 
 export interface PolicyQuery {
-    source: string;
-    variables?: PolicyQueryGraphqlVariables;
+    gql: string;
+    variables?: PolicyQueryVariables;
 }
 
-export interface PolicyQueryGraphqlVariables {
+export interface PolicyQueryVariables {
     [key: string]: any;
 }
 

services/src/registry.ts

@@ -11,7 +11,7 @@ import {createSchemaConfig} from './modules/graphqlService';
 import * as opaHelper from './modules/opaHelper';
 // Importing directly from types because of a typescript or ts-jest bug that re-exported enums cause a runtime error for being undefined
 // https://github.com/kulshekhar/ts-jest/issues/281
-import {PolicyArgsObject, PolicyType} from './modules/resource-repository/types';
+import {PolicyArgsObject, PolicyType, PolicyQueryVariables} from './modules/resource-repository/types';
 
 const typeDefs = gql`
     scalar JSON
@@ -109,7 +109,7 @@ const typeDefs = gql`
     }
 
     input PolicyQueryInput {
-        source: String!
+        gql: String!
         variables: JSONObject
     }
 
@@ -168,8 +168,8 @@ interface UpstreamClientCredentialsInput {
 }
 
 interface PolicyQueryInput {
-    source: string;
-    variables?: {[name: string]: any};
+    gql: string;
+    variables?: PolicyQueryVariables;
 }
 
 interface PolicyInput {

services/src/tests/e2e/tests/__snapshots__/authorization_with_queries.spec.ts.snap

@@ -1,5 +1,47 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Authorization with queries Query allowed employee 1`] = `
+Object {
+  "data": null,
+  "errors": Array [
+    Object {
+      "extensions": Object {
+        "code": "INTERNAL_SERVER_ERROR",
+        "exception": Object {
+          "stacktrace": Array [
+            "Error: Unauthorized by policy alwaysDenied in namespace namespace",
+            "    at PolicyExecutor.validatePolicy (/service/dist/modules/directives/policy/policy-executor.js:37:19)",
+            "    at async Promise.all (index 0)",
+            "    at async PolicyExecutor.validatePolicies (/service/dist/modules/directives/policy/policy-executor.js:20:9)",
+            "    at async field.resolve (/service/dist/modules/directives/policy/policy.js:14:17)",
+          ],
+        },
+      },
+      "locations": Array [
+        Object {
+          "column": 15,
+          "line": 2,
+        },
+      ],
+      "message": "Unauthorized by policy alwaysDenied in namespace namespace",
+      "path": Array [
+        "classifiedDepartments",
+      ],
+    },
+  ],
+  "extensions": Any<Object>,
+  "status": 200,
+}
+`;
+
+exports[`Authorization with queries Query allowed employee 2`] = `
+Object {
+  "address": "Tel Aviv",
+  "id": "1",
+  "name": "John Smith",
+}
+`;
+
 exports[`Authorization with queries Query denied employee 1 1`] = `
 Object {
   "data": Object {
@@ -16,10 +58,10 @@ Object {
         "exception": Object {
           "stacktrace": Array [
             "Error: Unauthorized by policy notClassified in namespace namespace",
-            "    at PolicyExecutor.validatePolicy (/service/dist/modules/directives/policy/policy-executor.js:33:19)",
+            "    at PolicyExecutor.validatePolicy (/service/dist/modules/directives/policy/policy-executor.js:37:19)",
             "    at async Promise.all (index 0)",
             "    at async PolicyExecutor.validatePolicies (/service/dist/modules/directives/policy/policy-executor.js:20:9)",
-            "    at async field.resolve (/service/dist/modules/directives/policy/policy.js:13:13)",
+            "    at async field.resolve (/service/dist/modules/directives/policy/policy.js:14:17)",
           ],
         },
       },
@@ -57,10 +99,10 @@ Object {
         "exception": Object {
           "stacktrace": Array [
             "Error: Unauthorized by policy notClassified in namespace namespace",
-            "    at PolicyExecutor.validatePolicy (/service/dist/modules/directives/policy/policy-executor.js:33:19)",
+            "    at PolicyExecutor.validatePolicy (/service/dist/modules/directives/policy/policy-executor.js:37:19)",
             "    at async Promise.all (index 0)",
             "    at async PolicyExecutor.validatePolicies (/service/dist/modules/directives/policy/policy-executor.js:20:9)",
-            "    at async field.resolve (/service/dist/modules/directives/policy/policy.js:13:13)",
+            "    at async field.resolve (/service/dist/modules/directives/policy/policy.js:14:17)",
           ],
         },
       },