1
=== modified file 'ibid/plugins/crypto.py'
2
--- ibid/plugins/crypto.py	2009-05-09 16:18:37 +0000
3
+++ ibid/plugins/crypto.py	2009-06-28 13:26:51 +0000
4
@@ -13,22 +13,35 @@
5
13
    crypt <string> <salt>"""
13
    crypt <string> <salt>"""
6
14
    feature = 'hash'
14
    feature = 'hash'
7
15
15
9
16
    @match(r'^(md5|sha1|sha224|sha256|sha384|sha512)\s+(.+?)$')
16
    @match(r'^(md5|sha1|sha224|sha256|sha384|sha512)(?:sum)?\s+(.+?)$')
10
17
    def hash(self, event, hash, string):
17
    def hash(self, event, hash, string):
12
18
        event.addresponse(eval('hashlib.%s' % hash.lower())(string).hexdigest())
18
        func = getattr(hashlib, hash.lower())
13
19
        event.addresponse(unicode(func(string).hexdigest()))
14
19
20
15
20
    @match(r'^crypt\s+(.+)\s+(\S+)$')
21
    @match(r'^crypt\s+(.+)\s+(\S+)$')
16
21
    def handle_crypt(self, event, string, salt):
22
    def handle_crypt(self, event, string, salt):
18
22
        event.addresponse(crypt(string, salt))
23
        event.addresponse(unicode(crypt(string, salt)))
19
23
24
21
24
help['base64'] = u'Encodes and decodes base 16, 32 and 64.'
25
help['base64'] = u'Encodes and decodes base 16, 32 and 64. Assumes UTF-8.'
22
25
class Base64(Processor):
26
class Base64(Processor):
24
26
    u"""b(16|32|64)(encode|decode) <string>"""
27
    u"""base(16|32|64) (encode|decode) <string>"""
25
27
    feature = 'base64'
28
    feature = 'base64'
26
28
29
28
29
    @match(r'^b(16|32|64)(enc|dec)(?:ode)?\s+(.+?)$')
30
    @match(r'^b(?:ase)?(16|32|64)\s*(enc|dec)(?:ode)?\s+(.+?)$')
29
30
    def base64(self, event, base, operation, string):
31
    def base64(self, event, base, operation, string):
31
31
        event.addresponse(eval('base64.b%s%sode' % (base, operation.lower()))(string))
32
        operation = operation.lower()
32
33
        func = getattr(base64, 'b%s%sode' % (base, operation))
33
34
        if operation == 'dec':
34
35
            try:
35
36
                bytes = func(string)
36
37
                event.addresponse(u"Assuming UTF-8: '%s'", unicode(bytes, 'utf-8', 'strict'))
37
38
            except TypeError, e:
38
39
                event.addresponse(u"Invalid base%(base)s: %(error)s",
39
40
                        {'base': base, 'error': unicode(e)})
40
41
            except UnicodeDecodeError:
41
42
                event.addresponse(u'Not UTF-8: %s', unicode(repr(bytes)))
42
43
        else:
43
44
            event.addresponse(unicode(func(string.encode('utf-8'))))
44
32
45
45
33
help['rot13'] = u'Transforms a string with ROT13.'
46
help['rot13'] = u'Transforms a string with ROT13.'
46
34
class Rot13(Processor):
47
class Rot13(Processor):
Reviewer	Date Requested	Status
Michael Gorven		Approve on 2009-07-02
Jonathan Hitchcock	2009-06-28	Approve on 2009-06-28
Review via email: mp+7987@code.launchpad.net