Patch from thommey which adds support for old CGIIRC hostname spoofing.

Also add an AUTHORS file.

diff --git a/AUTHORS b/AUTHORS
new file mode 100644 (file)
index 0000000..c719a31
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,4 @@
+The following people have contributed code to qwebirc:
+
+Chris Porter <slug@quakenet.org>
+Thomas Sader <thommey@laxin.de>

diff --git a/config.py.example b/config.py.example
index 67284579c8b714f1ad52fa30426dedcce1d9d3e4..a4b46139dab3a623fd4fd5550f18782e1d85e11a 100644 (file)
--- a/config.py.example
+++ b/config.py.example
@@ -26,11 +26,14 @@ APP_TITLE = "FooNet Web IRC"
 DNS_TIMEOUT = 5
 
 # Possible types include "webirc" (CGIIRC style webirc config block),
+# "cgiirc" (old CGIIRC style serverpassword),
 # "hmac" (quakenet specific) and None (passes ip and host in realname)
 WEBIRC_MODE = "webirc"
 
 # webirc mode values
 WEBIRC_PASSWORD = "fish"
+# cgiirc mode values
+CGIIRC_STRING = "CGIIRC"
 # hmac mode values
 HMACKEY = "mrmoo"
 HMACTEMPORAL = 30

diff --git a/qwebirc/ircclient.py b/qwebirc/ircclient.py
index e6795301d4ee36c94bd7189320769e2732e4a4ba..28609a659020af5640a119c741d8aa6c85203e39 100644 (file)
--- a/qwebirc/ircclient.py
+++ b/qwebirc/ircclient.py
@@ -82,6 +82,9 @@ class QWebIRCClient(basic.LineReceiver):
     elif config.WEBIRC_MODE == "webirc":
       self.write("WEBIRC %s qwebirc %s %s" % (config.WEBIRC_PASSWORD, hostname, ip))
       self.write("USER %s bleh %s :%s" % (ident, ip, realname))
+    elif config.WEBIRC_MODE == "cgiirc":
+      self.write("PASS %s_%s_%s" % (config.CGIIRC_STRING, ip, hostname))
+      self.write("USER %s bleh %s :%s" % (ident, ip, realname))
     else:
       if ip == hostname:
         dispip = ip