From 8ef1d794f70f286a0bc6a006073d9100d7ad4462 Mon Sep 17 00:00:00 2001
From: Bosanac Dejan <dejanb@apache.org>
Date: Fri, 3 Sep 2010 10:15:31 +0000
Subject: [PATCH] https://issues.apache.org/activemq/browse/AMQ-2460 - improve
 encrypted passwords

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@992251 13f79535-47bb-0310-9956-ffa450edef68
---
 assembly/src/release/conf/activemq.xml        | 16 +++++---------
 .../release/conf/credentials-enc.properties   | 22 +++++++++++++++++++
 .../src/release/conf/credentials.properties   |  6 ++---
 .../admin/WEB-INF/webconsole-embedded.xml     | 14 +++++-------
 .../camel/WEB-INF/applicationContext.xml      | 14 +++++-------
 assembly/src/sample-conf/activemq-command.xml |  2 +-
 assembly/src/sample-conf/activemq-demo.xml    |  2 +-
 .../activemq-dynamic-network-broker1.xml      |  4 ++--
 .../activemq-dynamic-network-broker2.xml      |  4 ++--
 assembly/src/sample-conf/activemq-jdbc.xml    |  2 +-
 .../src/sample-conf/activemq-scalability.xml  |  2 +-
 .../src/sample-conf/activemq-security.xml     | 20 ++++++++++++-----
 .../activemq-static-network-broker1.xml       |  4 ++--
 .../activemq-static-network-broker2.xml       |  4 ++--
 assembly/src/sample-conf/activemq-stomp.xml   |  2 +-
 .../src/sample-conf/activemq-throughput.xml   |  3 +++
 16 files changed, 70 insertions(+), 51 deletions(-)
 create mode 100644 assembly/src/release/conf/credentials-enc.properties

diff --git a/assembly/src/release/conf/activemq.xml b/assembly/src/release/conf/activemq.xml
index 3156e1a93e..cbcde811de 100755
--- a/assembly/src/release/conf/activemq.xml
+++ b/assembly/src/release/conf/activemq.xml
@@ -21,16 +21,12 @@
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
   http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
 
-    <!-- Allows us to use encrypted system properties as variables in this configuration file -->
-    <bean id="configurationEncryptor" class="org.jasypt.encryption.pbe.StandardPBEStringEncryptor"> 
-        <property name="algorithm" value="PBEWithMD5AndDES"/> 
-        <property name="password" value="activemq"/> 
-    </bean> 
-
-    <bean id="propertyConfigurer" class="org.jasypt.spring.properties.EncryptablePropertyPlaceholderConfigurer"> 
-        <constructor-arg ref="configurationEncryptor" /> 
-        <property name="location" value="file:${activemq.base}/conf/credentials.properties"/> 
-    </bean> 
+    <!-- Allows us to use system properties as variables in this configuration file -->
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+        <property name="locations">
+            <value>file:${activemq.base}/conf/credentials.properties</value>
+        </property>      
+    </bean>
 
     <!-- 
         The <broker> element is used to configure the ActiveMQ broker. 
diff --git a/assembly/src/release/conf/credentials-enc.properties b/assembly/src/release/conf/credentials-enc.properties
new file mode 100644
index 0000000000..cecb793aa8
--- /dev/null
+++ b/assembly/src/release/conf/credentials-enc.properties
@@ -0,0 +1,22 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+## 
+## http://www.apache.org/licenses/LICENSE-2.0
+## 
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+# Defines credentials that will be used by components (like web console) to access the broker
+
+activemq.username=system
+activemq.password=ENC(mYRkg+4Q4hua1kvpCCI2hg==)
+guest.password=ENC(Cf3Jf3tM+UrSOoaKU50od5CuBa8rxjoL)
\ No newline at end of file
diff --git a/assembly/src/release/conf/credentials.properties b/assembly/src/release/conf/credentials.properties
index 86f719940f..7f56375075 100644
--- a/assembly/src/release/conf/credentials.properties
+++ b/assembly/src/release/conf/credentials.properties
@@ -18,7 +18,5 @@
 # Defines credentials that will be used by components (like web console) to access the broker
 
 activemq.username=system
