diff options
| author | Rob Austein <sra@hactrn.net> | 2010-01-05 05:45:35 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2010-01-05 05:45:35 +0000 |
| commit | b7721e4518cf0ccdfd1f159fdd8812508aa483e1 (patch) | |
| tree | 3f1bf1a8331484c283d65803f864a9679c0e4ea0 | |
| parent | 97ed2aa372e2cb7985affedd45357a53e30879b9 (diff) | |
Tweaks to DeadDrop Maildir format.
svn path=/rpkid/rpki/x509.py; revision=2928
| -rw-r--r-- | rpkid/rpki/x509.py | 8 | ||||
| -rw-r--r-- | scripts/format-application-x-rpki.py | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/rpkid/rpki/x509.py b/rpkid/rpki/x509.py index 59b7c7b7..779f370f 100644 --- a/rpkid/rpki/x509.py +++ b/rpkid/rpki/x509.py @@ -44,7 +44,7 @@ PERFORMANCE OF THIS SOFTWARE. """ import POW, POW.pkix, base64, lxml.etree, os, subprocess, sys -import email.mime.application, email.utils, mailbox +import email.mime.application, email.utils, mailbox, time import rpki.exceptions, rpki.resource_set, rpki.oids, rpki.sundial import rpki.manifest, rpki.roa, rpki.log, rpki.async @@ -1012,10 +1012,14 @@ class DeadDrop(object): self.pid = os.getpid() def dump(self, obj): + now = time.time() msg = email.mime.application.MIMEApplication(obj.get_DER(), "x-rpki") - msg["Date"] = email.utils.formatdate() + msg["Date"] = email.utils.formatdate(now) msg["Subject"] = "Process %s dump of %r" % (self.pid, obj) msg["Message-ID"] = email.utils.make_msgid() + msg["X-RPKI-PID"] = str(self.pid) + msg["X-RPKI-Object"] = repr(obj) + msg["X-RPKI-Timestamp"] = "%f" % now self.maildir.add(msg) class XML_CMS_object(CMS_object): diff --git a/scripts/format-application-x-rpki.py b/scripts/format-application-x-rpki.py index e4b4e566..8807f2ee 100644 --- a/scripts/format-application-x-rpki.py +++ b/scripts/format-application-x-rpki.py @@ -109,7 +109,7 @@ try: continue msg = email.mime.multipart.MIMEMultipart("related") msg["X-RPKI-Tag"] = tag - for i in ("Date", "Message-ID"): + for i in ("Date", "Message-ID", "X-RPKI-Timestamp"): msg[i] = srcmsg[i] fix_headers() if tag in dispatch: |