Fix authentication, bump to 5.18.4

Author: Thomas Lutz

.gitignore

@@ -1 +1,2 @@
-.idea
+.idea
+.DS_Store

Dockerfile

@@ -2,7 +2,7 @@ FROM bellsoft/liberica-openjdk-alpine:17
 
 LABEL maintainer="Thomas Lutz <lutz@symptoma.com>"
 
-ENV ACTIVEMQ_VERSION 5.18.3
+ENV ACTIVEMQ_VERSION 5.18.4
 ENV ACTIVEMQ apache-activemq-$ACTIVEMQ_VERSION
 ENV ACTIVEMQ_HOME /opt/activemq
 

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Symptoma
+Copyright (c) 2024 Symptoma
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -25,7 +25,7 @@ symptoma/activemq:latest
 
 ## ActiveMQ version
 
-Current version of ActiveMQ is **5.18.3**: https://archive.apache.org/dist/activemq/5.18.3/
+Current version of ActiveMQ is **5.18.4**: https://archive.apache.org/dist/activemq/5.18.4/
 
 Note: Since ActiveMQ 5.16.0 the Web Console is not reachable by default, as it only listens to 127.0.0.1 inside the container. See [AMQ-8018](https://issues.apache.org/jira/browse/AMQ-8018) for more details.
 

entrypoint.sh

@@ -22,14 +22,19 @@ if [ -n "$ACTIVEMQ_API_CONTEXTPATH" ]; then
   sed -iv "s#<property name=\"contextPath\" value=\"/api\" />#<property name=\"contextPath\" value=\"${ACTIVEMQ_API_CONTEXTPATH}\" />#" conf/jetty.xml
 fi
 
-if [ -n "$ACTIVEMQ_USERNAME" ]; then
-  echo "Setting activemq username to $ACTIVEMQ_USERNAME"
-  sed -i "s#activemq.username=system#activemq.username=$ACTIVEMQ_USERNAME#" conf/credentials.properties
-fi
-
-if [ -n "$ACTIVEMQ_PASSWORD" ]; then
-  echo "Setting activemq password"
-  sed -i "s#activemq.password=manager#activemq.password=$ACTIVEMQ_PASSWORD#" conf/credentials.properties
+# Enable security by adding simpleAuthenticationPlugin
+if [ -n "$ACTIVEMQ_USERNAME" ] && [ -n "$ACTIVEMQ_PASSWORD" ]; then
+  echo "Enabling security by adding simpleAuthenticationPlugin to activemq.xml"
+  if ! grep -q "<simpleAuthenticationPlugin>" conf/activemq.xml; then
+    sed -i '/<\/broker>/i \
+    <plugins>\
+      <simpleAuthenticationPlugin>\
+        <users>\
+          <authenticationUser username="'"$ACTIVEMQ_USERNAME"'" password="'"$ACTIVEMQ_PASSWORD"'" groups="users,admins"/>\
+        </users>\
+      </simpleAuthenticationPlugin>\
+    </plugins>' conf/activemq.xml
+  fi
 fi
 
 if [ -n "$ACTIVEMQ_WEBADMIN_USERNAME" ]; then