-#activemq.password=manager
-activemq.password=ENC(mYRkg+4Q4hua1kvpCCI2hg==)
-#guest.password=password
-guest.password=ENC(Cf3Jf3tM+UrSOoaKU50od5CuBa8rxjoL)
\ No newline at end of file
+activemq.password=manager
+guest.password=password
\ No newline at end of file
diff --git a/assembly/src/release/webapps/admin/WEB-INF/webconsole-embedded.xml b/assembly/src/release/webapps/admin/WEB-INF/webconsole-embedded.xml
index c3602373c1..7cfe7042e2 100644
--- a/assembly/src/release/webapps/admin/WEB-INF/webconsole-embedded.xml
+++ b/assembly/src/release/webapps/admin/WEB-INF/webconsole-embedded.xml
@@ -21,15 +21,11 @@
      
   <import resource="webconsole-query.xml"/>
      
-  <!-- Allows us to use encrypted system properties as variables in this configuration file -->
-  <bean id="configurationEncryptor" class="org.jasypt.encryption.pbe.StandardPBEStringEncryptor"> 
-      <property name="algorithm" value="PBEWithMD5AndDES"/> 
-      <property name="password" value="activemq"/> 
-  </bean> 
-
-  <bean id="propertyConfigurer" class="org.jasypt.spring.properties.EncryptablePropertyPlaceholderConfigurer"> 
-      <constructor-arg ref="configurationEncryptor" /> 
-      <property name="location" value="file:${activemq.base}/conf/credentials.properties"/> 
+  <!-- Allows us to use system properties as variables in this configuration file -->
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+      <property name="locations">
+          <value>file:${activemq.base}/conf/credentials.properties</value>
+      </property>      
   </bean> 
   
   <!-- use the following bean for a local in-JVM broker -->
diff --git a/assembly/src/release/webapps/camel/WEB-INF/applicationContext.xml b/assembly/src/release/webapps/camel/WEB-INF/applicationContext.xml
index f075fb6f1a..d32dfc394b 100644
--- a/assembly/src/release/webapps/camel/WEB-INF/applicationContext.xml
+++ b/assembly/src/release/webapps/camel/WEB-INF/applicationContext.xml
@@ -25,15 +25,11 @@
        http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-    <!-- Allows us to use encrypted system properties as variables in this configuration file -->
-    <bean id="configurationEncryptor" class="org.jasypt.encryption.pbe.StandardPBEStringEncryptor"> 
-        <property name="algorithm" value="PBEWithMD5AndDES"/> 
-        <property name="password" value="activemq"/> 
-    </bean> 
-
-    <bean id="propertyConfigurer" class="org.jasypt.spring.properties.EncryptablePropertyPlaceholderConfigurer"> 
-        <constructor-arg ref="configurationEncryptor" /> 
-        <property name="location" value="file:${activemq.base}/conf/credentials.properties"/> 
+    <!-- Allows us to use system properties as variables in this configuration file -->
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+        <property name="locations">
+            <value>file:${activemq.base}/conf/credentials.properties</value>
+        </property>      
     </bean> 
 
     <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
diff --git a/assembly/src/sample-conf/activemq-command.xml b/assembly/src/sample-conf/activemq-command.xml
index e80ae2c29c..680689a36f 100644
--- a/assembly/src/sample-conf/activemq-command.xml
+++ b/assembly/src/sample-conf/activemq-command.xml
@@ -23,7 +23,7 @@
     
     To run ActiveMQ with this configuration add xbean:conf/activemq-command.xml to your command
     
-    e.g. $ bin/activemq xbean:conf/activemq-command.xml
+    e.g. $ bin/activemq console xbean:conf/activemq-command.xml
  -->
  <beans
   xmlns="http://www.springframework.org/schema/beans"
diff --git a/assembly/src/sample-conf/activemq-demo.xml b/assembly/src/sample-conf/activemq-demo.xml
index 265b73cafe..b01c91929f 100644
--- a/assembly/src/sample-conf/activemq-demo.xml
+++ b/assembly/src/sample-conf/activemq-demo.xml
@@ -19,7 +19,7 @@
     
     To run ActiveMQ with this configuration add xbean:conf/activemq-demo.xml to your command
     
-    e.g. $ bin/activemq xbean:conf/activemq-demo.xml
+    e.g. $ bin/activemq console xbean:conf/activemq-demo.xml
  -->
 <beans
   xmlns="http://www.springframework.org/schema/beans"
