Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: handle legacy string permissions #7305

Merged
merged 3 commits into from
May 12, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as fs from 'fs';
import * as path from 'path';
import { $TSAny, $TSContext, $TSObject, JSONUtilities } from 'amplify-cli-core';
import { $TSAny, $TSContext, $TSObject, JSONUtilities, pathManager } from 'amplify-cli-core';
import * as iam from '@aws-cdk/aws-iam';
import * as cdk from '@aws-cdk/core';
import { prepareApp } from '@aws-cdk/core/lib/private/prepare-app';
Expand Down Expand Up @@ -85,7 +86,7 @@ class ApiGatewayAuthStack extends cdk.Stack {
state.path = path;

if (apiGateway.params.privacy.auth) {
state.methods = path?.privacy?.auth ?? [];
state.methods = Array.isArray(path?.privacy?.auth) ? path.privacy.auth : [];
state.roleCount = authRoleCount;
state.roleName = authRoleName;
state.policyDocSize = authPolicyDocSize;
Expand All @@ -96,7 +97,7 @@ class ApiGatewayAuthStack extends cdk.Stack {
}

if (apiGateway.params.privacy.unauth) {
state.methods = path?.privacy?.unauth ?? [];
state.methods = Array.isArray(path?.privacy?.unauth) ? path.privacy.unauth : [];
state.roleCount = unauthRoleCount;
state.roleName = unauthRoleName;
state.policyDocSize = unauthPolicyDocSize;
Expand Down Expand Up @@ -177,6 +178,11 @@ export function consolidateApiGatewayPolicies(context: $TSContext, stackName: st
const { amplifyMeta } = context.amplify.getProjectDetails();
const apis = amplifyMeta?.api ?? {};

try {
const cfnPath = path.join(pathManager.getBackendDirPath(), 'api', `${APIGW_AUTH_STACK_LOGICAL_ID}.json`);
fs.unlinkSync(cfnPath);
} catch {}

Object.keys(apis).forEach(resourceName => {
const resource = apis[resourceName];
const apiParams = loadApiWithPrivacyParams(context, resourceName, resource);
Expand All @@ -191,13 +197,13 @@ export function consolidateApiGatewayPolicies(context: $TSContext, stackName: st
});

if (apiGateways.length === 0) {
return {};
return { APIGatewayAuthURL: undefined };
}

return createApiGatewayAuthResources(context, stackName, apiGateways);
return { APIGatewayAuthURL: createApiGatewayAuthResources(context, stackName, apiGateways) };
}

function createApiGatewayAuthResources(context: $TSContext, stackName: string, apiGateways: $TSAny): $TSObject {
function createApiGatewayAuthResources(context: $TSContext, stackName: string, apiGateways: $TSAny): string | undefined {
const stack = new ApiGatewayAuthStack(undefined, 'Amplify', {
description: 'API Gateway policy stack created using Amplify CLI',
stackName,
Expand All @@ -206,13 +212,15 @@ function createApiGatewayAuthResources(context: $TSContext, stackName: string, a
const cfn = stack.toCloudFormation();
const { amplify } = context;
const { DeploymentBucketName } = amplify.getProjectMeta()?.providers?.[ProviderName] ?? {};
const cfnPath = path.join((amplify.pathManager as any).getBackendDirPath(), 'api', `${APIGW_AUTH_STACK_LOGICAL_ID}.json`);
const cfnPath = path.join(pathManager.getBackendDirPath(), 'api', `${APIGW_AUTH_STACK_LOGICAL_ID}.json`);

if (!cfn.Resources || Object.keys(cfn.Resources).length === 0) {
return;
}

JSONUtilities.writeJson(cfnPath, cfn);

return {
APIGatewayAuthURL: `https://s3.amazonaws.com/${DeploymentBucketName}/amplify-cfn-templates/${S3_UPLOAD_PATH}`,
};
return `https://s3.amazonaws.com/${DeploymentBucketName}/amplify-cfn-templates/${S3_UPLOAD_PATH}`;
}

export function loadApiWithPrivacyParams(context: $TSContext, name: string, resource: any): object | undefined {
Expand Down Expand Up @@ -280,6 +288,16 @@ function updateExistingApiCfn(context: $TSContext, api: $TSObject): void {
path.policyResourceName = String(path.name).replace(/{[a-zA-Z0-9\-]+}/g, '*');
modified = true;
}

if (typeof path?.privacy?.auth === 'string') {
path.privacy.auth = convertPermissionStringToCrud(path.privacy.auth);
modified = true;
}

if (typeof path?.privacy?.unauth === 'string') {
path.privacy.unauth = convertPermissionStringToCrud(path.privacy.unauth);
modified = true;
}
});
}

Expand All @@ -289,3 +307,13 @@ function updateExistingApiCfn(context: $TSContext, api: $TSObject): void {
JSONUtilities.writeJson(apiParamsFile, api.params);
}
}

function convertPermissionStringToCrud(permissions: string): string[] {
if (permissions === 'r') {
return ['/GET'];
} else if (permissions === 'rw') {
return ['/POST', '/GET', '/PUT', '/PATCH', '/DELETE'];
}

return [];
}