Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8548417549 for ; Mon, 2 Feb 2015 19:18:59 +0000 (UTC) Received: (qmail 50195 invoked by uid 500); 2 Feb 2015 19:19:00 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 50150 invoked by uid 500); 2 Feb 2015 19:19:00 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 50141 invoked by uid 99); 2 Feb 2015 19:19:00 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2015 19:19:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1C784E035D; Mon, 2 Feb 2015 19:19:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Mon, 02 Feb 2015 19:19:00 -0000 Message-Id: <30a59478a17148419b2f1f4be0b0fea6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] activemq-6 git commit: ACTIVEMQ6-74 - removing unused old jaas implementation and associated tests etc Repository: activemq-6 Updated Branches: refs/heads/master 9900d5331 -> 58cc02565 ACTIVEMQ6-74 - removing unused old jaas implementation and associated tests etc https://issues.apache.org/jira/browse/ACTIVEMQ6-74 This is ready for the import of the ActiveMQ 5 JAAS implementation for 6.1 Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/076faa75 Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/076faa75 Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/076faa75 Branch: refs/heads/master Commit: 076faa759fe39ed71742e608bec7afa878c5a64a Parents: 9900d53 Author: Andy Taylor Authored: Thu Jan 29 10:03:40 2015 +0000 Committer: Andy Taylor Committed: Mon Feb 2 15:45:58 2015 +0000 ---------------------------------------------------------------------- activemq-website/src/main/resources/index.html | 2 - docs/user-manual/en/security.md | 172 +++------------ examples/jms/jaas/pom.xml | 153 ------------- examples/jms/jaas/readme.html | 117 ---------- .../jms/example/ExampleCallbackHandler.java | 38 ---- .../jms/example/ExampleConfiguration.java | 58 ----- .../jms/example/ExampleLoginModule.java | 142 ------------ .../activemq/jms/example/JAASExample.java | 103 --------- .../activemq/server0/activemq-configuration.xml | 62 ------ .../jms/jaas/src/main/resources/jndi.properties | 20 -- examples/jms/pom.xml | 2 - .../integration/security/SecurityTest.java | 170 --------------- .../security/impl/JAASSecurityManagerTest.java | 216 ------------------- 13 files changed, 29 insertions(+), 1226 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-6/blob/076faa75/activemq-website/src/main/resources/index.html ---------------------------------------------------------------------- diff --git a/activemq-website/src/main/resources/index.html b/activemq-website/src/main/resources/index.html index 160d1f4..f86a643 100644 --- a/activemq-website/src/main/resources/index.html +++ b/activemq-website/src/main/resources/index.html @@ -89,7 +89,6 @@
  • JMS HTTP Example
  • JMS Instantiate Connection Factory Example
  • JMS Interceptor Example
    • -
  • JAAS Example
  • JMS Auto Closable Example
  • JMS Bridge Example
  • JMS Completion Listener Example
    • @@ -150,7 +149,6 @@
  • JMS XA Heuristic Example
  • JMS XA Receive Example
  • JMS XA Send Example
    • -
  • JMS XA with JTA Example
    • http://git-wip-us.apache.org/repos/asf/activemq-6/blob/076faa75/docs/user-manual/en/security.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/security.md b/docs/user-manual/en/security.md index efc610a..9e49adf 100644 --- a/docs/user-manual/en/security.md +++ b/docs/user-manual/en/security.md @@ -54,7 +54,7 @@ specified. If the user has any of those roles, he/she will be granted that permission for that set of addresses. Let's take a simple example, here's a security block from -`activemq-configuration.xml` or `activemq-queues.xml` file: +`activemq-configuration.xml` file: @@ -67,7 +67,7 @@ Let's take a simple example, here's a security block from The '`#`' character signifies "any sequence of words". Words are delimited by the '`.`' character. For a full description of the wildcard -syntax please see [Understanding the HornetQ Wildcard Syntax](wildcard-syntax.md). +syntax please see [Understanding the HornetQ Wildcard Syntax](wildcard-syntax.md). The above security block applies to any address that starts with the string "globalqueues.europe.": @@ -132,159 +132,45 @@ For more information on configuring the SSL transport, please see [Configuring t ## Basic user credentials ActiveMQ ships with a security manager implementation that reads user -credentials, i.e. user names, passwords and role information from an xml -file on the classpath called `activemq-users.xml`. This is the default -security manager. +credentials, i.e. user names, passwords and role information from properties +files on the classpath called `activemq-users.properties` and `activemq-roles.properties`. This is the default security manager. If you wish to use this security manager, then users, passwords and -roles can easily be added into this file. +roles can easily be added into these files. -Let's take a look at an example file: +To configure this manager then it needs to be added to the `bootstrap.xml` configuration. +Lets take a look at what this might look like: - + + file:${activemq.home}/config/non-clustered/activemq-users.properties + file:${activemq.home}/config/non-clustered/activemq-roles.properties + guest + - - - +The first 2 elements `users` and `roles` define what properties files should be used to load in the users and passwords. - - - - - - - - - - - - - - - - -The first thing to note is the element `defaultuser`. This defines what +The next thing to note is the element `defaultuser`. This defines what user will be assumed when the client does not specify a username/password when creating a session. In this case they will be the -user `guest` and have the role also called `guest`. Multiple roles can -be specified for a default user. - -We then have three more users, the user `tim` has the role `admin`. The -user `andy` has the roles `admin` and `guest`, and the user `jeff` has -the roles `europe-users` and `guest`. - -## Changing the security manager - -If you do not want to use the default security manager then you can -specify a different one by editing the file `activemq-beans.xml` (or -`activemq-jboss-beans.xml` if you're running JBoss Application Server) -and changing the class for the `ActiveMQSecurityManager` bean. - -Let's take a look at a snippet from the default beans file: - - - - - - - -The class -`org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl` is -the default security manager that is used by the standalone server. - -ActiveMQ ships with two other security manager implementations you can -use off-the-shelf; one a JAAS security manager and another for -integrating with JBoss Application Sever security, alternatively you -could write your own implementation by implementing the -`org.apache.activemq.spi.core.security.ActiveMQSecurityManager` -interface, and specifying the classname of your implementation in the -file `activemq-beans.xml` (or `activemq-jboss-beans.xml` if you're -running JBoss Application Server). - -These two implementations are discussed in the next two sections. - -## JAAS Security Manager - -JAAS stands for 'Java Authentication and Authorization Service' and is a -standard part of the Java platform. It provides a common API for -security authentication and authorization, allowing you to plugin your -pre-built implementations. - -To configure the JAAS security manager to work with your pre-built JAAS -infrastructure you need to specify the security manager as a -`JAASSecurityManager` in the beans file. Here's an example: - - - - - - org.apache.activemq.jms.example.ExampleLoginModule - - - - - - - - -Note that you need to feed the JAAS security manager with three -properties: - -- ConfigurationName: the name of the `LoginModule` implementation that - JAAS must use - -- Configuration: the `Configuration` implementation used by JAAS - -- CallbackHandler: the `CallbackHandler` implementation to use if user - interaction are required - -## Example - -See ? for an example which shows how ActiveMQ can be configured to use -JAAS. - -## JBoss AS Security Manager - -The JBoss AS security manager is used when running ActiveMQ inside the -JBoss Application server. This allows tight integration with the JBoss -Application Server's security model. - -The class name of this security manager is -`org.apache.activemq.integration.jboss.security.JBossASSecurityManager` - -Take a look at one of the default `activemq-jboss-beans.xml` files for -JBoss Application Server that are bundled in the distribution for an -example of how this is configured. - -### Configuring Client Login - -JBoss can be configured to allow client login, basically this is when a -JEE component such as a Servlet or EJB sets security credentials on the -current security context and these are used throughout the call. If you -would like these credentials to be used by ActiveMQ when sending or -consuming messages then set `allowClientLogin` to true. This will bypass -ActiveMQ authentication and propagate the provided Security Context. If -you would like ActiveMQ to authenticate using the propagated security -then set the `authoriseOnClientLogin` to true also. +user `guest`. Multiple roles can be specified for a default user in the +`activemq-roles.properties`. -There is more info on using the JBoss client login module -[here](http://community.jboss.org/wiki/ClientLoginModule) +Lets now take alook at the `activemq-users.properties` file, this is basically +just a set of key value pairs that define the users and their password, like so: -> **Note** -> -> If messages are sent non blocking then there is a chance that these -> could arrive on the server after the calling thread has completed -> meaning that the security context has been cleared. If this is the -> case then messages will need to be sent blocking + bill=activemq + andrew=activemq1 + frank=activemq2 + sam=activemq3 -### Changing the Security Domain +The `activemq-roles.properties` defines what groups these users belong too +where the key is the user and the value is a comma seperated list of the groups +the user belongs to, like so: -The name of the security domain used by the JBoss AS security manager -defaults to `java:/jaas/activemq - `. This can be changed by specifying `securityDomainName` -(e.g. java:/jaas/myDomain). + bill=user + andrew=europe-user,user + frank=us-user,news-user,user + sam=news-user,user ## Changing the username/password for clustering http://git-wip-us.apache.org/repos/asf/activemq-6/blob/076faa75/examples/jms/jaas/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/jaas/pom.xml b/examples/jms/jaas/pom.xml deleted file mode 100644 index e86300c..0000000 --- a/examples/jms/jaas/pom.xml +++ /dev/null @@ -1,153 +0,0 @@ - - - - - 4.0.0 - - - org.apache.activemq.examples.jms - jms-examples - 6.0.0-SNAPSHOT - - - activemq-jms-jaas-example - jar - ActiveMQ6 JMS "JAAS" Example - - - - org.apache.activemq.examples.jms - activemq-jms-examples-common - ${project.version} - - - org.apache.activemq - activemq-core-client - ${project.version} - - - org.apache.activemq - activemq-server - ${project.version} - - - org.apache.geronimo.specs - geronimo-jms_2.0_spec - - - - - - - org.apache.activemq - activemq-maven-plugin - - - start - - start - - - - org.apache.activemq.jms.example.ExampleLoginModule - - - org.apache.activemq.jms.example.ExampleLoginModule - - jboss - redhat - guest - - - - - - build.directory - ${basedir}/target/ - - - - - - runClient - - runClient - - - org.apache.activemq.jms.example.JAASExample - - tcp://localhost:5445 - - - - - stop - - stop - - - - - - org.apache.activemq.examples.jms - activemq-jms-jaas-example - ${project.version} - - - org.apache.activemq - activemq-core-client - ${project.version} - - - org.apache.activemq - activemq-server - ${project.version} - - - org.apache.activemq - activemq-jms-client - ${project.version} - - - org.apache.activemq - activemq-jms-server - ${project.version} - - - io.netty - netty-all - ${netty.version} - - - org.apache.geronimo.specs - geronimo-jms_2.0_spec - ${geronimo.jms.2.spec.version} - - - - false - ${basedir}/target/classes/activemq/server0 - - - - - - http://git-wip-us.apache.org/repos/asf/activemq-6/blob/076faa75/examples/jms/jaas/readme.html ---------------------------------------------------------------------- diff --git a/examples/jms/jaas/readme.html b/examples/jms/jaas/readme.html deleted file mode 100644 index 4c7d0d3..0000000 --- a/examples/jms/jaas/readme.html +++ /dev/null @@ -1,117 +0,0 @@ - - - - - ActiveMQ JAAS Example - - - - - -

    JAAS Example

    - -

    This example shows you how to configure ActiveMQ to use JAAS for security.

    -

    ActiveMQ can leverage JAAS to delegate user authentication and authorization to existing security infrastructure.

    - -

    - The example will show how to configure ActiveMQ with JAAS in activemq-beans.xml - (You would use activemq-jboss-beans.xml if you are running inside JBoss Application - Server). - It will use a simple LoginModule without any user interaction. - The example will create a connection and authenticate the user with this JAAS LoginModule, send a message - to a queue and receive it (see the Queue example for a complete description - of the application code) -

    -

    Note than the example actually sets the security manager via the maven pom.xml, however for we will discuss as if - the activemq-beans.xml is being configured, the example beans file can be found under the src/main/resources - directory

    -

    Example setup

    -

    ActiveMQ can use a JAAS security manager by specifying it in activemq-beans.xml:

    - 
    -             <!-- The security manager using JAAS -->