diff --git a/assembly/src/sample-conf/activemq-dynamic-network-broker1.xml b/assembly/src/sample-conf/activemq-dynamic-network-broker1.xml
index 6f0fbe0d30..7e7e7c4844 100644
--- a/assembly/src/sample-conf/activemq-dynamic-network-broker1.xml
+++ b/assembly/src/sample-conf/activemq-dynamic-network-broker1.xml
@@ -22,11 +22,11 @@
     
     To run this example network of ActiveMQ brokers run
     
-    $ bin/activemq xbean:conf/activemq-dynamic-network-broker1.xml
+    $ bin/activemq console xbean:conf/activemq-dynamic-network-broker1.xml
     
     and
     
-    $ bin/activemq xbean:conf/activemq-dynamic-network-broker2.xml
+    $ bin/activemq console xbean:conf/activemq-dynamic-network-broker2.xml
     
     in separate consoles
  -->
diff --git a/assembly/src/sample-conf/activemq-dynamic-network-broker2.xml b/assembly/src/sample-conf/activemq-dynamic-network-broker2.xml
index ad3152d782..9eced178f4 100644
--- a/assembly/src/sample-conf/activemq-dynamic-network-broker2.xml
+++ b/assembly/src/sample-conf/activemq-dynamic-network-broker2.xml
@@ -22,11 +22,11 @@
     
     To run this example network of ActiveMQ brokers run
     
-    $ bin/activemq xbean:conf/activemq-dynamic-network-broker1.xml
+    $ bin/activemq console xbean:conf/activemq-dynamic-network-broker1.xml
     
     and
     
-    $ bin/activemq xbean:conf/activemq-dynamic-network-broker2.xml
+    $ bin/activemq console xbean:conf/activemq-dynamic-network-broker2.xml
     
     in separate consoles
  -->
diff --git a/assembly/src/sample-conf/activemq-jdbc.xml b/assembly/src/sample-conf/activemq-jdbc.xml
index a1935a5fa3..11e9b26078 100644
--- a/assembly/src/sample-conf/activemq-jdbc.xml
+++ b/assembly/src/sample-conf/activemq-jdbc.xml
@@ -26,7 +26,7 @@
     
     To run ActiveMQ with this configuration add xbean:conf/activemq-jdbc.xml to your command
     
-    e.g. $ bin/activemq xbean:conf/activemq-jdbc.xml
+    e.g. $ bin/activemq console xbean:conf/activemq-jdbc.xml
  -->
 <beans
   xmlns="http://www.springframework.org/schema/beans"
diff --git a/assembly/src/sample-conf/activemq-scalability.xml b/assembly/src/sample-conf/activemq-scalability.xml
index 124c7e633d..725ffb94b5 100644
--- a/assembly/src/sample-conf/activemq-scalability.xml
+++ b/assembly/src/sample-conf/activemq-scalability.xml
@@ -27,7 +27,7 @@
     e.g. ACTIVEMQ_OPTS="-Xmx1024M -Dorg.apache.activemq.UseDedicatedTaskRunner=false"
     
     To run ActiveMQ with this configuration add xbean:conf/activemq-scalability.xml to your command
-    e.g. $ bin/activemq xbean:conf/activemq-scalability.xml
+    e.g. $ bin/activemq console xbean:conf/activemq-scalability.xml
  -->
 <beans
   xmlns="http://www.springframework.org/schema/beans"
diff --git a/assembly/src/sample-conf/activemq-security.xml b/assembly/src/sample-conf/activemq-security.xml
index 8f8939b5d8..caa7cb971c 100644
--- a/assembly/src/sample-conf/activemq-security.xml
+++ b/assembly/src/sample-conf/activemq-security.xml
@@ -21,9 +21,13 @@
     
     http://activemq.apache.org/security.html
     
+    Beofre you can run this configuration, you need to set ACTIVEMQ_ENCRYPTION_PASSWORD environment variable, like
+    
+    $ export ACTIVEMQ_ENCRYPTION_PASSWORD=activemq
+    
     To run ActiveMQ with this configuration add xbean:conf/activemq-security.xml to your command
     
-    e.g. $ bin/activemq xbean:conf/activemq-security.xml
+    e.g. $ bin/activemq console xbean:conf/activemq-security.xml
  -->
 <beans
   xmlns="http://www.springframework.org/schema/beans"
@@ -33,14 +37,18 @@
   http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
   
   <!-- Allows us to use encrypted system properties as variables in this configuration file -->
