Merge remote-tracking branch 'origin/jetty-9.3.x'

2 files changed, 28 insertions, 1 deletions

diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
index f0e271117b..6b0a39a2d6 100644
--- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
+++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
@@ -334,6 +334,8 @@ public class HttpURI
                             state=State.PORT;
                             break;
                         case '@':
+                            if (_user!=null)
+                                throw new IllegalArgumentException("Bad authority");
                             _user=uri.substring(mark,i);
                             mark=i+1;
                             break;
@@ -372,7 +374,16 @@ public class HttpURI
 
                 case PORT:
                 {
-                    if (c=='/')
+                    if (c=='@')
+                    {
+                        if (_user!=null)
+                            throw new IllegalArgumentException("Bad authority");
+                        // It wasn't a port, but a password!
+                        _user=_host+":"+uri.substring(mark,i);
+                        mark=i+1;
+                        state=State.HOST;
+                    }
+                    else if (c=='/')
                     {
                         _port=TypeUtil.parseInt(uri,mark,i-mark,10);
                         path_mark=mark=i;
@@ -745,6 +756,12 @@ public class HttpURI
             return _host+":"+_port;
         return _host;
     }
+    
+    /* ------------------------------------------------------------ */
+    public String getUser()
+    {
+        return _user;
+    }
 
 
 }
diff --git a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpURITest.java b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpURITest.java
index d308cde3b5..74c6feedde 100644
--- a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpURITest.java
+++ b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpURITest.java
@@ -22,6 +22,7 @@ package org.eclipse.jetty.http;
 import static org.junit.Assert.*;
 
 import java.io.UnsupportedEncodingException;
+import java.net.URI;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
@@ -193,4 +194,13 @@ public class HttpURITest
         assertEquals("http:/path/info",uri.toString());
         
     }
+    
+    @Test
+    public void testBasicAuthCredentials() throws Exception
+    {
+        HttpURI uri = new HttpURI("http://user:password@example.com:8888/blah");
+        assertEquals("http://user:password@example.com:8888/blah", uri.toString());
+        assertEquals(uri.getAuthority(), "example.com:8888");
+        assertEquals(uri.getUser(), "user:password");
+    }
 }