diff options
| author | Rob Austein <sra@hactrn.net> | 2007-11-06 16:53:33 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2007-11-06 16:53:33 +0000 |
| commit | b435ecf3fa0f0fdd7e3a020584f60174f88819d3 (patch) | |
| tree | c0973da8a6e7be2b0edbc31bd7d6e7773ec58be5 /scripts | |
| parent | 68e600f3c81b42011ff977f52942471e55ba128b (diff) | |
ChildNotFound
svn path=/scripts/rpki/exceptions.py; revision=1241
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/rpki/exceptions.py | 3 | ||||
| -rwxr-xr-x | scripts/rpkid.py | 2 | ||||
| -rw-r--r-- | scripts/testpoke.yaml | 18 |
3 files changed, 15 insertions, 8 deletions
diff --git a/scripts/rpki/exceptions.py b/scripts/rpki/exceptions.py index 2108d531..2819dff8 100644 --- a/scripts/rpki/exceptions.py +++ b/scripts/rpki/exceptions.py @@ -46,3 +46,6 @@ class BadPKCS10(Exception): class UpstreamError(Exception): """Received an error from upstream.""" + +class ChildNotFound(Exception): + """Could not find specified child in database.""" diff --git a/scripts/rpkid.py b/scripts/rpkid.py index 72a8cbcf..ec191665 100755 --- a/scripts/rpkid.py +++ b/scripts/rpkid.py @@ -32,7 +32,7 @@ def up_down_handler(query, path): raise rpki.exceptions.BadContactURL, "Bad path: %s" % path child = rpki.left_right.child_elt.sql_fetch(gctx, long(child_id)) if child is None: - raise rpki.exceptions.NotFound, "Could not find child %s" % child_id + raise rpki.exceptions.ChildNotFound, "Could not find child %s" % child_id return 200, child.serve_up_down(gctx, query) except Exception, data: traceback.print_exc() diff --git a/scripts/testpoke.yaml b/scripts/testpoke.yaml index 48767663..a57b78a6 100644 --- a/scripts/testpoke.yaml +++ b/scripts/testpoke.yaml @@ -1,10 +1,19 @@ --- # $Id$ + +version: 1 +posturl: https://localhost:4433/up-down/1 +recipient-id: wombat sender-id: bandicoot + cms-cert-file: biz-certs/Elena-EE.cer cms-key-file: biz-certs/Elena-EE.key -ssl-cert-file: biz-certs/Elena-EE.cer -ssl-key-file: biz-certs/Elena-EE.key +cms-ca-cert-file: biz-certs/Bob-Root.cer + +#ssl-cert-file: biz-certs/Elena-EE.cer +#ssl-key-file: biz-certs/Elena-EE.key +ssl-ca-cert-file: biz-certs/Bob-Root.cer + requests: list: type: list @@ -16,8 +25,3 @@ requests: type: revoke class: 1 ski: FillThisIn -version: 1 -posturl: https://localhost:4433/up-down/1/1 -recipient-id: wombat -cms-ca-cert-file: biz-certs/Bob-Root.cer -ssl-ca-cert-file: biz-certs/Bob-Root.cer |