IrcAddress now uses URI to parse URLs. This means that encoded characters are now decoded properly.

Fixes issue 763.

git-svn-id: http://svn.dmdirc.com/trunk@3451 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/util/IrcAddress.java

@@ -28,6 +28,8 @@ import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 
 import java.io.Serializable;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -64,37 +66,42 @@ public class IrcAddress implements Serializable {
      * @throws InvalidAddressException If an invalid address is passed
      */
     public IrcAddress(final String address) throws InvalidAddressException {
-        StringBuilder builder;
-
-        if (address.toLowerCase().startsWith("ircs://")) {
+        URI uri;
+        String myAddress;
+        
+        // Check for +ports (SSL)
+        myAddress = address.replaceFirst(":\\+([0-9]+)", ":$1");
+        if (myAddress.length() < address.length()) {
             usesSSL = true;
-            builder = new StringBuilder(address.substring(7));
-        } else if (address.toLowerCase().startsWith("irc://")) {
-            usesSSL = false;
-            builder = new StringBuilder(address.substring(6));
-        } else {
+        }
+        
+        try {
+            uri = new URI(myAddress);
+        } catch (URISyntaxException ex) {
+            throw new InvalidAddressException("Unable to parse URI", ex);
+        }
+        
+        if (uri.getScheme() != null && uri.getScheme().equalsIgnoreCase("ircs")) {
+            usesSSL = true;
+        } else if (uri.getScheme() == null || !uri.getScheme().equalsIgnoreCase("irc")) {
             throw new InvalidAddressException("Invalid protocol specified");
         }
-
-        final int atIndex = builder.indexOf("@");
-        if (atIndex > -1) {
-            doPass(builder.substring(0, atIndex));
-            builder.delete(0, atIndex + 1);
+        
+        if (uri.getUserInfo() != null) {
+            doPass(uri.getUserInfo());
         }
+        
+        doChannels(uri.getPath());
 
-        final int slashIndex = builder.indexOf("/");
-        if (slashIndex > -1) {
-            doChannels(builder.substring(slashIndex + 1));
-            builder.delete(slashIndex, builder.length());
+        if (uri.getPort() > -1) {
+            doPort(uri.getPort());
         }
 
-        final int colonIndex = builder.indexOf(":");
-        if (colonIndex > -1) {
-            doPort(builder.substring(colonIndex + 1));
-            builder.delete(colonIndex, builder.length());
+        if (uri.getHost() == null) {
+            throw new InvalidAddressException("Invalid host or port specified");
+        } else {
+            doServer(uri.getHost());
         }
-
-        doServer(builder.toString());
     }
 
     /**
@@ -112,7 +119,11 @@ public class IrcAddress implements Serializable {
      * @param channels The channels part of this address
      */
     private void doChannels(final String channels) {
-        for (String channel : channels.split(",")) {
+        if (channels == null || channels.length() == 0 || channels.charAt(0) != '/') {
+            return;
+        }
+        
+        for (String channel : channels.substring(1).split(",")) {
             if (!channel.equalsIgnoreCase("needpass") && 
                     !channel.equalsIgnoreCase("needkey") &&
                     !channel.equalsIgnoreCase("isnick") && !channel.isEmpty()) {
@@ -127,19 +138,8 @@ public class IrcAddress implements Serializable {
      * @param port The port part of this address
      * @throws InvalidAddressException if the port is non-numeric
      */
-    private void doPort(final String port) throws InvalidAddressException {
-        String actualPort = port;
-
-        if (port.charAt(0) == '+') {
-            usesSSL = true;
-            actualPort = port.substring(1);
-        }
-
-        try {
-            this.port = Integer.valueOf(actualPort);
-        } catch (NumberFormatException ex) {
-            throw new InvalidAddressException("Invalid port number", ex);
-        }
+    private void doPort(final int port) throws InvalidAddressException {
+        this.port = port;
     }
 
     /**

test/com/dmdirc/util/IrcAddressTest.java

@@ -179,5 +179,16 @@ public class IrcAddressTest extends junit.framework.TestCase {
             assertFalse(true);
         }
     }
+    
+    @Test
+    public void testEncoding() {
+        try {
+            final IrcAddress address1 = new IrcAddress("irc://server/%23DMDirc");
+            assertEquals(1, address1.getChannels().size());
+            assertEquals("#DMDirc", address1.getChannels().get(0));
+        } catch (InvalidAddressException ex) {
+            assertFalse(true);
+        }        
+    }
 
 }