Ubuntu IRC Bots

Merge lp:~jpds/ubuntu-bots/remove-md5-usage into lp:~tsimpson/ubuntu-bots/tweak

  1. remove-md5-usage
  2. Merge into tweak
Proposed by Jonathan Davies
Status: Merged
Merged at revision: 153
Proposed branch: lp:~jpds/ubuntu-bots/remove-md5-usage
Merge into: lp:~tsimpson/ubuntu-bots/tweak
Diff against target: 56 lines (+6/-5)
3 files modified
Bantracker/plugin.py (+2/-2)
Encyclopedia/plugin.py (+3/-2)
commoncgi.py (+1/-1)
To merge this branch: bzr merge lp:~jpds/ubuntu-bots/remove-md5-usage
Reviewer Review Type Date Requested Status
Terence Simpson code Pending
Review via email: mp+18320@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jonathan Davies (jpds) wrote :

Use hashlib instead of the old md5 module.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Bantracker/plugin.py'
--- Bantracker/plugin.py 2010-01-30 15:19:53 +0000
+++ Bantracker/plugin.py 2010-01-30 20:17:10 +0000
@@ -54,7 +54,7 @@
54import datetime54import datetime
55import time55import time
56import random56import random
57import md557import hashlib
58import threading58import threading
5959
60tz = 'UTC'60tz = 'UTC'
@@ -554,7 +554,7 @@
554 if not self.registryValue('bansite'):554 if not self.registryValue('bansite'):
555 irc.error("No bansite set, please set supybot.plugins.Bantracker.bansite")555 irc.error("No bansite set, please set supybot.plugins.Bantracker.bansite")
556 return556 return
557 sessid = md5.new('%s%s%d' % (msg.prefix, time.time(), random.randint(1,100000))).hexdigest()557 sessid = hashlib.sha1('%s%s%d' % (msg.prefix, time.time(), random.randint(1,100000))).hexdigest()
558 self.db_run("INSERT INTO sessions (session_id, user, time) VALUES (%s, %s, %d);",558 self.db_run("INSERT INTO sessions (session_id, user, time) VALUES (%s, %s, %d);",
559 ( sessid, msg.nick, int(time.mktime(time.gmtime())) ) )559 ( sessid, msg.nick, int(time.mktime(time.gmtime())) ) )
560 irc.reply('Log in at %s/bans.cgi?sess=%s' % (self.registryValue('bansite'), sessid), private=True)560 irc.reply('Log in at %s/bans.cgi?sess=%s' % (self.registryValue('bansite'), sessid), private=True)
561561
=== modified file 'Encyclopedia/plugin.py'
--- Encyclopedia/plugin.py 2009-11-22 22:44:07 +0000
+++ Encyclopedia/plugin.py 2010-01-30 20:17:10 +0000
@@ -21,7 +21,8 @@
21import supybot.conf as conf21import supybot.conf as conf
22import supybot.utils as utils22import supybot.utils as utils
23import supybot.ircutils as ircutils23import supybot.ircutils as ircutils
24import sys, os, re, md5, random, time24import sys, os, re, random, time
25import hashlib
2526
26if sys.version_info >= (2, 5, 0):27if sys.version_info >= (2, 5, 0):
27 import re28 import re
@@ -909,7 +910,7 @@
909 return910 return
910 cur = db.cursor()911 cur = db.cursor()
911912
912 sessid = md5.new('%s%s%d' % (msg.prefix, time.time(), random.randint(1,100000))).hexdigest()913 sessid = hashlib.sha1('%s%s%d' % (msg.prefix, time.time(), random.randint(1,100000))).hexdigest()
913 cur.execute("INSERT INTO sessions (session_id, user, time) VALUES (%s, %s, %d)",914 cur.execute("INSERT INTO sessions (session_id, user, time) VALUES (%s, %s, %d)",
914 (sessid, msg.nick, int(time.mktime(time.gmtime())) ))915 (sessid, msg.nick, int(time.mktime(time.gmtime())) ))
915 db.commit()916 db.commit()
916917
=== modified file 'commoncgi.py'
--- commoncgi.py 2008-11-01 16:45:33 +0000
+++ commoncgi.py 2010-01-30 20:17:10 +0000
@@ -12,7 +12,7 @@
12#12#
13###13###
1414
15import cgi, cgitb, re, sys, math, os, md5, sqlite, random, time, datetime, pytz, Cookie, StringIO, urllib215import cgi, cgitb, re, sys, math, os, sqlite, random, time, datetime, pytz, Cookie, StringIO, urllib2
16import cPickle as pickle16import cPickle as pickle
17cgitb.enable()17cgitb.enable()
1818

Subscribers

People subscribed via source and target branches