Merge pull request awslabs#414 from awslabs/set-security-headers

Author: amazon-meaisiah

BUILDING.md

@@ -146,6 +146,16 @@ AWS SAM CLI profile option: optional specific profile from your AWS credential f
 
 Set this to `true` if you want to enable development mode. It's `false` by default, and unless you're actively developing on the developer portal itself locally, you should generally leave it unset as it disables most protections, including CORS.
 
+### `edgeLambdaRebuildToken: string`
+
+*Default: `'defaultRebuildToken'`*
+
+Change this value if you want to update the edge lambda or its replicator lambda in the next deployment. In general, you shouldn't need to set it unless either 1. you're developing against the project and need to make changes to it, or 2. the project updated that part of the code and you just pulled its changes in preparation to update your deployment.
+
+> Why is this not handled internally? At the time of writing, edge lambdas are difficult to delete due to how long it takes for all their replicas to delete, and you can't delete lambdas with active replicas. This process could take anywhere from a couple hours to several days (well past the largest timeout supported by Lambda), and neither CloudFront nor Lambda currently offer any hooks to know when all the replicas are gone. So edge lambda versions are only created, never deleted, by the template.
+>
+> For this reason, it's better to require the user to explicitly choose when to update the lambda, so that during development, you're not flooded with versions, and during production, you can be better aware of when things change (it's on your account, after all).
+
 ### `samTemplate: string`
 
 *Default: `cloudformation/template.yaml` relative to the repo's root*

cloudformation/template.yaml

@@ -79,6 +79,11 @@ Parameters:
     Description: Provide a token different from the last deployment's token to re-upload the dev portal site's static assets. You can provide a timestamp or GUID on each deployment to always re-upload the assets.
     Default: 'defaultRebuildToken'
 
+  EdgeLambdaRebuildToken:
+    Type: String
+    Description: Provide a token different from the last deployment's token to update the edge lambda. You can provide a timestamp or GUID on each deployment to always update it.
+    Default: 'defaultRebuildToken'
+
   StaticAssetRebuildMode:
     Type: String
     Description: By default, a static asset rebuild doesn't overwrite custom-content. Provide the value `overwrite-content` to replace the custom-content with your local version. Don't do this unless you know what you're doing -- all custom changes in your s3 bucket will be lost. 
@@ -1714,6 +1719,93 @@ Resources:
       DevelopmentMode: !Ref DevelopmentMode
       FeedbackEnabled: !If [ EnableFeedbackSubmission, 'true', 'false' ]
 
+  LambdaEdgeFunctionRole:
+    Type: AWS::IAM::Role
+    Properties:
+      Path: "/"
+      ManagedPolicyArns:
+        - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
+      AssumeRolePolicyDocument:
+        Version: '2012-10-17'
+        Statement:
+          -
+            Sid: "AllowLambdaServiceToAssumeRole"
+            Effect: "Allow"
+            Action: 
+              - "sts:AssumeRole"
+            Principal:
+              Service: 
+                - "lambda.amazonaws.com"
+                - "edgelambda.amazonaws.com"
+
+  CloudFrontSecurityHeadersLambda:
+    Type: AWS::Serverless::Function
+    Properties:
+      CodeUri: ../lambdas/cloudfront-security
+      Handler: replicator.handler
+      MemorySize: 128
+      Role: !GetAtt CloudFrontEdgeReplicatorRole.Arn
+      Runtime: nodejs12.x
+      Timeout: 300
+      AutoPublishAlias: Live
+      Environment:
+        Variables:
+          Bucket: !Ref ArtifactsS3BucketName
+      Layers:
+        - !Ref LambdaCommonLayer
+
+  CloudFrontSecurityHeadersSetup:
+    Type: AWS::CloudFormation::CustomResource
+    Properties:
+      ServiceToken: !GetAtt CloudFrontSecurityHeadersLambda.Arn
+      Name: !Ref CloudFrontSecurityHeadersLambda
+      RoleArn: !GetAtt LambdaEdgeFunctionRole.Arn
+      RebuildToken: !Ref EdgeLambdaRebuildToken
+  
+  CloudFrontEdgeReplicatorRole:
+    Type: AWS::IAM::Role
+    Properties:
+      AssumeRolePolicyDocument:
+        Version: '2012-10-17'
+        Statement:
+          Effect: Allow
+          Principal:
+            Service: lambda.amazonaws.com
+          Action: sts:AssumeRole
+      Path: '/'
+      Policies:
+      - PolicyName: root
+        PolicyDocument:
+          Version: '2012-10-17'
+          Statement:
+          - Effect: Allow
+            Action:
+            - logs:CreateLogGroup
+            - logs:CreateLogStream
+            - logs:PutLogEvents
+            Resource: arn:aws:logs:*:*:*
+          - Effect: Allow
+            Action:
+              - lambda:CreateFunction
+              - lambda:GetFunction
+              - lambda:UpdateFunctionCode
+              - lambda:PublishVersion
+            Resource: arn:aws:lambda:*:*:*
+          - Effect: Allow
+            Action:
+              - iam:PassRole
+            Resource: !Sub 'arn:aws:iam::${AWS::AccountId}:role/*'
+          - Effect: Allow
+            Action:
+            - s3:GetObject
+            - s3:DeleteObject
+            - s3:PutObject
+            Resource: !Join
+              - ''
+              - - 'arn:aws:s3:::'
+                - !Ref ArtifactsS3BucketName
+                - '/*'
+
   CloudFrontOriginAccessIdentity:
     Type: 'AWS::CloudFront::CloudFrontOriginAccessIdentity'
     Condition: 'NotDevelopmentMode'
@@ -1738,6 +1830,10 @@ Resources:
             QueryString: true
           TargetOriginId: 'dev-portal-site-s3-bucket'
           ViewerProtocolPolicy: redirect-to-https
+          LambdaFunctionAssociations:
+            -
+              EventType: origin-response
+              LambdaFunctionARN: !GetAtt CloudFrontSecurityHeadersSetup.EdgeArn
         DefaultRootObject: index.html
         Enabled: true
         Comment: !Sub '${AWS::StackName} distribution'
@@ -1767,6 +1863,10 @@ Resources:
             QueryString: true
           TargetOriginId: 'dev-portal-site-s3-bucket'
           ViewerProtocolPolicy: redirect-to-https
+          LambdaFunctionAssociations:
+            -
+              EventType: origin-response
+              LambdaFunctionARN: !GetAtt CloudFrontSecurityHeadersSetup.EdgeArn
         DefaultRootObject: index.html
         Enabled: true
         Comment: !Sub '${AWS::StackName} distribution'

dev-portal/example-deployer.config.js

@@ -32,4 +32,8 @@ module.exports = {
   // cognitoDomainAcmCertArn: 'arn:aws:acm:us-east-1:123456789012:certificate/98765432-9876-9876-9876-987654321098',
   // useRoute53Nameservers: true,
   // feedbackEmail: '[email protected]',
+
+  // Toggle this any time the edge lambda or its replicator lambda need updated. You will be told in
+  // the migration instructions to do so if you need to.
+  // edgeLambdaResetToken: 'reset',
 }

dev-portal/example-dev-deployer.config.js

@@ -31,4 +31,9 @@ module.exports = {
 
   // Set development mode for local use.
   developmentMode: true,
+
+  // Toggle this any time the edge lambda or its replicator lambda are updated. In general, unless
+  // either you're modifying them yourself or they were changed upstream and you just pulled those
+  // changes, you shouldn't need to do anything about this value.
+  // edgeLambdaResetToken: 'reset',
 }

dev-portal/src/components/SwaggerUiLayout.jsx

@@ -45,7 +45,11 @@ function InfoReplacement ({ specSelectors }) {
   const docsUrl = externalDocs.get('url')
 
   return <Observer>
-    {() => <Container fluid textAlign='left' className='fixfloat' style={{ padding: '40px 0px' }}>
+    {/*
+      If no API is loaded, let's just swallow the state and move on. (Swagger UI doesn't offer any
+      way to clean up after itself.)
+    */}
+    {() => store.api == null ? null : <Container fluid textAlign='left' className='fixfloat' style={{ padding: '40px 0px' }}>
       <div style={{ display: 'flex' }}>
         <div style={{ flex: '0 0 auto', marginRight: '20px' }}>
           <Image size='small' src={store.api.logo} />

dev-portal/src/pages/Apis.jsx

@@ -27,12 +27,12 @@ export default observer(class ApisPage extends React.Component {
   containerRef = React.createRef()
   hasRoot = false
 
-  componentDidMount () { this.updateApi() }
-  componentDidUpdate () { this.updateApi() }
+  componentDidMount () { this.updateApi(true) }
+  componentDidUpdate () { this.updateApi(false) }
   componentWillUnmount () { this.containerRef = null }
 
-  updateApi () {
-    return getApi(this.props.match.params.apiId || 'ANY', true, this.props.match.params.stage)
+  updateApi (isInitial) {
+    return getApi(this.props.match.params.apiId || 'ANY', true, this.props.match.params.stage, isInitial)
       .then(api => {
         if (this.containerRef == null) return
         const elem = this.containerRef.current

lambdas/backend/routes/admin/catalog/visibility.js

@@ -168,7 +168,7 @@ async function deleteFile (file) {
 }
 
 exports.post = async (req, res) => {
-  console.log(`POST /admin-catalog-visibility for Cognito ID: ${util.getCognitoIdentityId(req)}`)
+  console.log(`POST /admin/catalog/visibility for Cognito ID: ${util.getCognitoIdentityId(req)}`)
 
   // for apigateway managed APIs, provide "apiId_stageName"
   // in the apiKey field

lambdas/cloudfront-security/index.js

@@ -0,0 +1,29 @@
+'use strict'
+
+const headersToAdd = {
+  // Don't include subdomains - the user might have a subdomain hosted on something else and not
+  // support it.
+  'strict-transport-security': [{ value: 'max-age=63072000' }],
+  'content-security-policy': [{
+    value: [
+      "default-src 'none'",
+      'connect-src *',
+      "prefetch-src 'self'",
+      "font-src 'self' data: fonts.gstatic.com",
+      "img-src 'self' data:",
+      "script-src 'self' 'unsafe-inline'",
+      "style-src 'self' fonts.googleapis.com"
+    ].join(';')
+  }],
+  'x-content-type-options': [{ value: 'nosniff' }],
+  'x-frame-options': [{ value: 'DENY' }],
+  'x-xss-protection': [{ value: '1; mode=block' }],
+  'referrer-policy': [{ value: 'same-origin' }]
+}
+
+exports.handler = (event, context, callback) => {
+  const response = event.Records[0].cf.response
+  console.log('Response headers:', response.headers)
+  Object.assign(response.headers, headersToAdd)
+  callback(null, response)
+}