diff options
| -rw-r--r-- | scripts/rpki/left_right.py | 9 | ||||
| -rwxr-xr-x | scripts/rpkid.py | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/scripts/rpki/left_right.py b/scripts/rpki/left_right.py index 2ec3544a..b8dabece 100644 --- a/scripts/rpki/left_right.py +++ b/scripts/rpki/left_right.py @@ -2,7 +2,7 @@ """RPKI "left-right" protocol.""" -import base64, lxml.etree +import base64, lxml.etree, time import rpki.sax_utils, rpki.resource_set, rpki.x509, rpki.sql, rpki.exceptions, rpki.pkcs10, rpki.https xmlns = "http://www.hactrn.net/uris/rpki/left-right-spec/" @@ -466,6 +466,8 @@ class list_resources_elt(base_elt): """Handle <list_resources/> element.""" assert name == "list_resources", "Unexpected name %s, stack %s" % (name, stack) self.read_attrs(attrs) + if isinstance(self.valid_until, str): + self.valid_until = int(time.mktime(time.strptime(self.valid_until, "%Y-%m-%dT%H:%M:%SZ"))) if self.as is not None: self.as = rpki.resource_set.resource_set_as(self.as) if self.ipv4 is not None: @@ -475,7 +477,10 @@ class list_resources_elt(base_elt): def toXML(self): """Generate <list_resources/> element.""" - return self.make_elt() + elt = self.make_elt() + if isinstance(self.valid_until, int): + elt.set("valid_until", time.strftime("%Y-%m-%dT%H:%M:%SZ", time.localtime(self.valid_until))) + return elt class report_error_elt(base_elt): """<report_error/> element.""" diff --git a/scripts/rpkid.py b/scripts/rpkid.py index 5ef0809d..885e888a 100755 --- a/scripts/rpkid.py +++ b/scripts/rpkid.py @@ -5,7 +5,7 @@ Start at the RPKI daemon. This isn't real yet. So far it's just a framework onto which I'm bolting various parts for testing. """ -import tlslite.api, MySQLdb, xml.sax, lxml.etree, lxml.sax, POW, POW.pkix, traceback +import tlslite.api, MySQLdb, xml.sax, lxml.etree, lxml.sax, POW, POW.pkix, traceback, os, time import rpki.https, rpki.config, rpki.resource_set, rpki.up_down, rpki.left_right, rpki.relaxng, rpki.cms, rpki.exceptions def left_right_handler(query, path): @@ -48,6 +48,9 @@ class global_context(object): """A place to stash various global parameters.""" pass +os.environ["TZ"] = "UTC" +time.tzset() + gctx = global_context() gctx.cfg = rpki.config.parser("re.conf") |