-  <bean id="configurationEncryptor" class="org.jasypt.encryption.pbe.StandardPBEStringEncryptor"> 
-      <property name="algorithm" value="PBEWithMD5AndDES"/> 
-      <property name="password" value="activemq"/> 
-  </bean> 
+  <bean id="environmentVariablesConfiguration" class="org.jasypt.encryption.pbe.config.EnvironmentStringPBEConfig">
+    <property name="algorithm" value="PBEWithMD5AndDES" />
+    <property name="passwordEnvName" value="ACTIVEMQ_ENCRYPTION_PASSWORD" />
+  </bean>
+                                                                     
+  <bean id="configurationEncryptor" class="org.jasypt.encryption.pbe.StandardPBEStringEncryptor">
+    <property name="config" ref="environmentVariablesConfiguration" />
+  </bean>  
     
   <bean id="propertyConfigurer" class="org.jasypt.spring.properties.EncryptablePropertyPlaceholderConfigurer"> 
       <constructor-arg ref="configurationEncryptor" /> 
-      <property name="location" value="file:${activemq.base}/conf/credentials.properties"/> 
+      <property name="location" value="file:${activemq.base}/conf/credentials-enc.properties"/> 
   </bean> 
 
   <broker useJmx="true" persistent="false" xmlns="http://activemq.apache.org/schema/core" destroyApplicationContextOnStop="true">
diff --git a/assembly/src/sample-conf/activemq-static-network-broker1.xml b/assembly/src/sample-conf/activemq-static-network-broker1.xml
index 1ce05a1702..a1a5646bb7 100644
--- a/assembly/src/sample-conf/activemq-static-network-broker1.xml
+++ b/assembly/src/sample-conf/activemq-static-network-broker1.xml
@@ -22,11 +22,11 @@
     
     To run this example network of ActiveMQ brokers run
     
-    $ bin/activemq xbean:conf/activemq-static-network-broker1.xml
+    $ bin/activemq console xbean:conf/activemq-static-network-broker1.xml
     
     and
     
-    $ bin/activemq xbean:conf/activemq-static-network-broker2.xml
+    $ bin/activemq console xbean:conf/activemq-static-network-broker2.xml
     
     in separate consoles
  -->
diff --git a/assembly/src/sample-conf/activemq-static-network-broker2.xml b/assembly/src/sample-conf/activemq-static-network-broker2.xml
index 3f9b326e2c..9a6db84f5b 100644
--- a/assembly/src/sample-conf/activemq-static-network-broker2.xml
+++ b/assembly/src/sample-conf/activemq-static-network-broker2.xml
@@ -22,11 +22,11 @@
     
     To run this example network of ActiveMQ brokers run
     
-    $ bin/activemq xbean:conf/activemq-static-network-broker1.xml
+    $ bin/activemq console xbean:conf/activemq-static-network-broker1.xml
     
     and
     
-    $ bin/activemq xbean:conf/activemq-static-network-broker2.xml
+    $ bin/activemq console xbean:conf/activemq-static-network-broker2.xml
     
     in separate consoles
  -->
diff --git a/assembly/src/sample-conf/activemq-stomp.xml b/assembly/src/sample-conf/activemq-stomp.xml
index 9db06c25f0..9de4229a15 100644
--- a/assembly/src/sample-conf/activemq-stomp.xml
+++ b/assembly/src/sample-conf/activemq-stomp.xml
@@ -25,7 +25,7 @@
     e.g. ACTIVEMQ_OPTS="-Xmx1024M -Dorg.apache.activemq.UseDedicatedTaskRunner=false"
     
     To run ActiveMQ with this configuration add xbean:conf/activemq-stomp.xml to your command
-    e.g. $ bin/activemq xbean:conf/activemq-stomp.xml
+    e.g. $ bin/activemq console xbean:conf/activemq-stomp.xml
  -->
 <beans
   xmlns="http://www.springframework.org/schema/beans"
diff --git a/assembly/src/sample-conf/activemq-throughput.xml b/assembly/src/sample-conf/activemq-throughput.xml
index f97bc3d717..01824881ec 100644
--- a/assembly/src/sample-conf/activemq-throughput.xml
+++ b/assembly/src/sample-conf/activemq-throughput.xml
@@ -20,6 +20,9 @@
     
     For more information, see:
     http://activemq.apache.org/performance-tuning.html
+    
+    To run ActiveMQ with this configuration add xbean:conf/activemq-throughput.xml to your command
+    e.g. $ bin/activemq console xbean:conf/activemq-throughput.xml
  -->
 <beans
   xmlns="http://www.springframework.org/schema/beans"