activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1175855 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security: JaasAuthenticationBroker.java JaasCertificateAuthenticationBroker.java SimpleAuthenticationBroker.java
Date Mon, 26 Sep 2011 13:14:46 GMT
Author: tabish
Date: Mon Sep 26 13:14:45 2011
New Revision: 1175855

URL: http://svn.apache.org/viewvc?rev=1175855&view=rev
Log:
apply patch for: https://issues.apache.org/jira/browse/AMQ-3509

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasCertificateAuthenticationBroker.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthenticationBroker.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java?rev=1175855&r1=1175854&r2=1175855&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java
Mon Sep 26 13:14:45 2011
@@ -80,7 +80,7 @@ public class JaasAuthenticationBroker ex
                     context.setSecurityContext(s);
                     securityContexts.add(s);
                 } catch (Exception e) {
-                    throw (SecurityException)new SecurityException("User name or password
is invalid.")
+                    throw (SecurityException)new SecurityException("User name [" + info.getUserName()
+ "] or password is invalid.")
                         .initCause(e);
                 }
             } finally {

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasCertificateAuthenticationBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasCertificateAuthenticationBroker.java?rev=1175855&r1=1175854&r2=1175855&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasCertificateAuthenticationBroker.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasCertificateAuthenticationBroker.java
Mon Sep 26 13:14:45 2011
@@ -99,7 +99,7 @@ public class JaasCertificateAuthenticati
                     SecurityContext s = new JaasCertificateSecurityContext(dnName, subject,
(X509Certificate[])info.getTransportContext());
                     context.setSecurityContext(s);
                 } catch (Exception e) {
-                    throw new SecurityException("User name or password is invalid: " + e.getMessage(),
e);
+                    throw new SecurityException("User name [" + info.getUserName() + "] or
password is invalid. " + e.getMessage(), e);
                 }
             } finally {
                 Thread.currentThread().setContextClassLoader(original);

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthenticationBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthenticationBroker.java?rev=1175855&r1=1175854&r2=1175855&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthenticationBroker.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthenticationBroker.java
Mon Sep 26 13:14:45 2011
@@ -78,7 +78,7 @@ public class SimpleAuthenticationBroker 
                 String pw = (String) userPasswords.get(info.getUserName());
                 if (pw == null || !pw.equals(info.getPassword())) {
                     throw new SecurityException(
-                            "User name or password is invalid.");
+                            "User name [" + info.getUserName() + "] or password is invalid.");
                 }
 
                 final Set groups = (Set) userGroups.get(info.getUserName());



Mime
View raw message