-             <bean name="ActiveMQSecurityManager" class="org.apache.activemq.integration.jboss.security.JAASSecurityManager">
-             <property name="configurationName">org.apache.activemq.jms.example.ExampleLoginModule</property>
-             <property name="configuration">
-             <inject bean="ExampleConfiguration"/>
-             </property>
-             <property name="callbackHandler">
-             <inject bean="ExampleCallbackHandler" />
-             </property>
-             </bean>
-
-             <!-- JAAS uses a simple LoginModule where the user credentials and roles are
-             specified as options in the constructor -->
-             <bean name="ExampleConfiguration" class="org.apache.activemq.jms.example.ExampleConfiguration">
-             <constructor>
-             <parameter>org.apache.activemq.jms.example.ExampleLoginModule</parameter>
-             <parameter>
-             <map class="java.util.HashMap" keyClass="java.lang.String"
-             valueClass="java.lang.String">
-             <entry>
-             <key>user</key>
-             <value>jboss</value>
-             </entry>
-             <entry>
-             <key>pass</key>
-             <value>redhat</value>
-             </entry>
-             <entry>
-             <key>role</key>
-             <value>guest</value>
-             </entry>
-             </map>
-             </parameter>
-             </constructor>
-             </bean>
-
-             <!-- the CallbackHandler does nothing as we don't have any user interaction -->
-             <bean name="ExampleCallbackHandler" class="org.apache.activemq.jms.example.ExampleCallbackHandler"
-             />
-
    - -
      -
    • the ActiveMQSecurityManager's configurationName must be the name of the Java class implementing LoginModule
      • -
    • the callbackHandler property must be an implementation of CallbackHandler. In this example, the ExampleCallbackHandler - does nothing since the authentication requires no user interaction
      • -
    • the configuration property must be an implementation of Configuration. For simplicity, we pass directly the - user credentials as options to the ExampleConfiguration constructor. These options will be passed to an instance - of ExampleLoginModule which will check that the only valid user is "jboss" with the password "redhat" - and it has the role "guest".
      • -
    - -

    Example step-by-step

    -

    To run the example, simply type mvn verify from this directory

    -

    The only relevant step with regard to JAAS configuration is step 4 (all the other - steps are identical to the Queue example). -

      -
    1. We create a JMS Connection with user "jboss" and password "redhat". Any other - combination of name and password won't be valid for the ExampleLoginModule
      2. - 
      -           connection = cf.createConnection("jboss", "redhat");
