Merge pull request #11 from rce/fix-parse-url-with-password

Fix Mumble URL parsing

2 files changed, 13 insertions, 1 deletions

diff --git a/src/androidTest/java/com/morlunk/jumble/test/URLParserTest.java b/src/androidTest/java/com/morlunk/jumble/test/URLParserTest.java
index 0c8788a..fa2720b 100644
--- a/src/androidTest/java/com/morlunk/jumble/test/URLParserTest.java
+++ b/src/androidTest/java/com/morlunk/jumble/test/URLParserTest.java
@@ -78,6 +78,18 @@ public class URLParserTest extends TestCase {
         }
     }
 
+    public void testURLWithPassword() {
+        String url = "mumble://:mypassword@server.com/";
+        try {
+            Server server = MumbleURLParser.parseURL(url);
+            assertEquals(server.getHost(), "server.com");
+            assertEquals(server.getPassword(), "mypassword");
+            assertEquals(server.getPort(), Constants.DEFAULT_PORT);
+        } catch (MalformedURLException e) {
+            fail("Failed to parse URL.");
+        }
+    }
+
     public void testInvalidScheme() {
         String url = "grumble://server.com/";
         try {
diff --git a/src/main/java/com/morlunk/jumble/util/MumbleURLParser.java b/src/main/java/com/morlunk/jumble/util/MumbleURLParser.java
index 29c4109..5da4117 100644
--- a/src/main/java/com/morlunk/jumble/util/MumbleURLParser.java
+++ b/src/main/java/com/morlunk/jumble/util/MumbleURLParser.java
@@ -31,7 +31,7 @@ import java.util.regex.Pattern;
  */
 public class MumbleURLParser {
 
-    private static final Pattern URL_PATTERN = Pattern.compile("mumble://((.+?)(:(.+?))?@)?(.+?)(:([0-9]+?))?/");
+    private static final Pattern URL_PATTERN = Pattern.compile("mumble://(([^:]+)?(:(.+?))?@)?(.+?)(:([0-9]+?))?/");
 
     /**
      * Parses the passed Mumble URL into a Server object.