Attachment 604035 Details for Bug 728509 – patch proposal

[patch] patch proposal

0001-connectionURL-credentials-optional.patch (text/plain), 2.50 KB, created by Pavel Moravec on 2012-08-13 15:53:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Moravec

Created: 2012-08-13 15:53:44 UTC

Size: 2.50 KB

patch

obsolete

>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-13 16:26:14.479924110 +0200
>@@ -27,6 +27,9 @@ 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 +37,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
>@@ -108,7 +112,8 @@ public class URLParser
> 
>             if (userInfo == null)
>             {
>-                throw URLHelper.parseError(AMQConnectionURL.AMQ_PROTOCOL.length() + 3, "User information not found on url", fullURL);
>+		_url.setUsername("anonymous");
>+	        _url.setPassword("");
>             }
>             else
>             {
>@@ -200,9 +205,19 @@ 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 (sasl_mechs != null) {
>+		    if ((!(sasl_mechs.equals("ANONYMOUS"))) && (_url.getPassword().equals("")))
>+    		        throw URLHelper.parseError(AMQConnectionURL.AMQ_PROTOCOL.length() + 3, _url.getURL().length() - AMQConnectionURL.AMQ_PROTOCOL.length() - 3,
>+			    "Connection URL has no credentials but non-ANONYMOUS mechanism provided in brokerlist", _url.getURL());
>+		}
>+		else {
>+		    _logger.warn("Due to missing credentials, broker " + broker + " has set SASL mechanism to ANONYMOUS.");
>+		    broker.setProperty(BrokerDetails.OPTIONS_SASL_MECHS,"ANONYMOUS");
>+		}
>+                _url.addBrokerDetails(broker);
>             }
> 
>             _url.getOptions().remove(AMQConnectionURL.OPTIONS_BROKERLIST);

Actions: View | Diff

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