From: Andy Spencer <andy753421@gmail.com>
Date: Sat, 13 Apr 2013 07:37:49 +0000 (+0000)
Subject: Add support for SASL PLAIN authentication
X-Git-Url: http://pileus.org/git/?p=~andy%2Fspades;a=commitdiff_plain;h=289763d6d9463eaeab8ac3ea7b99357e2105353f

Add support for SASL PLAIN authentication
---

diff --git a/res/xml/prefs.xml b/res/xml/prefs.xml
index dc7eb28..d4fb1d1 100644
--- a/res/xml/prefs.xml
+++ b/res/xml/prefs.xml
@@ -39,7 +39,7 @@
 		<EditTextPreference
 			android:key="pref_authname"
 			android:summary="Username for SASL Authentication"
-			android:title="Nickname"
+			android:title="Authname"
 			android:defaultValue="" />
 		<EditTextPreference
 			android:key="pref_password"
diff --git a/src/org/pileus/spades/Client.java b/src/org/pileus/spades/Client.java
index c7f6e1c..b2d6561 100644
--- a/src/org/pileus/spades/Client.java
+++ b/src/org/pileus/spades/Client.java
@@ -66,6 +66,8 @@ public class Client
 		}
 
 		Os.debug("Client: connected");
+		if (this.usesasl)
+			this.raw("CAP REQ :sasl");
 		this.raw("USER "+this.username+" "+this.hostname+" "+this.server+" :"+this.nickname);
 		this.raw("NICK "+this.nickname);
 
@@ -112,6 +114,8 @@ public class Client
 			Os.debug("> " + line);
 			Message msg = new Message(line);
 			this.process(msg);
+			if (this.usesasl)
+				this.dosasl(msg);
 			return msg;
 		} catch (SocketException e) {
 			this.ready = false;
@@ -139,4 +143,37 @@ public class Client
 			this.raw("PING " + msg.msg);
 		}
 	}
+
+	private void dosasl(Message msg)
+	{
+		switch (msg.type) {
+			case CAP:
+				if (msg.msg.equals("sasl") && msg.arg.equals("ACK")) {
+					Os.debug("Client: sasl - starting auth");
+					this.raw("AUTHENTICATE PLAIN");
+				} else {
+					Os.debug("Client: sasl - Server does not support sasl");
+				}
+				break;
+			case AUTH:
+				if (msg.arg.equals("+")) {
+					Os.debug("Client: sasl - performin authentication");
+					this.raw("AUTHENTICATE " + Os.base64(
+								this.authname + "\0" +
+								this.authname + "\0" +
+								this.password));
+				} else {
+					Os.debug("Client: sasl - unexpected authenticate response");
+				}
+				break;
+			case AUTHOK:
+				Os.debug("Client: SASL Auth Successful");
+				this.raw("CAP END");
+				break;
+			case AUTHFAIL:
+				Os.debug("Client: SASL Auth Failed");
+				this.raw("CAP END");
+				break;
+		}
+	}
 }
diff --git a/src/org/pileus/spades/Main.java b/src/org/pileus/spades/Main.java
index 05955f1..f5118c1 100644
--- a/src/org/pileus/spades/Main.java
+++ b/src/org/pileus/spades/Main.java
@@ -47,6 +47,12 @@ public class Main extends Activity
 	private ScrollView   lscroll;
 	private ScrollView   dscroll;
 
+	/* Private helper methods */
+	private void notice(String text)
+	{
+		this.log.append("*** " + text + "\n");
+	}
+
 	/* Private handler methods */
 	private void onRegister(Object obj)
 	{
@@ -69,14 +75,23 @@ public class Main extends Activity
 				break;
 			case TOPIC:
 				if (!msg.txt.equals(this.topic))
-					this.log.append("** Topic for " + msg.arg + ": " + msg.txt + " **\n");
+					this.notice("Topic for " + msg.arg + ": " + msg.txt);
 				this.topic = msg.txt;
 				break;
 			case NAMES:
 				if (!msg.txt.equals(this.names))
-					this.log.append("** Users in " + msg.arg + ": " + msg.txt + " **\n");
+					this.notice("Users in " + msg.arg + ": " + msg.txt);
 				this.names = msg.txt;
 				break;
+			case ERROR:
+				this.notice("Error: " + msg.txt);
+				break;
+			case AUTHOK:
+				this.notice("Authentication succeeded: " + msg.txt);
+				break;
+			case AUTHFAIL:
+				this.notice("Authentication failed: " + msg.txt);
+				break;
 		}
 		this.lscroll.smoothScrollTo(0, this.log.getBottom());
 	}
