nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-27 10:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed PgpUnwrapper to Unwrapper; update correct lines.

Browse Source 
The update-correct-lines fix is a functional one, there are tests to avoid these
sorts of stupid problems now.

Also, compile the regexes only once.
This commit is contained in:
Nick Daly 2012-04-29 21:22:34 -05:00
parent 873fed5a28
commit 8650c6f447
1 changed files with 56 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
ugly_hacks/santiago/pgpprocessor.py
View File

@ -1,6 +1,11 @@
"""PGP message processing utilities.""" """PGP message processing utilities."""
class PgpUnwrapper(object): from errors import InvalidSignatureError, UnwillingHostError
import gnupg
import re
class Unwrapper(object):
"""Removes one layer of PGP message header and footer per iteration. """Removes one layer of PGP message header and footer per iteration.
Good for singly- or multiply-wrapped messages. Good for singly- or multiply-wrapped messages.
@ -9,7 +14,7 @@ class PgpUnwrapper(object):
After a single iteration, the original message is available in After a single iteration, the original message is available in
``original_message`` while the message's contents are in ``original_message`` while the message's contents are in
``str(PgpUnwrapper)``. ``str(Unwrapper)``.
Sucessive iterations unwrap additional layers of the message. Good for Sucessive iterations unwrap additional layers of the message. Good for
onion-signed or -encrypted messages. onion-signed or -encrypted messages.
@ -28,6 +33,11 @@ class PgpUnwrapper(object):
CRYPT_LINES = (CRYPT_HEAD, CRYPT_END) = ("-----BEGIN PGP MESSAGE-----", CRYPT_LINES = (CRYPT_HEAD, CRYPT_END) = ("-----BEGIN PGP MESSAGE-----",
"-----END PGP MESSAGE-----") "-----END PGP MESSAGE-----")
# ^- - - (-----SOMETHING-----|-----OTHERTHING-----)$
_TARGET = "^(- )+({0})$"
SIG_TARGET = re.compile(_TARGET.format("|".join(SIG_LINES)))
CRYPT_TARGET = re.compile(_TARGET.format("|".join(CRYPT_LINES)))
def __init__(self, message, gpg = None, def __init__(self, message, gpg = None,
gnupg_new = None, gnupg_verify = None, gnupg_decrypt = None): gnupg_new = None, gnupg_verify = None, gnupg_decrypt = None):
@ -73,34 +83,41 @@ class PgpUnwrapper(object):
Raise an InvalidSignature Error if signature isn't valid. Raise an InvalidSignature Error if signature isn't valid.
This is a really simple state-machine: certain lines advance the state This is a simple state-machine: certain lines advance the state of the
of the machine, and until the machine is advanced again, all lines are machine, and until the machine is advanced again, all lines are added to
added to that part of the message. When we reach the end of the that part of the message. When we reach the end of the message, the
message, the state machine is reset, but starts with the message it just state machine is reset, but starts with the message it just unwrapped.
unwrapped.
It has one quirk in two states: the head -> body and footer -> end
transitions append their lines to the former state and then change
state, unlike all the other transitions which change state first.
Messages would be built non-intuitively without those exceptions.
""" """
point = PgpUnwrapper.START point = Unwrapper.START
type_ = "" type_ = ""
self.reset_fields() self.reset_fields()
for line in self.message.splitlines(): for line in self.message.splitlines(True):
if point == PgpUnwrapper.START and line == PgpUnwrapper.SIG_HEAD: if point == Unwrapper.START and line == Unwrapper.SIG_HEAD:
point = PgpUnwrapper.HEAD point = Unwrapper.HEAD
type_ = PgpUnwrapper.SIG type_ = Unwrapper.SIG
elif point == PgpUnwrapper.START and line == PgpUnwrapper.CRYPT_HEAD: elif point == Unwrapper.START and line == Unwrapper.CRYPT_HEAD:
point = PgpUnwrapper.HEAD point = Unwrapper.HEAD
type_ = PgpUnwrapper.CRYPT type_ = Unwrapper.CRYPT
elif point == PgpUnwrapper.HEAD and line == PgpUnwrapper.SIG_BODY: elif point == Unwrapper.HEAD and line == Unwrapper.SIG_BODY:
point = PgpUnwrapper.BODY point = Unwrapper.BODY
elif (point == PgpUnwrapper.BODY and line == PgpUnwrapper.SIG_FOOTER and elif (point == Unwrapper.BODY and line == Unwrapper.SIG_FOOTER and
type_ == PgpUnwrapper.SIG): type_ == Unwrapper.SIG):
point = PgpUnwrapper.FOOTER point = Unwrapper.FOOTER
elif ((point == PgpUnwrapper.FOOTER and line == PgpUnwrapper.SIG_END and type_ == PgpUnwrapper.SIG) or elif ((point == Unwrapper.FOOTER and line == Unwrapper.SIG_END
(point == PgpUnwrapper.BODY and line == PgpUnwrapper.CRYPT_END and type_ == PgpUnwrapper.CRYPT)): and type_ == Unwrapper.SIG)
or (point == Unwrapper.BODY and line == Unwrapper.CRYPT_END
and type_ == Unwrapper.CRYPT)):
# add the footer line to the footer, not the post-script
self.footer.append(line) self.footer.append(line)
point = PgpUnwrapper.END point = Unwrapper.END
continue continue
getattr(self, point).append(line) getattr(self, point).append(line)
@ -115,26 +132,25 @@ class PgpUnwrapper(object):
Do the right thing based on the state machine's results. Do the right thing based on the state machine's results.
""" """
if point != PgpUnwrapper.END or type_ not in (PgpUnwrapper.CRYPT, if point != Unwrapper.END or type_ not in (Unwrapper.CRYPT,
PgpUnwrapper.SIG): Unwrapper.SIG):
raise StopIteration("No valid PGP data.") raise StopIteration("No valid PGP data.")
args = (self.gnupg_verify if type_ == PgpUnwrapper.SIG args = (self.gnupg_verify if type_ == Unwrapper.SIG
else self.gnupg_decrypt) else self.gnupg_decrypt)
# TODO figure this out.
self.gpg_data = { self.gpg_data = {
PgpUnwrapper.SIG: self.gpg.verify, Unwrapper.SIG: self.gpg.verify,
PgpUnwrapper.CRYPT: self.gpg.decrypt Unwrapper.CRYPT: self.gpg.decrypt
}[type_](str(self), **args) }[type_](str(self), **args)
self.type = type_ self.type = type_
self.body = PgpUnwrapper.unwrap(self.body) self.body = Unwrapper.unwrap(self.body, self.type)
# reset the state machine, now that we've unwrapped a layer. # reset the state machine, now that we've unwrapped a layer.
self.message = "\n".join(self.body) self.message = "\n".join(self.body)
if not data: if not self.gpg_data:
raise InvalidSignatureError() raise InvalidSignatureError()
@classmethod @classmethod
@ -143,24 +159,20 @@ class PgpUnwrapper(object):
pre:: pre::
type_ in (PgpUnwrapper.SIG, PgpUnwrapper.CRYPT) type_ in (Unwrapper.SIG, Unwrapper.CRYPT)
""" """
if type_ == PgpUnwrapper.SIG: if type_ == Unwrapper.SIG:
lines = PgpUnwrapper.SIG_LINES target = Unwrapper.SIG_TARGET
elif type_ == PgpUnwrapper.CRYPT: elif type_ == Unwrapper.CRYPT:
lines = PgpUnwrapper.CRYPT_LINES target = Unwrapper.CRYPT_TARGET
else: else:
raise ValueError("Type must be one of: {0}".format( raise ValueError("Type must be one of: {0}".format(
", ".join(PgpUnwrapper.TYPES))) ", ".join(Unwrapper.TYPES)))
# ^- - - (-----SOMETHING-----|-----OTHERTHING-----)$ for i, line in enumerate(message):
target = re.compile("^(- )+({0})$".format("|".join(lines)))
for line in message:
if target.match(line): if target.match(line):
message[message.index(line)] = line[2:] message[i] = line[2:]
return message return message