Support for irc cookies

nbproject/build-impl.xml

@@ -70,6 +70,7 @@ is divided into following sections:
         </condition>
         <condition property="have.sources">
             <or>
+                <available file="${src.src4.dir}"/>
                 <available file="${src.src3.dir}"/>
                 <available file="${src.src2.dir}"/>
                 <available file="${src.src.dir}"/>
@@ -127,6 +128,7 @@ is divided into following sections:
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
+        <fail unless="src.src4.dir">Must set src.src4.dir</fail>
         <fail unless="src.src3.dir">Must set src.src3.dir</fail>
         <fail unless="src.src2.dir">Must set src.src2.dir</fail>
         <fail unless="src.src.dir">Must set src.src.dir</fail>
@@ -152,7 +154,7 @@ is divided into following sections:
     </target>
     <target name="-init-macrodef-javac">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.src3.dir}:${src.src2.dir}:${src.src.dir}:${src.dir}" name="srcdir"/>
+            <attribute default="${src.src4.dir}:${src.src3.dir}:${src.src2.dir}:${src.src.dir}:${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${includes}" name="includes"/>
@@ -171,7 +173,7 @@ is divided into following sections:
             </sequential>
         </macrodef>
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.src3.dir}:${src.src2.dir}:${src.src.dir}:${src.dir}" name="srcdir"/>
+            <attribute default="${src.src4.dir}:${src.src3.dir}:${src.src2.dir}:${src.src.dir}:${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <sequential>
@@ -343,6 +345,7 @@ is divided into following sections:
     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
         <j2seproject3:javac/>
         <copy todir="${build.classes.dir}">
