New version of crypt.py for v0.2.6

diff --git a/python/crypt.py b/python/crypt.py
index 59f75fc553ffe4642ce764147bebfe5f2eeba1fb..c21fa9a246d3c72a4c1df4059f086e2df60200dc 100644 (file)
--- a/python/crypt.py
+++ b/python/crypt.py
@@ -1,11 +1,11 @@
 #!/usr/bin/python
 # ==============================================================
-# crypt.py written 08/2008 by blackpenguin <nlissne@linux01.org>
+# crypt.py written 2008 by blackpenguin <nlissne@linux01.org>
 # ==============================================================
-# License     : Public Domain
+# License     : GPL3
 # Description : encrypt/decrypt PRIVMSGs in WeeChat using openssl
 #
-# Version     : 0.02
+version="1.0-0.2.6"
 #
 # This plugin uses openssl to encrypt/decrypt messages you send
 # or receive with weechat. Due to the very simple method 
@@ -14,74 +14,89 @@
 #
 # The default encryption algorithm is blowfish, but you can
 # easily change it to any other cipher your openssl offers.
-# Read output of "openssl -h" to find out, which ciphers are
-# supported (also depends on your kernel)
+# Read output of "openssl -h" to find out which ciphers are
+# supported (also depends on your kernel!)
 CIPHER="blowfish"
 # 
-# To activate encryption for a given server.user just
-# put a file called "cryptkey.server.user" into 
+# To activate encryption for a given user just
+# put a file called "cryptkey.username" into 
 # your weechat-directory, containing the passphrase
 # to use for encryption/decryption 
+# 
+# You can activate encryption on irc-channels, too,
+# just use cryptkey.#channelname as keyfile then.
+#
 # example: if you have exchanged a secret key with me,
 # you would put it in a file called 
-# cryptkey.freenode.blackpenguin in your weechat_dir
+# cryptkey.blackpenguin in your weechat_dir
 #
 # Of course, you need to share this keyfile with the 
 # remote side in another secure way (i.e. sending
 # pgp-encrypted mail)
-#
-# I might implement a /crypt command to activate/deactivate
-# encryption later, but for now the method used works for me.
-#
-# HISTORY:
-# version 0.01 initial version
-#
-# version 0.02 switched from os.environ["HOME"] + "/.weechat" 
-#              to get_info("weechat_dir")
-
-import weechat, string, os
 
+import weechat, string, os, subprocess
 
 def decrypt(server, args):
-  pre, middle, message = string.split(args, ":", 2)
-  midstr=middle.split(" ")
-  username=midstr[-2]
-  if os.path.exists(weechat_dir + "/cryptkey." + server + "." + username):
-    cin, cout = os.popen2("openssl enc -d -a -" + CIPHER + " -pass file:" + weechat_dir + "/cryptkey." + server + "." + username + " 2>/dev/null")
-    cin.write(message.replace("|","\n"))
-    cin.close()
-    decrypted = cout.read()
-    sts = cout.close()
+  hostmask, chanmsg = string.split(args, "PRIVMSG ", 1)
+  channelname, message = string.split(chanmsg, " :", 1)
+  if channelname[0] == "#":
+    username=channelname
+  else:
+    username, rest = string.split(hostmask, "!", 1)
+    username = username[1:]
+
+  if os.path.exists(weechat_dir + "/cryptkey." + username):
+    p = subprocess.Popen(["openssl", "enc", "-d", "-a", "-" + CIPHER, "-pass" ,"file:" + weechat_dir + "/cryptkey." + username], bufsize=4096, stdin=PIPE, stdout=PIPE, close_fds=True)
+    p.stdin.write("U2FsdGVkX1" + message.replace("|","\n"))
+    p.stdin.close()
+    decrypted = p.stdout.read()
+    p.stdout.close()
     if decrypted == "":
-      return pre + ":" + middle + ":" + message
-    return pre + ":" + middle + ":" + chr(3) + "04* crypted * " + chr(15) + decrypted 
+      return args
+    return hostmask + "PRIVMSG " + channelname + " :" + chr(3) + "04* crypted * " + chr(15) + decrypted 
   else:
-    return pre + ":" + middle + ":" + message
+    return args
     
 def encrypt(server, args):
   pre, message = string.split(args, ":", 1)
   prestr=pre.split(" ")
   username=prestr[-2]
-  if os.path.exists(weechat_dir + "/cryptkey."  + server + "." + username):
-    cin, cout = os.popen2("openssl enc -a -" + CIPHER + " -pass file:" + weechat_dir + "/cryptkey." + server + "." + username + " 2>/dev/null")
-    cin.write(message)
-    cin.close()
-    encrypted = cout.read()
+  if os.path.exists(weechat_dir + "/cryptkey." + username):
+    p = subprocess.Popen(["openssl", "enc", "-a", "-" + CIPHER, "-pass" ,"file:" + weechat_dir + "/cryptkey." + username], bufsize=4096, stdin=PIPE, stdout=PIPE, close_fds=True)
+    p.stdin.write(message)
+    p.stdin.close()
+    encrypted = p.stdout.read()
+    p.stdout.close()
     encrypted = encrypted.replace("\n","|")
-    cout.close()
-    weechat.print_infobar(0,"* sent encrypted * ")
-    return pre + ":" + encrypted
+    if len(encrypted) > 400:
+      splitmsg=string.split(message," ")
+      cutpoint=len(splitmsg)/2
+      p = subprocess.Popen(["openssl", "enc", "-a", "-" + CIPHER, "-pass" ,"file:" + weechat_dir + "/cryptkey." + username], bufsize=4096, stdin=PIPE, stdout=PIPE, close_fds=True)
+      p.stdin.write(string.join(splitmsg[:cutpoint]," ") + "\n")
+      p.stdin.close()
+      encrypted = p.stdout.read()
+      p.stdout.close()
+      encrypted = encrypted.replace("\n","|")
+      p = subprocess.Popen(["openssl", "enc", "-a", "-" + CIPHER, "-pass" ,"file:" + weechat_dir + "/cryptkey." + username], bufsize=4096, stdin=PIPE, stdout=PIPE, close_fds=True)
+      p.stdin.write( string.join(splitmsg[cutpoint:]," ") )
+      p.stdin.close()
+      encrypted2 = p.stdout.read()
+      p.stdout.close()
+      encrypted2 = encrypted2.replace("\n","|")
+      encrypted = encrypted + "\n" + pre + ":" + encrypted2[10:]
+    weechat.print_infobar(0,"* sent encrypted to " + username + " * ")
+    return pre + ":" + encrypted[10:]
   else:
     weechat.remove_infobar(0)
-    return pre + ":" + message
-
+    return args
 
+# for subprocess.Popen call
+PIPE=-1
 
 # register the plugin
-weechat.register("crypt", "0.02", "", "encrypt/decrypt PRIVMSGs")
+weechat.register("crypt", version, "", "encrypt/decrypt PRIVMSGs")
 weechat_dir = weechat.get_info("weechat_dir")
 
 # register the modifiers
 weechat.add_modifier("irc_in", "privmsg", "decrypt")
 weechat.add_modifier("irc_out", "privmsg", "encrypt")
-