diff options
| -rw-r--r-- | scripts/http-client.py | 4 | ||||
| -rw-r--r-- | scripts/http-server.py | 4 | ||||
| -rwxr-xr-x | scripts/irbe-cli.py | 2 | ||||
| -rw-r--r-- | scripts/rpki/config.py | 2 | ||||
| -rw-r--r-- | scripts/rpki/https.py | 25 |
5 files changed, 17 insertions, 20 deletions
diff --git a/scripts/http-client.py b/scripts/http-client.py index ed1019fa..53150a9c 100644 --- a/scripts/http-client.py +++ b/scripts/http-client.py @@ -1,6 +1,6 @@ # $Id$ -import rpki.https +import rpki.config, rpki.https -certInfo = rpki.https.CertInfo("Dave") +certInfo = rpki.https.CertInfo(rpki.config.parser("http-demo.conf"), "client") print rpki.https.client(certInfo=certInfo, msg="This is a test. This is only a test. Had this been real you would now be really confused.\n") diff --git a/scripts/http-server.py b/scripts/http-server.py index 9ceaf78f..876ea48c 100644 --- a/scripts/http-server.py +++ b/scripts/http-server.py @@ -1,8 +1,8 @@ # $Id$ -import rpki.https, tlslite.api +import rpki.https, tlslite.api, rpki.config -certInfo = rpki.https.CertInfo("Carol") +certInfo = rpki.https.CertInfo(rpki.config.parser("http-demo.conf"), "server") def handler(query, path): return 200, "Path: %s\nQuery: %s" % (path, query) diff --git a/scripts/irbe-cli.py b/scripts/irbe-cli.py index 0d05f72e..7039cac9 100755 --- a/scripts/irbe-cli.py +++ b/scripts/irbe-cli.py @@ -140,7 +140,7 @@ def main(): # # ... but use it for now # - httpsCerts = rpki.https.CertInfo(cfg.get(section, "certinfo-name")) + httpsCerts = rpki.https.CertInfo(cfg, section) q_msg = rpki.left_right.msg() diff --git a/scripts/rpki/config.py b/scripts/rpki/config.py index 6d5834d3..01dfb522 100644 --- a/scripts/rpki/config.py +++ b/scripts/rpki/config.py @@ -21,7 +21,7 @@ class parser(ConfigParser.RawConfigParser): """ matches = [] if self.has_option(section, option): - matches.append((0, self.get(section, option))) + matches.append((-1, self.get(section, option))) for key, value in self.items(section): s = key.rsplit(".", 1) if len(s) == 2 and s[0] == option and s[1].isdigit(): diff --git a/scripts/rpki/https.py b/scripts/rpki/https.py index 238c794d..428fb918 100644 --- a/scripts/rpki/https.py +++ b/scripts/rpki/https.py @@ -7,7 +7,7 @@ subversion repository; generalizing it would not be hard, but the more general version should use SQL anyway. """ -import httplib, BaseHTTPServer, tlslite.api, glob, rpki.x509 +import httplib, BaseHTTPServer, tlslite.api, glob, rpki.x509, rpki.config rpki_content_type = "application/x-rpki" @@ -20,22 +20,19 @@ class CertInfo(object): place. """ - cert_dir = "biz-certs/" + def __init__(self, cfg, section): - def __init__(self, myname=None): - if myname is not None: + keypair = rpki.x509.RSA_Keypair(PEM_file = cfg.get(section, "https-key")) + self.privateKey = keypair.get_tlslite() - keypair = rpki.x509.RSA_Keypair(PEM_file = self.cert_dir+myname+"-EE.key") - self.privateKey = keypair.get_tlslite() - - chain = rpki.x509.X509_chain() - chain.load_from_PEM(glob.glob(self.cert_dir + myname + "-*.cer")) - chain.chainsort() - self.certChain = chain.tlslite_certChain() + chain = rpki.x509.X509_chain() + chain.load_from_PEM(cfg.multiget(section, "https-cert")) + chain.chainsort() + self.certChain = chain.tlslite_certChain() - trustlist = rpki.x509.X509_chain() - trustlist.load_from_PEM(glob.glob(self.cert_dir + "*-Root.cer")) - self.x509TrustList = trustlist.tlslite_trustList() + trustlist = rpki.x509.X509_chain() + trustlist.load_from_PEM(cfg.multiget(section, "https-ta")) + self.x509TrustList = trustlist.tlslite_trustList() def client(msg, certInfo, host="localhost", port=4433, url="/"): """Open client HTTPS connection, send a message, wait for response. |