Merge pull request #266 from qld-gov-au/develop

Develop
qld-gov-au · Jul 20, 2022 · d26ee98 · d26ee98
2 parents 7fff40a + a992f34
commit d26ee98
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 3 deletions.
diff --git a/templates/cloudfront.cfn.yml.j2 b/templates/cloudfront.cfn.yml.j2
@@ -665,6 +665,72 @@ Resources:
             LambdaFunctionAssociations:
               - EventType: 'viewer-request'
                 LambdaFunctionARN: !Ref LambdaAtEdgeViewerRequestVersion
+          - PathPattern: /logout* #SSO
+            TargetOriginId: 'CmsOrigin'
+            AllowedMethods:
+              - GET
+              - HEAD
+              - OPTIONS
+              - PUT
+              - PATCH
+              - POST
+              - DELETE
+            Compress: true
+            DefaultTTL: 0
+            MaxTTL: 0
+            MinTTL: 0
+            ForwardedValues:
+              Cookies:
+                Forward: all
+              QueryString: true
+              Headers:
+                - "Accept"
+                - "Accept-Charset"
+                - "Accept-Datetime"
+                - "Accept-Encoding"
+                - "Accept-Language"
+                - "Authorization"
+                - "Origin"
+                - "Accept"
+                - "Host"
+                - "Referer"
+            ViewerProtocolPolicy: redirect-to-https
+            LambdaFunctionAssociations:
+              - EventType: 'viewer-request'
+                LambdaFunctionARN: !Ref LambdaAtEdgeViewerRequestVersion
+          - PathPattern: /oauth-account-manager* #SSO
+            TargetOriginId: 'CmsOrigin'
+            AllowedMethods:
+              - GET
+              - HEAD
+              - OPTIONS
+              - PUT
+              - PATCH
+              - POST
+              - DELETE
+            Compress: true
+            DefaultTTL: 0
+            MaxTTL: 0
+            MinTTL: 0
+            ForwardedValues:
+              Cookies:
+                Forward: all
+              QueryString: true
+              Headers:
+                - "Accept"
+                - "Accept-Charset"
+                - "Accept-Datetime"
+                - "Accept-Encoding"
+                - "Accept-Language"
+                - "Authorization"
+                - "Origin"
+                - "Accept"
+                - "Host"
+                - "Referer"
+            ViewerProtocolPolicy: redirect-to-https
+            LambdaFunctionAssociations:
+              - EventType: 'viewer-request'
+                LambdaFunctionARN: !Ref LambdaAtEdgeViewerRequestVersion
 {% endif %}
 
           - PathPattern: !Sub "/${AttachmentBucketName}/*" # S3 uploaded files

diff --git a/vars/shared-CKANTest.var.yml b/vars/shared-CKANTest.var.yml
@@ -31,7 +31,7 @@ extensions:
       description: "CKAN Extension to keep uploaded files in S3"
       type: "git"
       url: "https://github.com/qld-gov-au/ckanext-s3filestore.git"
-      version: "0.7.7-qgov"
+      version: "0.7.7-qgov.2"
 
     CKANExtSSMConfig: &CKANExtSSMConfig
       name: "ckanext-ssm-config-{{ Environment }}"

diff --git a/vars/shared-OpenData.var.yml b/vars/shared-OpenData.var.yml
@@ -31,7 +31,7 @@ extensions:
       description: "CKAN Extension to keep uploaded files in S3"
       type: "git"
       url: "https://github.com/qld-gov-au/ckanext-s3filestore.git"
-      version: "0.7.7-qgov"
+      version: "0.7.7-qgov.2"
 
     CKANExtSSMConfig: &CKANExtSSMConfig
       name: "ckanext-ssm-config-{{ Environment }}"

diff --git a/vars/shared-Publications.var.yml b/vars/shared-Publications.var.yml
@@ -22,7 +22,7 @@ extensions:
       description: "CKAN Extension to keep uploaded files in S3"
       type: "git"
       url: "https://github.com/qld-gov-au/ckanext-s3filestore.git"
-      version: "0.7.7-qgov"
+      version: "0.7.7-qgov.2"
 
     CKANExtSSMConfig: &CKANExtSSMConfig
       name: "ckanext-ssm-config-{{ Environment }}"