Merge pull request #525 from mkurz/rm_deprecations

mkurz · web-flow · commit 5cb3a262aaef · 2024-01-23T11:56:01.000+01:00
[3.0.x] Remove deprecated `contentSecurityPolicy` config + deprecated hibernate.dialect config
diff --git a/play-java-chatroom-example/conf/application.conf b/play-java-chatroom-example/conf/application.conf
@@ -5,10 +5,6 @@ pekko {
   logging-filter = "org.apache.pekko.event.slf4j.Slf4jLoggingFilter"
 }
 
-// https://www.playframework.com/documentation/latest/SecurityHeaders
-// Disable the out of the box content security policy in SecurityHeadersFilter
-play.filters.headers.contentSecurityPolicy = null
-
 // https://www.playframework.com/documentation/latest/AllowedHostsFilter
 play.filters.hosts.allowed = ["localhost:9000", "localhost:19001"]
 
diff --git a/play-java-jpa-example/conf/META-INF/persistence.xml b/play-java-jpa-example/conf/META-INF/persistence.xml
@@ -7,7 +7,6 @@
     <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
     <non-jta-data-source>DefaultDS</non-jta-data-source>
     <properties>
-      <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
       <property name="hibernate.hbm2ddl.auto" value="update"/>
     </properties>
   </persistence-unit>
diff --git a/play-java-rest-api-example/conf/META-INF/persistence.xml b/play-java-rest-api-example/conf/META-INF/persistence.xml
@@ -7,7 +7,6 @@
     <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
     <non-jta-data-source>DefaultDS</non-jta-data-source>
     <properties>
-      <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
       <property name="hibernate.hbm2ddl.auto" value="update"/>
     </properties>
   </persistence-unit>
diff --git a/play-java-starter-example/conf/application.conf b/play-java-starter-example/conf/application.conf
@@ -258,9 +258,6 @@ play.filters {
 
     # The X-Permitted-Cross-Domain-Policies header. If null, the header is not set.
     #permittedCrossDomainPolicies = "master-only"
-
-    # The Content-Security-Policy header. If null, the header is not set.
-    #contentSecurityPolicy = "default-src 'self'"
   }
 
   ## Allowed hosts filter configuration
diff --git a/play-scala-chatroom-example/conf/application.conf b/play-scala-chatroom-example/conf/application.conf
@@ -5,10 +5,6 @@ pekko {
   logging-filter = "org.apache.pekko.event.slf4j.Slf4jLoggingFilter"
 }
 
-// https://www.playframework.com/documentation/latest/SecurityHeaders
-// Disable the out of the box content security policy in SecurityHeadersFilter
-play.filters.headers.contentSecurityPolicy = null
-
 // https://www.playframework.com/documentation/latest/AllowedHostsFilter
 play.filters.hosts.allowed = ["localhost:9000", "localhost:19001"]
 
diff --git a/play-scala-log4j2-example/conf/application.conf b/play-scala-log4j2-example/conf/application.conf
@@ -254,9 +254,6 @@ play.filters {
 
     # The X-Permitted-Cross-Domain-Policies header. If null, the header is not set.
     #permittedCrossDomainPolicies = "master-only"
-
-    # The Content-Security-Policy header. If null, the header is not set.
-    #contentSecurityPolicy = "default-src 'self'"
   }
 
   ## Allowed hosts filter configuration
diff --git a/play-scala-starter-example/conf/application.conf b/play-scala-starter-example/conf/application.conf
@@ -258,9 +258,6 @@ play.filters {
 
     # The X-Permitted-Cross-Domain-Policies header. If null, the header is not set.
     #permittedCrossDomainPolicies = "master-only"
-
-    # The Content-Security-Policy header. If null, the header is not set.
-    #contentSecurityPolicy = "default-src 'self'"
   }
 
   ## Allowed hosts filter configuration
