Skip to content

Commit ec8a4c2

Browse files
committed
Merge branch 'feature-DATAAPI-41_csp-nonce-support' into hotfix-3.7.5
2 parents db3dbe5 + 6eb099a commit ec8a4c2

File tree

4 files changed

+6
-2
lines changed

4 files changed

+6
-2
lines changed

handlers/rest-apis/data/v1/docs/Html.cfc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ component {
1515

1616
args.spec = variables[ "_spec#api#" ];
1717

18+
event?.setContentSecurityPolicy( "default-src 'self'; style-src 'self' 'unsafe-inline' 'nonce-#event?.getRequestNonce()#'" );
19+
1820
restResponse.setData( Trim( renderView( view="/dataApiHtmlDocs/index", args=args ) ) );
1921
restResponse.setMimeType( "text/html" );
2022
restResponse.setRenderer( "html" );

handlers/rest-apis/data/v1/docs/Swagger.cfc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ component {
2222
args.favicon = event.buildLink( systemStaticAsset="/extension/preside-ext-data-api/assets/favicon-32x32.png" );
2323
}
2424

25+
event?.setContentSecurityPolicy( "default-src 'self'; img-src 'self' data:; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com; worker-src blob:;" );
26+
2527
restResponse.setData( Trim( renderView( view="/swaggerLayout", args=args ) ) );
2628
restResponse.setMimeType( "text/html" );
2729
restResponse.setRenderer( "html" );

views/dataApiHtmlDocs/index.cfm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<cfif Len( Trim( spec.info[ "x-favicon" ] ?: "" ) )>
1515
<link rel="shortcut icon" href="#spec.info[ "x-favicon" ]#" type="image/x-icon" />
1616
</cfif>
17-
<style>
17+
<style nonce="#event?.getRequestNonce()#">
1818
<cfinclude template="htmlDocsCss.css" />
1919
</style>
2020
</head>

views/swaggerLayout.cfm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<!--
1212
ReDoc doesn't change outer page styles
1313
-->
14-
<style>
14+
<style nonce="#event?.getRequestNonce()#">
1515
body {
1616
margin: 0;
1717
padding: 0;

0 commit comments

Comments
 (0)