-
      -
    - -

    More information

    - - - - http://git-wip-us.apache.org/repos/asf/activemq-6/blob/076faa75/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/ExampleCallbackHandler.java ---------------------------------------------------------------------- diff --git a/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/ExampleCallbackHandler.java b/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/ExampleCallbackHandler.java deleted file mode 100644 index fbab367..0000000 --- a/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/ExampleCallbackHandler.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - * 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. - */ -package org.apache.activemq.jms.example; - -import java.io.IOException; - -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.callback.UnsupportedCallbackException; - -/** - * A ExampleCallbackHandler - * - * @author Jeff Mesnil - */ -public class ExampleCallbackHandler implements CallbackHandler -{ - - public void handle(final Callback[] callbacks) throws IOException, UnsupportedCallbackException - { - // do nothing, authentication is done - // by passing credentials directly to the ExampleLoginModule - } -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/076faa75/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/ExampleConfiguration.java ---------------------------------------------------------------------- diff --git a/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/ExampleConfiguration.java b/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/ExampleConfiguration.java deleted file mode 100644 index e36d442..0000000 --- a/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/ExampleConfiguration.java +++ /dev/null @@ -1,58 +0,0 @@ -/** - * 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. - */ -package org.apache.activemq.jms.example; - -import java.util.Map; - -import javax.security.auth.login.AppConfigurationEntry; -import javax.security.auth.login.Configuration; - -/** - * A ExampleConfiguration - * - * @author Jeff Mesnil - */ -public class ExampleConfiguration extends Configuration -{ - private Map options; - - private String loginModuleName; - - public ExampleConfiguration() - { - } - - public ExampleConfiguration(final String loginModuleName, final Map options) - { - this.loginModuleName = loginModuleName; - this.options = options; - } - - @Override - public AppConfigurationEntry[] getAppConfigurationEntry(final String name) - { - AppConfigurationEntry entry = new AppConfigurationEntry(loginModuleName, - AppConfigurationEntry.LoginModuleControlFlag.REQUIRED, - options); - return new AppConfigurationEntry[] { entry }; - } - - @Override - public void refresh() - { - } -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/076faa75/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/ExampleLoginModule.java ---------------------------------------------------------------------- diff --git a/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/ExampleLoginModule.java b/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/ExampleLoginModule.java deleted file mode 100644 index 1fff55b..0000000 --- a/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/ExampleLoginModule.java +++ /dev/null @@ -1,142 +0,0 @@ -/** - * 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. - */ -package org.apache.activemq.jms.example; - -import java.security.Principal; -import java.security.acl.Group; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; - -import javax.security.auth.Subject; -import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.login.LoginException; -import javax.security.auth.spi.LoginModule; - -import org.apache.activemq.spi.core.security.JAASSecurityManager; - -/** - * A ExampleLoginModule - * - * @author Jeff Mesnil - */ -public class ExampleLoginModule implements LoginModule -{ - - private Map options; - - private Subject subject; - - public ExampleLoginModule() - { - } - - public boolean abort() throws LoginException - { - return true; - } - - public boolean commit() throws LoginException - { - return true; - } - - public void initialize(final Subject subject, - final CallbackHandler callbackHandler, - final Map sharedState, - final Map options) - { - this.subject = subject; - // the credentials are passed directly to the - // login module through the options user, pass, role - this.options = options; - } - - public boolean login() throws LoginException - { - Iterator iterator = subject.getPrivateCredentials(char[].class).iterator(); - char[] passwordChars = iterator.next(); - String password = new String(passwordChars); - Iterator iterator2 = subject.getPrincipals().iterator(); - System.out.println("subject = " + subject); - String user = iterator2.next().getName(); - - boolean authenticated = user.equals(options.get("user")) && password.equals(options.get("pass")); - - if (authenticated) - { - Group roles = new SimpleGroup("Roles"); - roles.addMember(new JAASSecurityManager.SimplePrincipal((String)options.get("role"))); - subject.getPrincipals().add(roles); - } - System.out.format("JAAS authentication >>> user=%s, password=%s\n", user, password); - System.out.println("authenticated = " + authenticated); - return authenticated; - - } - - public Subject getSubject() - { - return subject; - } - - public boolean logout() throws LoginException - { - return true; - } - - public class SimpleGroup implements Group - { - private final String name; - - private final Set members = new HashSet(); - - public SimpleGroup(final String name) - { - this.name = name; - } - - public boolean addMember(final Principal principal) - { - return members.add(principal); - } - - public boolean isMember(final Principal principal) - { - return members.contains(principal); - } - - public Enumeration members() - { - return Collections.enumeration(members); - } - - public boolean removeMember(final Principal principal) - { - return members.remove(principal); - } - - public String getName() - { - return name; - } - } - -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/076faa75/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/JAASExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/JAASExample.java b/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/JAASExample.java deleted file mode 100644 index be797d1..0000000 --- a/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/JAASExample.java +++ /dev/null @@ -1,103 +0,0 @@ -/** - * 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. - */ -package org.apache.activemq.jms.example; - -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.Session; -import javax.jms.TextMessage; -import javax.naming.InitialContext; - -import org.apache.activemq.common.example.ActiveMQExample; - -/** - * A simple JMS Queue example that creates a producer and consumer on a queue and sends then receives a message. - * The ActiveMQ server is configured to use JAAS. - * - * @author Jeff Mesnil - */ -public class JAASExample extends ActiveMQExample -{ - public static void main(final String[] args) - { - new JAASExample().run(args); - } - - @Override - public boolean runExample() throws Exception - { - Connection connection = null; - InitialContext initialContext = null; - try - { - // Step 1. Create an initial context to perform the JNDI lookup. - initialContext = new InitialContext(); - - // Step 2. Perfom a lookup on the queue - Queue queue = (Queue)initialContext.lookup("queue/exampleQueue"); - - // Step 3. Perform a lookup on the Connection Factory - ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory"); - - // Step 4.Create a JMS Connection with user "jboss" and password "redhat" - connection = cf.createConnection("jboss", "redhat"); - - // Step 5. Create a JMS Session - Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - - // Step 6. Create a JMS Message Producer - MessageProducer producer = session.createProducer(queue); - - // Step 7. Create a Text Message - TextMessage message = session.createTextMessage("This is a text message"); - - System.out.println("Sent message: " + message.getText()); - - // Step 8. Send the Message - producer.send(message); - - // Step 9. Create a JMS Message Consumer - MessageConsumer messageConsumer = session.createConsumer(queue); - - // Step 10. Start the Connection - connection.start(); - - // Step 11. Receive the message - TextMessage messageReceived = (TextMessage)messageConsumer.receive(5000); - - System.out.println("Received message: " + messageReceived.getText()); - - return true; - } - finally - { - // Step 12. Be sure to close our JMS resources! - if (initialContext != null) - { - initialContext.close(); - } - if (connection != null) - { - connection.close(); - } - } - } - -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/076faa75/examples/jms/jaas/src/main/resources/activemq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/jaas/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jaas/src/main/resources/activemq/server0/activemq-configuration.xml deleted file mode 100644 index bb8c2d1..0000000 --- a/examples/jms/jaas/src/main/resources/activemq/server0/activemq-configuration.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - ${build.directory}/server0/data/messaging/bindings - - ${build.directory}/server0/data/messaging/journal - - ${build.directory}/server0/data/messaging/largemessages - - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/activemq-6/blob/076faa75/examples/jms/jaas/src/main/resources/jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/jaas/src/main/resources/jndi.properties b/examples/jms/jaas/src/main/resources/jndi.properties deleted file mode 100644 index 6364ce4..0000000 --- a/examples/jms/jaas/src/main/resources/jndi.properties +++ /dev/null @@ -1,20 +0,0 @@ -# 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. - -java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory -java.naming.provider.url=tcp://localhost:5445 -queue.queue/exampleQueue=exampleQueue http://git-wip-us.apache.org/repos/asf/activemq-6/blob/076faa75/examples/jms/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/pom.xml b/examples/jms/pom.xml index b7928de..56080ab 100644 --- a/examples/jms/pom.xml +++ b/examples/jms/pom.xml @@ -78,8 +78,6 @@ under the License. http-transport interceptor instantiate-connection-factory - - jms-bridge jmx large-message http://git-wip-us.apache.org/repos/asf/activemq-6/blob/076faa75/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SecurityTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SecurityTest.java index 99b12c8..3c25179 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SecurityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SecurityTest.java @@ -16,20 +16,9 @@ */ package org.apache.activemq.tests.integration.security; -import javax.security.auth.Subject; -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.callback.UnsupportedCallbackException; -import javax.security.auth.login.AppConfigurationEntry; -import javax.security.auth.login.LoginException; -import javax.security.auth.spi.LoginModule; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import java.io.IOException; -import java.security.acl.Group; -import java.util.HashMap; import java.util.HashSet; -import java.util.Map; import java.util.Set; import org.apache.activemq.api.core.ActiveMQException; @@ -47,10 +36,8 @@ import org.apache.activemq.core.server.ActiveMQServer; import org.apache.activemq.core.server.Queue; import org.apache.activemq.core.settings.HierarchicalRepository; import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl; -import org.apache.activemq.spi.core.security.JAASSecurityManager; import org.apache.activemq.tests.util.CreateMessage; import org.apache.activemq.tests.util.ServiceTestBase; -import org.jboss.security.SimpleGroup; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -894,85 +881,6 @@ public class SecurityTest extends ServiceTestBase } - /* - * basic JAAS tests - */ - - @Test - public void testJaasCreateSessionSucceeds() throws Exception - { - String domainName = SimpleLogingModule.class.getName(); - Configuration configuration = createDefaultConfig(false) - .setSecurityEnabled(true); - JAASSecurityManager securityManager = new JAASSecurityManager(); - ActiveMQServer server = createServer(false, configuration, securityManager); - - securityManager.setConfigurationName(domainName); - securityManager.setCallbackHandler(new CallbackHandler() - { - public void handle(final Callback[] callbacks) throws IOException, UnsupportedCallbackException - { - // empty callback, auth info are directly passed as options to the login module - } - }); - Map options = new HashMap(); - options.put("authenticated", Boolean.TRUE); - securityManager.setConfiguration(new SimpleConfiguration(domainName, options)); - server.start(); - ClientSessionFactory cf = createSessionFactory(locator); - - try - { - ClientSession session = cf.createSession(false, true, true); - - session.close(); - } - catch (ActiveMQException e) - { - Assert.fail("should not throw exception"); - } - - } - - @Test - public void testJaasCreateSessionFails() throws Exception - { - String domainName = SimpleLogingModule.class.getName(); - Configuration configuration = createDefaultConfig(false) - .setSecurityEnabled(true); - JAASSecurityManager securityManager = new JAASSecurityManager(); - ActiveMQServer server = createServer(false, configuration, securityManager); - - securityManager.setConfigurationName(domainName); - securityManager.setCallbackHandler(new CallbackHandler() - { - public void handle(final Callback[] callbacks) throws IOException, UnsupportedCallbackException - { - // empty callback, auth info are directly passed as options to the login module - } - }); - Map options = new HashMap(); - options.put("authenticated", Boolean.FALSE); - securityManager.setConfiguration(new SimpleConfiguration(domainName, options)); - server.start(); - ClientSessionFactory cf = createSessionFactory(locator); - - try - { - cf.createSession(false, true, true); - Assert.fail("should not throw exception"); - } - catch (ActiveMQSecurityException se) - { - //ok - } - catch (ActiveMQException e) - { - fail("Invalid Exception type:" + e.getType()); - } - - } - @Test public void testComplexRoles() throws Exception { @@ -1352,82 +1260,4 @@ public class SecurityTest extends ServiceTestBase fail("Invalid Exception type:" + e.getType()); } } - - public static class SimpleLogingModule implements LoginModule - { - private Map options; - - private Subject subject; - - public SimpleLogingModule() - { - } - - public boolean abort() throws LoginException - { - return true; - } - - public boolean commit() throws LoginException - { - return true; - } - - public void initialize(final Subject subject, final CallbackHandler callbackHandler, - final Map sharedState, final Map options) - { - this.subject = subject; - this.options = options; - } - - public boolean login() throws LoginException - { - boolean authenticated = (Boolean) options.get("authenticated"); - if (authenticated) - { - Group roles = new SimpleGroup("Roles"); - roles.addMember(new JAASSecurityManager.SimplePrincipal((String) options.get("role"))); - subject.getPrincipals().add(roles); - } - return authenticated; - - } - - public Subject getSubject() - { - return subject; - } - - public boolean logout() throws LoginException - { - return true; - } - } - - public static class SimpleConfiguration extends javax.security.auth.login.Configuration - { - private final Map options; - - private final String loginModuleName; - - public SimpleConfiguration(final String loginModuleName, final Map options) - { - this.loginModuleName = loginModuleName; - this.options = options; - } - - @Override - public AppConfigurationEntry[] getAppConfigurationEntry(final String name) - { - AppConfigurationEntry entry = - new AppConfigurationEntry(loginModuleName, AppConfigurationEntry.LoginModuleControlFlag.REQUIRED, - options); - return new AppConfigurationEntry[]{entry}; - } - - @Override - public void refresh() - { - } - } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/076faa75/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/security/impl/JAASSecurityManagerTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/security/impl/JAASSecurityManagerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/security/impl/JAASSecurityManagerTest.java deleted file mode 100644 index d9f7032..0000000 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/security/impl/JAASSecurityManagerTest.java +++ /dev/null @@ -1,216 +0,0 @@ -/** - * 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. - */ -package org.apache.activemq.tests.unit.core.security.impl; - -import javax.security.auth.Subject; -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.callback.UnsupportedCallbackException; -import javax.security.auth.login.AppConfigurationEntry; -import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag; -import javax.security.auth.login.Configuration; -import javax.security.auth.login.LoginException; -import javax.security.auth.spi.LoginModule; -import java.io.IOException; -import java.security.Principal; -import java.security.acl.Group; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; - -import org.apache.activemq.core.security.CheckType; -import org.apache.activemq.core.security.Role; -import org.apache.activemq.spi.core.security.JAASSecurityManager; -import org.apache.activemq.tests.util.UnitTestCase; -import org.jboss.security.SimpleGroup; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -/** - * tests the JAASSecurityManager - * - * @author Jeff Mesnil - */ -public class JAASSecurityManagerTest extends UnitTestCase -{ - private JAASSecurityManager securityManager; - - private static final String USER = "user"; - - private static final String PASSWORD = "password"; - - private static final String INVALID_PASSWORD = "invalidPassword"; - - private static final String ROLE = "role"; - - private static final String INVALID_ROLE = "invalidRole"; - - @Override - @Before - public void setUp() throws Exception - { - super.setUp(); - - securityManager = new JAASSecurityManager(); - - final String domainName = SimpleLogingModule.class.getName(); - // pass the correct user/pass and a role as options to the login module - final Map options = new HashMap(); - options.put("user", JAASSecurityManagerTest.USER); - options.put("pass", JAASSecurityManagerTest.PASSWORD); - options.put("role", JAASSecurityManagerTest.ROLE); - - securityManager.setConfigurationName(domainName); - securityManager.setCallbackHandler(new CallbackHandler() - { - public void handle(final Callback[] callbacks) throws IOException, UnsupportedCallbackException - { - // empty callback, auth info are directly passed as options to the login module - } - }); - securityManager.setConfiguration(new SimpleConfiguration(domainName, options)); - - } - - @Override - @After - public void tearDown() throws Exception - { - securityManager = null; - - super.tearDown(); - } - - @Test - public void testValidatingUser() - { - Assert.assertTrue(securityManager.validateUser(JAASSecurityManagerTest.USER, JAASSecurityManagerTest.PASSWORD)); - Assert.assertFalse(securityManager.validateUser(JAASSecurityManagerTest.USER, - JAASSecurityManagerTest.INVALID_PASSWORD)); - } - - @Test - public void testValidatingUserAndRole() - { - Set roles = new HashSet(); - roles.add(new Role(JAASSecurityManagerTest.ROLE, true, true, true, true, true, true, true)); - - Assert.assertTrue(securityManager.validateUserAndRole(JAASSecurityManagerTest.USER, - JAASSecurityManagerTest.PASSWORD, - roles, - CheckType.CREATE_DURABLE_QUEUE)); - - roles.clear(); - roles.add(new Role(JAASSecurityManagerTest.INVALID_ROLE, true, true, true, true, true, true, true)); - Assert.assertFalse(securityManager.validateUserAndRole(JAASSecurityManagerTest.USER, - JAASSecurityManagerTest.PASSWORD, - roles, - CheckType.CREATE_DURABLE_QUEUE)); - } - - public static class SimpleLogingModule implements LoginModule - { - - private Map options; - - private Subject subject; - - public SimpleLogingModule() - { - } - - public boolean abort() throws LoginException - { - return true; - } - - public boolean commit() throws LoginException - { - return true; - } - - public void initialize(final Subject subject, - final CallbackHandler callbackHandler, - final Map sharedState, - final Map options) - { - this.subject = subject; - this.options = options; - } - - public boolean login() throws LoginException - { - Iterator iterator = subject.getPrivateCredentials(char[].class).iterator(); - char[] passwordChars = iterator.next(); - String password = new String(passwordChars); - Iterator iterator2 = subject.getPrincipals().iterator(); - String user = iterator2.next().getName(); - - boolean authenticated = user.equals(options.get("user")) && password.equals(options.get("pass")); - - if (authenticated) - { - Group roles = new SimpleGroup("Roles"); - roles.addMember(new JAASSecurityManager.SimplePrincipal((String) options.get("role"))); - subject.getPrincipals().add(roles); - } - return authenticated; - - } - - public Subject getSubject() - { - return subject; - } - - public boolean logout() throws LoginException - { - return true; - } - } - - public static class SimpleConfiguration extends Configuration - { - private final Map options; - - private final String loginModuleName; - - public SimpleConfiguration(final String loginModuleName, final Map options) - { - this.loginModuleName = loginModuleName; - this.options = options; - } - - @Override - public AppConfigurationEntry[] getAppConfigurationEntry(final String name) - { - AppConfigurationEntry entry = new AppConfigurationEntry(loginModuleName, - LoginModuleControlFlag.REQUIRED, - options); - return new AppConfigurationEntry[]{entry}; - } - - @Override - public void refresh() - { - } - } -}