[activemq-artemis] branch main updated: ARTEMIS-4123 Enable Strict-Transport-Security header

[jbertram]

This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new 2e98c51d63 ARTEMIS-4123 Enable Strict-Transport-Security header
2e98c51d63 is described below

commit 2e98c51d63b8cabc8903b7bdf4ad3cc61d445c61
Author: Domenico Francesco Bruscino <brus...@apache.org>
AuthorDate: Wed Jan 4 09:37:07 2023 +0100

    ARTEMIS-4123 Enable Strict-Transport-Security header
---
 .../org/apache/activemq/artemis/cli/commands/etc/artemis.profile        | 2 +-
 .../org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
index e0b857fa26..95d0eabfec 100644
--- 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
+++ 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
@@ -37,7 +37,7 @@ HAWTIO_ROLE='${role}'
 
 # Java Opts
 if [ -z "$JAVA_ARGS" ]; then
-    JAVA_ARGS="-XX:AutoBoxCacheMax=20000 -XX:+PrintClassHistogram -XX:+UseG1GC 
-XX:+UseStringDeduplication -Xms512M -Xmx${java-memory} 
-Dhawtio.disableProxy=true -Dhawtio.realm=activemq -Dhawtio.offline=true 
-Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal
 -Djolokia.policyLocation=${ARTEMIS_INSTANCE_ETC_URI}jolokia-access.xml 
${java-opts}"
+    JAVA_ARGS="-XX:AutoBoxCacheMax=20000 -XX:+PrintClassHistogram -XX:+UseG1GC 
-XX:+UseStringDeduplication -Xms512M -Xmx${java-memory} 
-Dhawtio.disableProxy=true -Dhawtio.realm=activemq -Dhawtio.offline=true 
-Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal
 
-Dhawtio.http.strictTransportSecurity=max-age=31536000;includeSubDomains;preload
 -Djolokia.policyLocation=${ARTEMIS_INSTANCE_ETC_URI}jolokia-access.xml 
${java-opts}"
 fi
 
 # Uncomment to enable logging for Safepoint JVM pauses
diff --git 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
index 0d7c1e5acb..1ca2c9aaf9 100644
--- 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
+++ 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
@@ -33,7 +33,7 @@ rem Cluster Properties: Used to pass arguments to ActiveMQ 
Artemis which can be
 rem set ARTEMIS_CLUSTER_PROPS=-Dactivemq.remoting.default.port=61617 
-Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 
-Dactivemq.remoting.hornetq.port=5446
 
 rem Java Opts
-IF "%JAVA_ARGS%"=="" (set JAVA_ARGS=${java-opts} -XX:AutoBoxCacheMax=20000 
-XX:+PrintClassHistogram  -XX:+UseG1GC -XX:+UseStringDeduplication -Xms512M 
-Xmx${java-memory} 
-Djava.security.auth.login.config=%ARTEMIS_ETC_DIR%\login.config 
-Dhawtio.disableProxy=true -Dhawtio.offline=true -Dhawtio.realm=activemq 
-Dhawtio.role=${role} 
-Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal
 -Djolokia.policyLocation=%ARTEMIS_INSTANCE_ETC_URI%\jolokia-access. [...]
+IF "%JAVA_ARGS%"=="" (set JAVA_ARGS=${java-opts} -XX:AutoBoxCacheMax=20000 
-XX:+PrintClassHistogram  -XX:+UseG1GC -XX:+UseStringDeduplication -Xms512M 
-Xmx${java-memory} 
-Djava.security.auth.login.config=%ARTEMIS_ETC_DIR%\login.config 
-Dhawtio.disableProxy=true -Dhawtio.offline=true -Dhawtio.realm=activemq 
-Dhawtio.role=${role} 
-Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal
 -Dhawtio.http.strictTransportSecurity=max-age=31536000;includeSubDo [...]
 
 rem Logs Safepoints JVM pauses: Uncomment to enable them
 rem In addition to the traditional GC logs you could enable some JVM flags to 
know any meaningful and "hidden" pause that could