@@ -84,7 +99,7 @@ public class Main extends Activity
 	private void onNotify(String text)
 	{
 		Os.debug("Main: onNotify - " + text);
-		this.log.append("** " + text + " **\n");
+		this.notice(text);
 		this.toast.setText(text);
 		this.toast.show();
 	}
diff --git a/src/org/pileus/spades/Message.java b/src/org/pileus/spades/Message.java
index 331657e..1f52ebe 100644
--- a/src/org/pileus/spades/Message.java
+++ b/src/org/pileus/spades/Message.java
@@ -11,10 +11,15 @@ public class Message
 		PRIVMSG,
 		TOPIC,
 		NAMES,
+		ERROR,
+		CAP,
+		AUTH,
+		AUTHOK,
+		AUTHFAIL,
 	};
 
 	/* Constnats */
-	private final  String  reMsg  = "(:([^ ]+) +)?(([A-Z0-9]+) +)(([^ ]+)[= ]+)?(([^: ]+) +)?(:(.*))";
+	private final  String  reMsg  = "(:([^ ]+) +)?(([A-Z0-9]+) +)(([^ ]+)[= ]+)?(([^: ]+) *)?(:(.*))?";
 	private final  String  reFrom = "([^! ]+)!.*";
 	private final  String  reTo   = "(([^ :,]*)[:,] *)?(.*)";
 
@@ -90,9 +95,17 @@ public class Message
 			this.txt  = notnull(mrTo.group(3));
 
 		// Parse commands names
-		if (this.cmd.equals("PRIVMSG")) this.type = Type.PRIVMSG;
-		if (this.cmd.equals("332"))     this.type = Type.TOPIC;
-		if (this.cmd.equals("353"))     this.type = Type.NAMES;
+		if      (this.cmd.equals("PRIVMSG"))       this.type = Type.PRIVMSG;
+		else if (this.cmd.equals("332"))           this.type = Type.TOPIC;
+		else if (this.cmd.equals("353"))           this.type = Type.NAMES;
+		else if (this.cmd.equals("ERROR"))         this.type = Type.ERROR;
+		else if (this.cmd.equals("CAP"))           this.type = Type.CAP;
+		else if (this.cmd.equals("AUTHENTICATE"))  this.type = Type.AUTH;
+		else if (this.cmd.equals("903"))           this.type = Type.AUTHOK;
+		else if (this.cmd.equals("904"))           this.type = Type.AUTHFAIL;
+		else if (this.cmd.equals("905"))           this.type = Type.AUTHFAIL;
+		else if (this.cmd.equals("906"))           this.type = Type.AUTHFAIL;
+		else if (this.cmd.equals("907"))           this.type = Type.AUTHFAIL;
 	}
 
 	public void debug()
diff --git a/src/org/pileus/spades/Os.java b/src/org/pileus/spades/Os.java
index 767de06..4f9e0fb 100644
--- a/src/org/pileus/spades/Os.java
+++ b/src/org/pileus/spades/Os.java
@@ -1,6 +1,7 @@
 package org.pileus.spades;
 
 import android.util.Log;
+import android.util.Base64;
 
 public class Os
 {
@@ -13,4 +14,10 @@ public class Os
 	{
 		Log.d("Spades", txt);
 	}
+
+	/* Utilities */
+	public static String base64(String txt)
+	{
+		return Base64.encodeToString(txt.getBytes(), 0);
+	}
 }