diff --git a/play-scala-streaming-example/conf/application.conf b/play-scala-streaming-example/conf/application.conf
@@ -4,7 +4,6 @@
 # Allow URLs from the same origin to be loaded by frames and scripts
 play.filters.headers {
   frameOptions = "SAMEORIGIN"
-  contentSecurityPolicy = "connect-src 'self'"
 }
 
 play.filters.enabled += play.filters.csp.CSPFilter
diff --git a/play-scala-websocket-example/conf/application.conf b/play-scala-websocket-example/conf/application.conf
@@ -13,11 +13,11 @@ pekko {
   }
 }
 
+play.filters.enabled += play.filters.csp.CSPFilter
 
-# https://www.playframework.com/documentation/latest/SecurityHeaders
-# Connect to localhost:9000 for content security policy on websockets
-play.filters.headers {
-  contentSecurityPolicy = "connect-src 'self' ws://localhost:9000"
+play.filters.csp.directives {
+  connect-src = "'self' ws://localhost:9000"
+  default-src = "'self'"
 }
 
 # https://www.playframework.com/documentation/latest/AllowedHostsFilter

Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,6 @@ pekko {`
`5`	`5`	`logging-filter = "org.apache.pekko.event.slf4j.Slf4jLoggingFilter"`
`6`	`6`	`}`
`7`	`7`
`8`		`-// https://www.playframework.com/documentation/latest/SecurityHeaders`
`9`		`-// Disable the out of the box content security policy in SecurityHeadersFilter`
`10`		`-play.filters.headers.contentSecurityPolicy = null`
`11`		`-`
`12`	`8`	`// https://www.playframework.com/documentation/latest/AllowedHostsFilter`
`13`	`9`	`play.filters.hosts.allowed = ["localhost:9000", "localhost:19001"]`
`14`	`10`
Original file line number	Diff line number	Diff line change
`@@ -258,9 +258,6 @@ play.filters {`
`258`	`258`
`259`	`259`	`# The X-Permitted-Cross-Domain-Policies header. If null, the header is not set.`
`260`	`260`	`#permittedCrossDomainPolicies = "master-only"`
`261`		`-`
`262`		`- # The Content-Security-Policy header. If null, the header is not set.`
`263`		`- #contentSecurityPolicy = "default-src 'self'"`
`264`	`261`	`}`
`265`	`262`
`266`	`263`	`## Allowed hosts filter configuration`
Original file line number	Diff line number	Diff line change
`@@ -254,9 +254,6 @@ play.filters {`
`254`	`254`
`255`	`255`	`# The X-Permitted-Cross-Domain-Policies header. If null, the header is not set.`
`256`	`256`	`#permittedCrossDomainPolicies = "master-only"`
`257`		`-`
`258`		`- # The Content-Security-Policy header. If null, the header is not set.`
`259`		`- #contentSecurityPolicy = "default-src 'self'"`
`260`	`257`	`}`
`261`	`258`
`262`	`259`	`## Allowed hosts filter configuration`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`# Allow URLs from the same origin to be loaded by frames and scripts`
`5`	`5`	`play.filters.headers {`
`6`	`6`	`frameOptions = "SAMEORIGIN"`
`7`		`- contentSecurityPolicy = "connect-src 'self'"`
`8`	`7`	`}`
`9`	`8`
`10`	`9`	`play.filters.enabled += play.filters.csp.CSPFilter`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@ pekko {`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`
	`16`	`+play.filters.enabled += play.filters.csp.CSPFilter`
`16`	`17`
`17`		`-# https://www.playframework.com/documentation/latest/SecurityHeaders`
`18`		`-# Connect to localhost:9000 for content security policy on websockets`
`19`		`-play.filters.headers {`
`20`		`- contentSecurityPolicy = "connect-src 'self' ws://localhost:9000"`
	`18`	`+play.filters.csp.directives {`
	`19`	`+ connect-src = "'self' ws://localhost:9000"`
	`20`	`+ default-src = "'self'"`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`# https://www.playframework.com/documentation/latest/AllowedHostsFilter`