+            <fileset dir="${src.src4.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.src3.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.src2.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -361,7 +364,7 @@ is divided into following sections:
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.src3.dir}:${src.src2.dir}:${src.src.dir}:${src.dir}"/>
+        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.src4.dir}:${src.src3.dir}:${src.src2.dir}:${src.src.dir}:${src.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -495,6 +498,9 @@ is divided into following sections:
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
+            <fileset dir="${src.src4.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
             <fileset dir="${src.src3.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>

nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=0e8d4183
+build.xml.data.CRC32=aaeff047
 build.xml.script.CRC32=d4296ee3
 build.xml.stylesheet.CRC32=958a1d3e
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=0e8d4183
-nbproject/build-impl.xml.script.CRC32=3c4579ea
+nbproject/build-impl.xml.data.CRC32=aaeff047
+nbproject/build-impl.xml.script.CRC32=9c9a087f
 nbproject/build-impl.xml.stylesheet.CRC32=65b8de21

nbproject/project.properties

@@ -77,4 +77,5 @@ src.dir=src
 src.src.dir=externals/dmdirc/src
 src.src2.dir=externals/evetool/src
 src.src3.dir=externals/dmdirc-plugins/calc/src
+src.src4.dir=externals/util/src
 test.src.dir=test

nbproject/project.xml

@@ -6,6 +6,7 @@
             <name>charliebravo</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <source-roots>
+                <root id="src.src4.dir"/>
                 <root id="src.src3.dir"/>
                 <root id="src.src2.dir"/>
                 <root id="src.src.dir"/>

src/com/md87/charliebravo/InputHandler.java

@@ -10,9 +10,12 @@ import com.dmdirc.parser.irc.ChannelInfo;
 import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.callbacks.interfaces.IChannelMessage;
+import com.dmdirc.parser.irc.callbacks.interfaces.IPrivateCTCP;
 import com.dmdirc.parser.irc.callbacks.interfaces.IPrivateMessage;
+import com.dmdirc.util.RollingList;
 import com.md87.charliebravo.commands.AuthenticateCommand;
 import com.md87.charliebravo.commands.CalcCommand;
+import com.md87.charliebravo.commands.DefineCommand;
 import com.md87.charliebravo.commands.FollowupsCommand;
 import com.md87.charliebravo.commands.GitCommand;
 import com.md87.charliebravo.commands.GoogleCommand;
@@ -23,19 +26,23 @@ import com.md87.charliebravo.commands.QuitCommand;
 import com.md87.charliebravo.commands.ReloadCommand;
 import com.md87.charliebravo.commands.SetCommand;
 import com.md87.charliebravo.commands.SkillCommand;
+import com.md87.charliebravo.commands.SnippetsCommand;
 import com.md87.charliebravo.commands.TranslateCommand;
 import com.md87.charliebravo.commands.WhoisCommand;
+import com.md87.util.crypto.ArcFourEncrypter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 import java.util.regex.Matcher;
+import net.miginfocom.Base64;
 
 /**
  *
  * @author chris
  */
-public class InputHandler implements IChannelMessage, IPrivateMessage {
+public class InputHandler implements IChannelMessage, IPrivateMessage, IPrivateCTCP {
 
     protected IRCParser parser;
 
@@ -43,7 +50,7 @@ public class InputHandler implements IChannelMessage, IPrivateMessage {
 
     protected final List<Command> commands = new ArrayList<Command>();
     protected final Map<String, Response> responses = new HashMap<String, Response>();
-    protected final Map<String, String> snippets = new HashMap<String, String>();
+    protected final Map<String, RollingList<String>> snippets = new HashMap<String, RollingList<String>>();
 
     public InputHandler(final Config config) {
         this.config = config;
@@ -60,8 +67,10 @@ public class InputHandler implements IChannelMessage, IPrivateMessage {
         commands.add(new GitCommand());
         commands.add(new SetCommand());
         commands.add(new SkillCommand());
+        commands.add(new SnippetsCommand());
         commands.add(new NewzbinCommand());
         commands.add(new ReloadCommand());
+        commands.add(new DefineCommand());
     }
 
     public Config getConfig() {
@@ -76,6 +85,10 @@ public class InputHandler implements IChannelMessage, IPrivateMessage {
         return responses.get(target);
     }
 
+    public RollingList<String> getSnippets(final String channel) {
+        return snippets.get(channel);
+    }
+
     public IRCParser getParser() {
         return parser;
     }
@@ -85,6 +98,7 @@ public class InputHandler implements IChannelMessage, IPrivateMessage {
         
         parser.getCallbackManager().addCallback("OnChannelMessage", this);
         parser.getCallbackManager().addCallback("OnPrivateMessage", this);
+        parser.getCallbackManager().addCallback("OnPrivateCTCP", this);
     }
 
     public void onChannelMessage(final IRCParser tParser, final ChannelInfo cChannel,
@@ -96,8 +110,10 @@ public class InputHandler implements IChannelMessage, IPrivateMessage {
                 break;
             } else if (sMessage.matches("^(?i)" + Matcher.quoteReplacement(nick) + "\\?")
                     && snippets.containsKey(cChannel.getName())) {
-                handleInput(ClientInfo.parseHost(sHost), cChannel.getName(),
-                        snippets.get(cChannel.getName()));
+                final RollingList<String> snips = snippets.get(cChannel.getName());
+                final String snippet = snips.get(snips.getList().size() - 1);
+                handleInput(ClientInfo.parseHost(sHost), cChannel.getName(), snippet);
+                snips.remove(snippet);
                 break;
             }
         }
@@ -106,10 +122,14 @@ public class InputHandler implements IChannelMessage, IPrivateMessage {
                 .getKeyDomain("snippets").entrySet()) {
             System.out.println("Snippet test: " + snippet.getKey());
             if (sMessage.matches(snippet.getKey())) {
-                snippets.put(cChannel.getName(), sMessage.replaceFirst(snippet.getKey(),
+                if (!snippets.containsKey(cChannel.getName())) {
+                    snippets.put(cChannel.getName(), new RollingList<String>(10));
+                }
+
+                snippets.get(cChannel.getName()).add(sMessage.replaceFirst(snippet.getKey(),
+                        snippet.getValue()));
+                System.out.println("Snippet: " + sMessage.replaceFirst(snippet.getKey(),
                         snippet.getValue()));
-                System.out.println("Snippet: " + snippets.get(cChannel.getName()));
-                break;
             }
         }
     }
@@ -127,6 +147,47 @@ public class InputHandler implements IChannelMessage, IPrivateMessage {
         handleInput(ClientInfo.parseHost(sHost), ClientInfo.parseHost(sHost), sMessage);
     }
 
+    @SuppressWarnings("unchecked")
+    public void onPrivateCTCP(IRCParser tParser, String sType, String sMessage, String sHost) {
+        final ClientInfo client = tParser.getClientInfoOrFake(sHost);
+        if ("COOKIE".equals(sType)) {
+            final String status = (String) client.getMap().get("Cookie");
+            final String key1 = (String) client.getMap().get("Key1");
+            final String key2 = (String) client.getMap().get("Key2");
+            final String idp = (String) client.getMap().get("OpenID-p");
+            
+            if ("GETKEY".equals(sMessage) && "SET".equals(status)) {
+                parser.sendCTCP(ClientInfo.parseHost(sHost), "COOKIE", "SETKEY " + key1);
+                client.getMap().put("Cookie", "GETKEY");
+            } else if (sMessage.startsWith("OFFER")) {
+                final String what = sMessage.substring(6);
+
+                if (config.getConfigfile().getKeyDomain("cookies").containsKey(what)) {
+                    client.getMap().put("Key1", config.getConfigfile()
+                            .getKeyDomain("cookies").get(what));
+                    client.getMap().put("OpenID-p", config.getConfigfile()
+                            .getKeyDomain("cookie-ids").get(what));
+                }
+
+                final byte[] bytes = new byte[50];
+                new Random().nextBytes(bytes);
+                final String newkey2 = Base64.encodeToString(bytes, false);
+
+                client.getMap().put("Cookie", "OFFER");
+                client.getMap().put("Key2", newkey2);
+                parser.sendCTCP(ClientInfo.parseHost(sHost), "COOKIE", "GET " + newkey2);
+            } else if (sMessage.startsWith("SHOW") && "OFFER".equals(status)) {
+                final String payload = sMessage.substring(5);
+                final String info = new String(new ArcFourEncrypter(key1 + key2)
+                        .encrypt(Base64.decode(payload)));
+
+                if (idp.equals(info)) {
+                    client.getMap().put("OpenID", idp);
+                }
+            }
+        }
+    }
+
     protected void handleInput(final String source, final String target, final String text) {
         new Thread(new Runnable() {
             public void run() {

src/com/md87/charliebravo/commands/AuthenticateCommand.java

@@ -9,7 +9,10 @@ import com.dmdirc.util.Downloader;
 import com.md87.charliebravo.Command;
 import com.md87.charliebravo.InputHandler;
 import com.md87.charliebravo.Response;
+import com.md87.util.crypto.ArcFourEncrypter;
 import java.util.List;
+import java.util.Random;
+import net.miginfocom.Base64;
 
 /**
  *
@@ -29,14 +32,32 @@ public class AuthenticateCommand implements Command {
             if (result.isEmpty() || !result.get(0).trim().equalsIgnoreCase("Success")) {
                 response.sendMessage("I could not authenticate that token", true);
             } else {
+                final byte[] bytes = new byte[50];
+                new Random().nextBytes(bytes);
+                final String key1 = Base64.encodeToString(bytes, false);
+                final int id = handler.getConfig().getConfigfile().getKeyDomain("cookies").size();
+                
                 final String openid = result.get(1).trim();
                 handler.getParser().getClientInfoOrFake(response.getSource())
                         .getMap().put("OpenID", openid);
+                handler.getParser().getClientInfoOrFake(response.getSource())
+                        .getMap().put("Key1", key1);
+                handler.getParser().getClientInfoOrFake(response.getSource())
+                        .getMap().put("Cookie", "SET");
                 handler.getConfig().setOption(openid, "internal.lastseen",
                         System.currentTimeMillis());
                 handler.getConfig().setOption(openid, "internal.lastuser",
                         handler.getParser().getClientInfoOrFake(response.getSource()).toString());
                 response.sendMessage("You are now authenticated as " + openid, true);
+
+                handler.getConfig().getConfigfile().getKeyDomain("cookies")
+                        .put(String.valueOf(id), key1);
+                handler.getConfig().getConfigfile().getKeyDomain("cookie-ids")
+                        .put(String.valueOf(id), openid);
+
+                handler.getParser().sendCTCP(response.getSource(), "COOKIE",
+                        "SET " + id + " "+ Base64.encodeToString(
+                        new ArcFourEncrypter(key1).encrypt(openid.getBytes()), false));
             }
         }