Attachment 605194 Details for Bug 728509 – patch proposal

[patch] patch proposal

0001-connectionURL-credentials-optional.patch (text/plain), 3.48 KB, created by Pavel Moravec on 2012-08-17 11:58:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Moravec

Created: 2012-08-17 11:58:31 UTC

Size: 3.48 KB

patch

obsolete

>diff -rup _qpid-0.18-orig/java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java _qpid-0.18-new/java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java
>--- _qpid-0.18-orig/java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java	2012-08-13 11:14:04.993043417 +0200
>+++ _qpid-0.18-new/java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java	2012-08-17 09:29:50.965230574 +0200
>@@ -52,7 +52,9 @@ public class UsernamePasswordCallbackHan
>             }
>             else if (cb instanceof PasswordCallback)
>             {
>-                ((PasswordCallback)cb).setPassword(_connectionURL.getPassword().toCharArray());
>+		if (_connectionURL.getPassword() != null)
>+//		    throw new UnsupportedCallbackException(cb, "User information not found on url" + _connectionURL.getURL() + " while authentication requires it.");
>+                    ((PasswordCallback)cb).setPassword(_connectionURL.getPassword().toCharArray());
>             }
>             else
>             {
>diff -rup _qpid-0.18-orig/java/client/src/main/java/org/apache/qpid/client/url/URLParser.java _qpid-0.18-new/java/client/src/main/java/org/apache/qpid/client/url/URLParser.java
>--- _qpid-0.18-orig/java/client/src/main/java/org/apache/qpid/client/url/URLParser.java	2012-08-13 11:14:05.009042976 +0200
>+++ _qpid-0.18-new/java/client/src/main/java/org/apache/qpid/client/url/URLParser.java	2012-08-17 11:55:57.316926626 +0200
>@@ -27,6 +27,10 @@ import org.apache.qpid.client.AMQConnect
> import org.apache.qpid.framing.AMQShortString;
> import org.apache.qpid.url.URLHelper;
> import org.apache.qpid.url.URLSyntaxException;
>+import org.apache.qpid.jms.BrokerDetails;
>+
>+import org.slf4j.Logger;
>+import org.slf4j.LoggerFactory;
> 
> import java.net.URI;
> import java.net.URISyntaxException;
>@@ -34,6 +38,7 @@ import java.util.StringTokenizer;
> 
> public class URLParser
> {
>+    private static final Logger _logger = LoggerFactory.getLogger(URLParser.class);
>     private AMQConnectionURL _url;
> 
>     public URLParser(AMQConnectionURL url)throws URLSyntaxException
>@@ -106,14 +111,8 @@ public class URLParser
> 
>             }
> 
>-            if (userInfo == null)
>-            {
>-                throw URLHelper.parseError(AMQConnectionURL.AMQ_PROTOCOL.length() + 3, "User information not found on url", fullURL);
>-            }
>-            else
>-            {
>+            if (userInfo != null)
>                 parseUserInfo(userInfo);
>-            }
> 
>             String virtualHost = connection.getPath();
> 
>@@ -200,9 +199,14 @@ public class URLParser
> 
>             while (st.hasMoreTokens())
>             {
>-                String broker = st.nextToken();
>-
>-                _url.addBrokerDetails(new AMQBrokerDetails(broker));
>+                String brokerString = st.nextToken();
>+                AMQBrokerDetails broker = new AMQBrokerDetails(brokerString);
>+                String sasl_mechs = broker.getProperty(BrokerDetails.OPTIONS_SASL_MECHS);
>+                if ((_url.getPassword() == null) && (sasl_mechs == null)) {
>+                   _logger.warn("Due to missing credentials, broker " + broker + " has restricted SASL mechanisms to ANONYMOUS GSSAPI EXTERNAL.");
>+                   broker.setProperty(BrokerDetails.OPTIONS_SASL_MECHS,"ANONYMOUS GSSAPI EXTERNAL");
>+                }
>+               _url.addBrokerDetails(broker);
>             }
> 
>             _url.getOptions().remove(AMQConnectionURL.OPTIONS_BROKERLIST);

Actions: View | Diff

Attachments on bug 728509: 604007 | 604019 | 604035 | 605194 | 780122