You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/03/03 13:14:16 UTC
svn commit: r1785293 - in /qpid/java/branches/6.0.x: ./
broker-core/src/main/java/org/apache/qpid/server/security/auth/database/
broker-core/src/test/java/org/apache/qpid/server/security/auth/database/
Author: orudyy
Date: Fri Mar 3 13:14:15 2017
New Revision: 1785293
URL: http://svn.apache.org/viewvc?rev=1785293&view=rev
Log:
QPID-7643: [Java Broker] Fix support for SASL mechanism 'PLAIN' in Base64MD5PasswordFile authentication provider
merged from 6.1.x branch using
svn merge -c 1785143 ^/qpid/java/branches/6.1.x
merge conflicts resolved manually
Modified:
qpid/java/branches/6.0.x/ (props changed)
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
qpid/java/branches/6.0.x/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 3 13:14:15 2017
@@ -9,6 +9,6 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/branches/6.1.x:1767487,1770199,1774599,1785279
+/qpid/java/branches/6.1.x:1767487,1770199,1774599,1785143,1785279
/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269,1717299,1717401,1717446,1717449,1717626,1717691,1717735,1717780,1718744,1718889,1718893,1718918,1718922,1719026,1719028,1719033,1719037,1719047,1719051,1720340,1720664,1721151,1721198,1722019-1722020,1722246,1722339,1722416,1722674,1722678,1722683,1722711,1723064,1723194,1723563,1724216,1724251,1724257,1724292,1724375,1724397,1724432,1724582,1724603,1724780,1724843-1724844,1725295,1725569,1725760,1726176,1726244-1726246,1726249,1726358,1726436,1726449,1726456,1726646,1726653,1726755,1726778,1727532,1727555,1727608,1727951,1727954,1728089,1728167,1728302,1728497,1728501,1728524,1728639,1728651,1728772,1729215,1729297,1729347,1729356,1729406,1729408,1729412,1729515,1729638,1729656-1729
657,1729783,1729828,1729832,1729841,1729851,1729886,1729904,1729973,1730019,1730025,1730052,1730072,1730088,1730494,1730499,1730547,1730559,1730567,1730578,1730585,1730651,1730697,1730712-1730713,1730805,1731029,1731110,1731210,1731225,1731444,1731551,1731612,1732184,1732452,1732461,1732465,1732525,1732812,1733467,1734452,1736478,1736751,1736838,1737804,1737835,1737853,1737984,1737992,1738119,1738135,1738231,1738271,1738607,1738610,1738731,1738914,1741702,1742257,1742284,1742339,1742544,1742900,1742926,1743161,1743228,1743383,1743982,1744012-1744013,1744046,1744123,1744157,1744276,1744403,1745424,1745450,1746140,1746273,1747526,1748254,1748723,1748818,1749349,1749399,1749482,1749524,1750359-1750360,1750943,1751433,1754251,1754354,1754392,1754429,1754510,1754550,1755561,1755957,1758628,1758640,1758766,1758964,1758980,1759774,1759783,1760032,1760337,1760522,1760546,1763653,1763966,1763988,1765350,1765609,1765828,1766032,1766547,1766553,1766796,1769597,1772365,1774446,1785117
/qpid/trunk/qpid:796646-796653
Modified: qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java?rev=1785293&r1=1785292&r2=1785293&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java (original)
+++ qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java Fri Mar 3 13:14:15 2017
@@ -143,20 +143,13 @@ public class Base64MD5PasswordFilePrinci
@Override
public SaslServer createSaslServer(String mechanism, String localFQDN, Principal externalPrincipal) throws SaslException
{
- CallbackHandler callbackHandler = _callbackHandlerMap.get(mechanism);
- if(callbackHandler == null)
- {
- throw new SaslException("Unsupported mechanism: " + mechanism);
- }
-
- //The SaslServers simply delegate to the built in CRAM-MD5 SaslServer
if(CRAMMD5HashedSaslServer.MECHANISM.equals(mechanism))
{
- return new CRAMMD5HashedSaslServer(mechanism, "AMQP", localFQDN, null, callbackHandler);
+ return new CRAMMD5HashedSaslServer(mechanism, "AMQP", localFQDN, null, getCallbackHandler(mechanism));
}
else if(CRAMMD5HexSaslServer.MECHANISM.equals(mechanism))
{
- return new CRAMMD5HexSaslServer(mechanism, "AMQP", localFQDN, null, callbackHandler);
+ return new CRAMMD5HexSaslServer(mechanism, "AMQP", localFQDN, null, getCallbackHandler(mechanism));
}
else if(PlainSaslServer.MECHANISM.equals(mechanism))
{
@@ -179,4 +172,14 @@ public class Base64MD5PasswordFilePrinci
throw new SaslException("Unsupported mechanism: " + mechanism);
}
+
+ private CallbackHandler getCallbackHandler(final String mechanism) throws SaslException
+ {
+ CallbackHandler callbackHandler = _callbackHandlerMap.get(mechanism);
+ if(callbackHandler == null)
+ {
+ throw new SaslException("Unsupported mechanism: " + mechanism);
+ }
+ return callbackHandler;
+ }
}
Modified: qpid/java/branches/6.0.x/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java?rev=1785293&r1=1785292&r2=1785293&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java (original)
+++ qpid/java/branches/6.0.x/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java Fri Mar 3 13:14:15 2017
@@ -22,9 +22,14 @@ package org.apache.qpid.server.security.
import org.apache.qpid.server.security.auth.UsernamePrincipal;
import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.server.security.auth.sasl.crammd5.CRAMMD5HashedSaslServer;
+import org.apache.qpid.server.security.auth.sasl.crammd5.CRAMMD5HexSaslServer;
+import org.apache.qpid.server.security.auth.sasl.plain.PlainSaslServer;
import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.login.AccountNotFoundException;
+import javax.security.sasl.SaslException;
+import javax.security.sasl.SaslServer;
import javax.xml.bind.DatatypeConverter;
import java.io.BufferedReader;
@@ -37,7 +42,9 @@ import java.io.IOException;
import java.security.Principal;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import java.util.regex.Pattern;
public class Base64MD5PasswordFilePrincipalDatabaseTest extends QpidTestCase
@@ -451,4 +458,30 @@ public class Base64MD5PasswordFilePrinci
assertTrue(_database.verifyPassword(PRINCIPAL_USERNAME, newPwd));
}
+
+ public void testCreateSaslServer() throws Exception
+ {
+ Set<String> expectedMechanisms = new HashSet(Arrays.asList(CRAMMD5HashedSaslServer.MECHANISM,
+ CRAMMD5HexSaslServer.MECHANISM,
+ PlainSaslServer.MECHANISM));
+ Set<String> actualMechanisms = new HashSet(_database.getMechanisms());
+
+ assertEquals("Unexpected supported mechanisms", expectedMechanisms, actualMechanisms);
+
+ for(String mechanism: expectedMechanisms)
+ {
+ SaslServer saslServer = _database.createSaslServer(mechanism, "localhost", PRINCIPAL);
+ assertNotNull(String.format("Sasl server not created for mechanism %s", mechanism), saslServer);
+ }
+
+ try
+ {
+ _database.createSaslServer("BLAH", "localhost", PRINCIPAL);
+ fail("Cannot create sasl server for unsupported mechanism");
+ }
+ catch(SaslException e)
+ {
+ // pass
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org