activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject git commit: https://issues.apache.org/jira/browse/AMQ-4594 - removing hawtio from basic auth and using it's own mechanism
Date Mon, 07 Oct 2013 14:29:30 GMT
Updated Branches:
  refs/heads/trunk 7c63788e1 -> ce9be7b11


https://issues.apache.org/jira/browse/AMQ-4594 - removing hawtio from basic auth and using
it's own mechanism


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/ce9be7b1
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/ce9be7b1
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/ce9be7b1

Branch: refs/heads/trunk
Commit: ce9be7b11a303d232c14a396677273b8a5876d33
Parents: 7c63788
Author: Dejan Bosanac <dejan@nighttale.net>
Authored: Mon Oct 7 16:28:43 2013 +0200
Committer: Dejan Bosanac <dejan@nighttale.net>
Committed: Mon Oct 7 16:29:12 2013 +0200

----------------------------------------------------------------------
 assembly/src/release/bin/activemq           |  2 +-
 assembly/src/release/conf/groups.properties | 18 ++++++++++++++++++
 assembly/src/release/conf/jetty.xml         |  2 +-
 assembly/src/release/conf/login.config      | 22 ++++++++++++++++++++++
 assembly/src/release/conf/users.properties  | 18 ++++++++++++++++++
 5 files changed, 60 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/ce9be7b1/assembly/src/release/bin/activemq
----------------------------------------------------------------------
diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
index 038b1b3..fce73e4 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -249,7 +249,7 @@ if [ "$CONFIG_LOAD" != "yes" ];then
 fi
 
 if [ -z "$ACTIVEMQ_OPTS" ] ; then
-    ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Djava.util.logging.config.file=logging.properties
-Dhawtio.authenticationEnabled=false"
+    ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Djava.util.logging.config.file=logging.properties
-Dhawtio.realm=activemq -Dhawtio.role=admins -Dhawtio.rolePrincipalClasses=org.apache.activemq.jaas.GroupPrincipal
-Djava.security.auth.login.config=$ACTIVEMQ_CONF/login.config"
 fi
 
 # create configuration if requested

http://git-wip-us.apache.org/repos/asf/activemq/blob/ce9be7b1/assembly/src/release/conf/groups.properties
----------------------------------------------------------------------
diff --git a/assembly/src/release/conf/groups.properties b/assembly/src/release/conf/groups.properties
new file mode 100644
index 0000000..6a83df9
--- /dev/null
+++ b/assembly/src/release/conf/groups.properties
@@ -0,0 +1,18 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+admins=admin
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq/blob/ce9be7b1/assembly/src/release/conf/jetty.xml
----------------------------------------------------------------------
diff --git a/assembly/src/release/conf/jetty.xml b/assembly/src/release/conf/jetty.xml
index 696487f..9bb0343 100644
--- a/assembly/src/release/conf/jetty.xml
+++ b/assembly/src/release/conf/jetty.xml
@@ -39,7 +39,7 @@
     </bean>
     <bean id="securityConstraintMapping" class="org.eclipse.jetty.security.ConstraintMapping">
         <property name="constraint" ref="securityConstraint" />
-        <property name="pathSpec" value="/admin/*,/hawtio/*,*.jsp" />
+        <property name="pathSpec" value="/admin/*,*.jsp" />
     </bean>
     <bean id="adminSecurityConstraintMapping" class="org.eclipse.jetty.security.ConstraintMapping">
         <property name="constraint" ref="adminSecurityConstraint" />

http://git-wip-us.apache.org/repos/asf/activemq/blob/ce9be7b1/assembly/src/release/conf/login.config
----------------------------------------------------------------------
diff --git a/assembly/src/release/conf/login.config b/assembly/src/release/conf/login.config
new file mode 100644
index 0000000..1a5abb0
--- /dev/null
+++ b/assembly/src/release/conf/login.config
@@ -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.
+ */
+activemq {
+    org.apache.activemq.jaas.PropertiesLoginModule required
+        debug=true
+        org.apache.activemq.jaas.properties.user="users.properties"
+        org.apache.activemq.jaas.properties.group="groups.properties";
+};
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq/blob/ce9be7b1/assembly/src/release/conf/users.properties
----------------------------------------------------------------------
diff --git a/assembly/src/release/conf/users.properties b/assembly/src/release/conf/users.properties
new file mode 100644
index 0000000..ef96326
--- /dev/null
+++ b/assembly/src/release/conf/users.properties
@@ -0,0 +1,18 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+admin=admin
\ No newline at end of file


Mime
View raw message