diff options
Diffstat (limited to 'rpkid/rpki/gui/scripts')
| -rw-r--r-- | rpkid/rpki/gui/scripts/list_resources.py | 46 | ||||
| -rwxr-xr-x | rpkid/rpki/gui/scripts/load_csv.py | 12 |
2 files changed, 18 insertions, 40 deletions
diff --git a/rpkid/rpki/gui/scripts/list_resources.py b/rpkid/rpki/gui/scripts/list_resources.py index 2b547e45..13864705 100644 --- a/rpkid/rpki/gui/scripts/list_resources.py +++ b/rpkid/rpki/gui/scripts/list_resources.py @@ -34,45 +34,23 @@ import sys import os os.environ['DJANGO_SETTINGS_MODULE'] = 'rpki.gui.settings' -from datetime import datetime import getopt +from datetime import datetime, timedelta from os.path import basename -from rpki.myrpki import CA -import rpki.config -import rpki.x509 -import rpki.http -import rpki.async -import rpki.left_right -import rpki.resource_set - -from rpki.gui.app import models +import rpki.config, rpki.left_right, rpki.resource_set +from rpki.gui.app import models, glue verbose = False version = '$Id$' def query_rpkid(): - """Fetch our received resources from the local rpkid using the rpki.conf - in the current directory.""" - cfg_file = os.getenv("RPKI_CONF", "rpki.conf") - cfg = rpki.config.parser(cfg_file, "myrpki") - bpki_servers = CA(cfg_file, cfg.get("bpki_servers_directory")) - rpkid_base = "http://%s:%s/" % (cfg.get("rpkid_server_host"), cfg.get("rpkid_server_port")) - - if verbose: - print 'current directory is', os.getcwd() - print 'cfg_file=', cfg_file - print 'bpki_servers=', bpki_servers.dir - print 'rpkid_base=', rpkid_base - - call_rpkid = rpki.async.sync_wrapper(rpki.http.caller( - proto = rpki.left_right, - client_key = rpki.x509.RSA(PEM_file = bpki_servers.dir + "/irbe.key"), - client_cert = rpki.x509.X509(PEM_file = bpki_servers.dir + "/irbe.cer"), - server_ta = rpki.x509.X509(PEM_file = bpki_servers.cer), - server_cert = rpki.x509.X509(PEM_file = bpki_servers.dir + "/rpkid.cer"), - url = rpkid_base + "left-right", - debug = verbose)) + """ + Fetch our received resources from the local rpkid using the rpki.conf + in the current directory. + """ + cfg = rpki.config.parser(section='myrpki') + call_rpkid = glue.build_rpkid_caller(cfg, verbose) if verbose: print 'retrieving the list of <self/> handles served by this rpkid' @@ -138,7 +116,11 @@ for pdu in pdus: if not child_set: if verbose: print 'creating new child %s' % (pdu.child_handle,) - child = models.Child(conf=conf, handle=pdu.child_handle) + # default to 1 year. no easy way to query irdb for the + # current value. + valid_until = datetime.now() + timedelta(days=365) + child = models.Child(conf=conf, handle=pdu.child_handle, + valid_until=valid_until) child.save() #elif isinstance(x, rpki.left_right.list_roa_requests_elt): # print x.asn, x.ipv4, x.ipv6 diff --git a/rpkid/rpki/gui/scripts/load_csv.py b/rpkid/rpki/gui/scripts/load_csv.py index 0ef49cce..ebb995b6 100755 --- a/rpkid/rpki/gui/scripts/load_csv.py +++ b/rpkid/rpki/gui/scripts/load_csv.py @@ -1,6 +1,6 @@ # $Id$ # -# Copyright (C) 2010 SPARTA, Inc. dba Cobham Analytic Solutions +# Copyright (C) 2010, 2011 SPARTA, Inc. dba Cobham Analytic Solutions # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -23,22 +23,18 @@ # for the handle you are loading data # -import sys, os +import os os.environ['DJANGO_SETTINGS_MODULE'] = 'rpki.gui.settings' import csv import socket # for socket.error -import rpki -import rpki.resource_set -import rpki.ipaddrs +import rpki.resource_set, rpki.ipaddrs from rpki.myrpki import csv_reader - from rpki.gui.app import models from rpki.gui.app.views import add_roa_requests -cfg_file = os.getenv("RPKI_CONF", "rpki.conf") -cfg = rpki.config.parser(cfg_file, "myrpki") +cfg = rpki.config.parser(section='myrpki') handle = cfg.get('handle') asn_csv = cfg.get('asn_csv') prefix_csv = cfg.get('prefix_csv') |