From 930ec5d8e0e3c12a29cad28d280fe9b32298c122 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Mon, 29 Sep 2014 22:07:36 +0000 Subject: Tweak version numbering scheme to let us build binary packages for all supported platforms. svn path=/trunk/; revision=5977 --- buildtools/build-ubuntu-ports.py | 22 +++++---- buildtools/rpki-pbuilder.py | 98 ++++++++++++++++++++++------------------ 2 files changed, 67 insertions(+), 53 deletions(-) diff --git a/buildtools/build-ubuntu-ports.py b/buildtools/build-ubuntu-ports.py index 8ee2efcc..0a326da8 100644 --- a/buildtools/build-ubuntu-ports.py +++ b/buildtools/build-ubuntu-ports.py @@ -19,16 +19,14 @@ """ Set up for a Debian or Ubuntu package build. -This is a script because we need to set the changelog, and some day -we may need to do something about filtering specific files so we can -use the same skeleton for both Ubuntu and Debian builds without -requiring them to be identical. - -For now, though, this just copies the debian skeleton and creates a -changelog. +This is a script because we need to create the changelog. Other than +that, we just copy the Debian skeleton and optionally run the programs +necessary to produce a test build (production builds are happened +elsewhere, under pbuilder). """ import subprocess +import platform import argparse import shutil import sys @@ -37,6 +35,8 @@ import os parser = argparse.ArgumentParser(description = __doc__) parser.add_argument("-b", "--debuild", action = "store_true", help = "run debuild") parser.add_argument("-i", "--debi", action = "store_true", help = "run debi") +parser.add_argument("-s", "--version-suffix", nargs = "?", const = platform.linux_distribution()[2], + help = "suffix to add to version string") args = parser.parse_args() version = "0." + subprocess.check_output(("svnversion", "-c")).strip().split(":")[-1] @@ -51,8 +51,12 @@ shutil.copytree("buildtools/debian-skeleton", "debian", ignore = ignore_dot_svn) os.chmod("debian/rules", 0755) -subprocess.check_call(("dch", "--create", "--package", "rpki", "--newversion", version, - "Version %s of https://subvert-rpki.hactrn.net/trunk/" % version), +msg = "Version %s of https://subvert-rpki.hactrn.net/trunk/" % version + +if args.version_suffix: + version += "~" + args.version_suffix + +subprocess.check_call(("dch", "--create", "--package", "rpki", "--newversion", version, msg), env = dict(os.environ, EDITOR = "true", VISUAL = "true", diff --git a/buildtools/rpki-pbuilder.py b/buildtools/rpki-pbuilder.py index 779fb807..8888a826 100644 --- a/buildtools/rpki-pbuilder.py +++ b/buildtools/rpki-pbuilder.py @@ -2,18 +2,20 @@ # # $Id$ # -# Copyright (C) 2013 Internet Systems Consortium ("ISC") -# +# Copyright (C) 2014 Dragon Research Labs ("DRL") +# Portions copyright (C) 2013 Internet Systems Consortium ("ISC") +# # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH -# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, -# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# copyright notices and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND DRL AND ISC DISCLAIM ALL +# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DRL OR +# ISC BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL +# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA +# OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. """ @@ -32,8 +34,6 @@ import subprocess from textwrap import dedent -#from apt_pkg import version_compare - rpki_packages = ("rpki-rp", "rpki-ca") rpki_source_package = "rpki" @@ -59,7 +59,8 @@ args = parser.parse_args() # Maybe logging should be conigurable too. Later. -logging.basicConfig(level = logging.INFO) +logging.basicConfig(level = logging.INFO, timefmt = "%Y-%m-%dT%H:%M:%S", + format = "%(asctime)s [%(process)d] %(levelname)s %(message)s") upload = socket.getfqdn() == "build-u.rpki.net" @@ -79,6 +80,11 @@ def run(*cmd, **kwargs): # checksums than the ones loaded initially. See: # # http://stackoverflow.com/questions/21563872/reprepro-complains-about-the-generated-pbuilder-debian-tar-gz-archive-md5 +# +# Putting stuff in ~/.pbuilderrc didn't work with pbuilder-dist when I +# tried it last year, this may just be that sudo isn't configured to +# pass HOME through, thus pbuilder is looking for ~root/.pbuilderrc. +# Worth trying again at some point but not all that critical. logging.info("Starting") @@ -90,25 +96,14 @@ except (IOError, OSError), e: run("svn", "--quiet", "update", cwd = args.svn_tree) -version = subprocess.check_output(("svnversion", "-c"), cwd = args.svn_tree).strip().split(":")[-1] +source_version = subprocess.check_output(("svnversion", "-c"), cwd = args.svn_tree).strip().split(":")[-1] -if not version.isdigit() and not args.debug: - sys.exit("Sources don't look pristine, not building (%r)" % version) +if not source_version.isdigit() and not args.debug: + sys.exit("Sources don't look pristine, not building (%r)" % source_version) -version = "0." + version +source_version = "0." + source_version dsc_dir = os.path.abspath(os.path.join(args.svn_tree, "..")) -dsc = os.path.join(dsc_dir, "rpki_%s.dsc" % version) - -if not os.path.exists(dsc): - logging.info("Building source package %s", version) - for fn in os.listdir(dsc_dir): - if fn != "trunk": - os.unlink(os.path.join(dsc_dir, fn)) - run("rm", "-rf", "debian", cwd = args.svn_tree) - run("python", "buildtools/make-version.py", cwd = args.svn_tree) - run("python", "buildtools/build-ubuntu-ports.py", cwd = args.svn_tree) - run("dpkg-buildpackage", "-S", "-us", "-uc", "-rfakeroot", cwd = args.svn_tree) if not os.path.isdir(args.apt_tree): logging.info("Creating %s", args.apt_tree) @@ -164,12 +159,20 @@ class Release(object): @property def deb_in_repository(self): - return all(self.packages.get((self.release, self.arch, package)) == version + return all(self.packages.get((self.release, self.arch, package)) == self.version for package in rpki_packages) @property def src_in_repository(self): - return self.packages.get((self.release, "source", rpki_source_package)) == version + return self.packages.get((self.release, "source", rpki_source_package)) == self.version + + @property + def version(self): + return source_version + "~" + self.release + + @property + def dsc(self): + return os.path.join(dsc_dir, "rpki_%s.dsc" % self.version) @property def tree(self): @@ -185,11 +188,21 @@ class Release(object): @property def changes(self): - return os.path.join(self.result, "rpki_%s_%s.changes" % (version, self.arch)) + return os.path.join(self.result, "rpki_%s_%s.changes" % (self.version, self.arch)) def do_one_architecture(self): logging.info("Running build for %s %s %s", self.distribution, self.release, self.arch) + if not os.path.exists(self.dsc): + logging.info("Building source package %s", self.version) + for fn in os.listdir(dsc_dir): + if fn != "trunk": + os.unlink(os.path.join(dsc_dir, fn)) + run("rm", "-rf", "debian", cwd = args.svn_tree) + run(sys.executable, "buildtools/make-version.py", cwd = args.svn_tree) + run(sys.executable, "buildtools/build-ubuntu-ports.py", "--version-suffix", self.release, cwd = args.svn_tree) + run("dpkg-buildpackage", "-S", "-us", "-uc", "-rfakeroot", cwd = args.svn_tree) + if not os.path.exists(self.basefile): logging.info("Creating build environment %s %s", self.release, self.arch) run("pbuilder-dist", self.release, self.arch, "create", env = self.env) @@ -199,18 +212,18 @@ class Release(object): run("pbuilder-dist", self.release, self.arch, "update", env = self.env) if not os.path.exists(self.changes): - logging.info("Building binary packages %s %s %s", self.release, self.arch, version) + logging.info("Building binary packages %s %s %s", self.release, self.arch, self.version) for fn in os.listdir(self.result): os.unlink(os.path.join(self.result, fn)) - run("pbuilder-dist", self.release, self.arch, "build", "--keyring", args.keyring, dsc, env = self.env) + run("pbuilder-dist", self.release, self.arch, "build", "--keyring", args.keyring, self.dsc, env = self.env) if not self.deb_in_repository: - logging.info("Updating repository for %s %s %s", self.release, self.arch, version) + logging.info("Updating repository for %s %s %s", self.release, self.arch, self.version) run("reprepro", "--ignore=wrongdistribution", "include", self.release, self.changes, cwd = self.tree) if not self.src_in_repository: - logging.info("Updating repository for %s source %s", self.release, version) - run("reprepro", "--ignore=wrongdistribution", "includedsc", self.release, dsc, cwd = self.tree) + logging.info("Updating repository for %s source %s", self.release, self.version) + run("reprepro", "--ignore=wrongdistribution", "includedsc", self.release, self.dsc, cwd = self.tree) def setup_reprepro(self): @@ -279,21 +292,18 @@ class Release(object): f.write("deb %s\n" % source) f.write("deb-src %s\n" % source) -# At the moment, none of these distributions include South 1.1, -# and only trusty includes Django 1.6. -# -# reprepro seems unable to cope with multipel packages with the same -# name and version even when they really are different and are for -# different releases. Oh well, we didn't want to support precise -# forever. +# Finally, here's where we specify the distributions for which we're building. Release("trusty", "ubuntu", "python-django-south") Release("wheezy", "debian", "python-django", "python-django-south") +Release("precise", "ubuntu", "python-django", "python-django-south") -#Release("precise", "ubuntu", "python-django", "python-django-south") +# Do all the real work. Release.do_all_releases() +# Upload results, maybe. + if upload: logging.info("Synching repository to server") run("rsync", "-ai4", -- cgit v1.2.3 From bfc5132f8174bdd9c253bda143c410d796696184 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Tue, 30 Sep 2014 01:47:28 +0000 Subject: Add hack to yamltest to let Mike extract private keys for BGPSEC testing. svn path=/trunk/; revision=5978 --- ca/tests/yamltest.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ca/tests/yamltest.py b/ca/tests/yamltest.py index 2b65dbd2..0932049b 100644 --- a/ca/tests/yamltest.py +++ b/ca/tests/yamltest.py @@ -428,6 +428,12 @@ class allocation(object): lxml.etree.ElementTree(xml).write(path, pretty_print = True) if not args.stop_after_config: self.run_rpkic("add_router_certificate_request", fn) + if not args.skip_config and args.store_router_private_keys: + path = self.path("%s.routercerts.keys" % d.name) + print "Writing", path + with open(path, "w") as f: + for r in self.router_certs: + f.write(r.keypair.get_PEM()) @property def pubd(self): @@ -656,6 +662,8 @@ parser.add_argument("--synchronize", action = "store_true", help = "synchronize IRDB with daemons") parser.add_argument("--profile", action = "store_true", help = "enable profiling") +parser.add_argument("--store-router-private-keys", action = "store_true", + help = "write generate router private keys to disk") parser.add_argument("yaml_file", type = argparse.FileType("r"), help = "YAML description of test network") args = parser.parse_args() -- cgit v1.2.3 From 56664d871dd747e4868caa7657d281fb414288df Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Tue, 30 Sep 2014 23:57:34 +0000 Subject: Overly enthusiastic cleanup was causing script to regenerate source packages when nothing had changed. svn path=/trunk/; revision=5980 --- buildtools/rpki-pbuilder.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildtools/rpki-pbuilder.py b/buildtools/rpki-pbuilder.py index 8888a826..5043c60e 100644 --- a/buildtools/rpki-pbuilder.py +++ b/buildtools/rpki-pbuilder.py @@ -102,6 +102,7 @@ if not source_version.isdigit() and not args.debug: sys.exit("Sources don't look pristine, not building (%r)" % source_version) source_version = "0." + source_version +search_version = "_" + source_version + "~" dsc_dir = os.path.abspath(os.path.join(args.svn_tree, "..")) @@ -196,7 +197,7 @@ class Release(object): if not os.path.exists(self.dsc): logging.info("Building source package %s", self.version) for fn in os.listdir(dsc_dir): - if fn != "trunk": + if fn != "trunk" and search_version not in fn: os.unlink(os.path.join(dsc_dir, fn)) run("rm", "-rf", "debian", cwd = args.svn_tree) run(sys.executable, "buildtools/make-version.py", cwd = args.svn_tree) -- cgit v1.2.3 From 24635430e46c2fad0bdb5fb12fe18e212f76c437 Mon Sep 17 00:00:00 2001 From: Michael Elkins Date: Fri, 3 Oct 2014 23:09:08 +0000 Subject: Add router cert request support to the GUI. svn path=/trunk/; revision=5985 --- rpki/gui/app/forms.py | 5 ++ rpki/gui/app/models.py | 7 ++ rpki/gui/app/templates/app/dashboard.html | 22 ++++++ .../templates/app/eecertificaterequest_detail.html | 33 +++++++++ .../templates/app/eecertificaterequest_list.html | 29 ++++++++ rpki/gui/app/urls.py | 4 ++ rpki/gui/app/views.py | 78 +++++++++++++++++++++- 7 files changed, 177 insertions(+), 1 deletion(-) create mode 100644 rpki/gui/app/templates/app/eecertificaterequest_detail.html create mode 100644 rpki/gui/app/templates/app/eecertificaterequest_list.html diff --git a/rpki/gui/app/forms.py b/rpki/gui/app/forms.py index 5394a804..e60ba932 100644 --- a/rpki/gui/app/forms.py +++ b/rpki/gui/app/forms.py @@ -440,3 +440,8 @@ class ResourceHolderCreateForm(forms.Form): if handle and parent and parent.children.filter(handle=handle).exists(): raise forms.ValidationError('parent already has a child by that name') return self.cleaned_data + + +class RouterCertificateRequestForm(forms.Form): + """form for uploading router cert request""" + xml = forms.FileField(label='XML file') diff --git a/rpki/gui/app/models.py b/rpki/gui/app/models.py index 32a897c7..21a86487 100644 --- a/rpki/gui/app/models.py +++ b/rpki/gui/app/models.py @@ -24,6 +24,7 @@ import rpki.exceptions import rpki.irdb.models import rpki.gui.models import rpki.gui.routeview.models +import rpki.oids from south.modelsinspector import add_introspection_rules @@ -201,6 +202,12 @@ class Conf(rpki.irdb.models.ResourceHolderCA): self.alerts.all().delete() + @property + def router_certs(self): + """returns a query set of all rpki router certs associated with this + resource holder.""" + return self.ee_certificate_requests.filter(eku=rpki.oids.id_kp_bgpsec_router) + class Meta: proxy = True diff --git a/rpki/gui/app/templates/app/dashboard.html b/rpki/gui/app/templates/app/dashboard.html index 65dbb90f..c042af12 100644 --- a/rpki/gui/app/templates/app/dashboard.html +++ b/rpki/gui/app/templates/app/dashboard.html @@ -159,6 +159,28 @@ +
+
+
+

Router Certificate Requests

+
+ + +{% for rtr in conf.router_certs %} + + + + + +{% endfor %} +
SNASNValid Until
{{ rtr.sn }} {{ rtr.asns.all.0.start_as }} {{ rtr.valid_until }} + + +
+ Import +
+
+
diff --git a/rpki/gui/app/templates/app/eecertificaterequest_detail.html b/rpki/gui/app/templates/app/eecertificaterequest_detail.html new file mode 100644 index 00000000..13903f83 --- /dev/null +++ b/rpki/gui/app/templates/app/eecertificaterequest_detail.html @@ -0,0 +1,33 @@ +{% extends "app/app_base.html" %} + +{% block content %} +
+

Router Certificate Request Detail {{ object.cn }}

+
+ +
+ + + + + + + + + + + + + + + + +
CN {{ object.cn }}
SN {{ object.sn }}
SKI {{ object.gski }}
ASN {{ object.asns.all.0.start_as }}
Valid Until {{ object.valid_until }}
+ +{% block action %} +
+ Delete +
+{% endblock %} + +{% endblock %} diff --git a/rpki/gui/app/templates/app/eecertificaterequest_list.html b/rpki/gui/app/templates/app/eecertificaterequest_list.html new file mode 100644 index 00000000..bf9078ad --- /dev/null +++ b/rpki/gui/app/templates/app/eecertificaterequest_list.html @@ -0,0 +1,29 @@ +{% extends "app/app_base.html" %} + +{% block content %} +
+

Router Certificate Requests

+
+ + + + + + + + + + + + {% for obj in object_list %} + + + + + + + {% endfor %} + +
ASNCNSNGSKI
{{ obj.asns.all.0.start_as }}{{ obj.cn }}{{ obj.sn }}{{ obj.gski }}
+ +{% endblock content %} diff --git a/rpki/gui/app/urls.py b/rpki/gui/app/urls.py index f21f4961..f595ea8f 100644 --- a/rpki/gui/app/urls.py +++ b/rpki/gui/app/urls.py @@ -74,6 +74,10 @@ urlpatterns = patterns( (r'^route/$', 'rpki.gui.app.views.route_view'), (r'^route/(?P\d+)/$', 'rpki.gui.app.views.route_detail'), url(r'^route/suggest$', views.route_suggest, name="suggest-roas"), + url(r'^router/$', views.RouterListView.as_view(), name='router-list'), + url(r'^router/import$', views.RouterImportView.as_view(), name='router-import'), + url(r'^router/(?P\d+)$', views.RouterDetailView.as_view(), name='router-detail'), + url(r'^router/(?P\d+)/delete$', views.RouterDeleteView.as_view(), name='router-delete'), (r'^user/$', 'rpki.gui.app.views.user_list'), (r'^user/create$', 'rpki.gui.app.views.user_create'), (r'^user/(?P\d+)/delete$', 'rpki.gui.app.views.user_delete'), diff --git a/rpki/gui/app/views.py b/rpki/gui/app/views.py index 9a1c4cfe..86ec30d7 100644 --- a/rpki/gui/app/views.py +++ b/rpki/gui/app/views.py @@ -35,7 +35,7 @@ from django.utils.http import urlquote from django import http from django.core.urlresolvers import reverse, reverse_lazy from django.contrib.auth.models import User -from django.views.generic import DetailView, ListView, DeleteView +from django.views.generic import DetailView, ListView, DeleteView, FormView from django.core.paginator import Paginator, InvalidPage from django.forms.formsets import formset_factory, BaseFormSet import django.db.models @@ -1326,3 +1326,79 @@ def alert_clear_all(request): else: form = forms.Empty() return render(request, 'app/alert_confirm_clear.html', {'form': form}) + + + +class RouterListView(ListView): + template_name = 'app/eecertificaterequest_list.html' + + @method_decorator(handle_required) + def dispatch(self, request, *args, **kwargs): + return super(RouterListView, self).dispatch(request, *args, **kwargs) + + def get_queryset(self, *args, **kwargs): + conf = get_conf(self.request.user, self.request.session['handle']) + return conf.router_certs.all() + + +class RouterDetailView(DetailView): + template_name = 'app/eecertificaterequest_detail.html' + + @method_decorator(handle_required) + def dispatch(self, request, *args, **kwargs): + return super(RouterDetailView, self).dispatch(request, *args, **kwargs) + + def get_queryset(self, *args, **kwargs): + conf = get_conf(self.request.user, self.request.session['handle']) + return conf.router_certs.all() + + +class RouterDeleteView(DeleteView): + success_url = reverse_lazy(dashboard) + #template_name = 'app/eecertificaterequest_confirm_delete.html' + template_name = 'app/object_confirm_delete.html' + + @method_decorator(handle_required) + def dispatch(self, request, *args, **kwargs): + return super(RouterDeleteView, self).dispatch(request, *args, **kwargs) + + def get_queryset(self, *args, **kwargs): + conf = get_conf(self.request.user, self.request.session['handle']) + return conf.router_certs.all() + + def get_context_data(self, **kwargs): + kwargs['parent_template'] = 'app/eecertificaterequest_detail.html' + return super(RouterDeleteView, self).get_context_data(**kwargs) + + def delete(self, request, *args, **kwargs): + # override the delete hook so that we can nudge rpkid after the object is gone + r = super(RouterDeleteView, self).delete(request, *args, **kwargs) + Zookeeper(handle=request.session['handle']).run_rpkid_now() + return r + + +class RouterImportView(FormView): + form_class = forms.RouterCertificateRequestForm + success_url = reverse_lazy(dashboard) + template_name = 'app/app_form.html' + + @method_decorator(handle_required) + def dispatch(self, request, *args, **kwargs): + return super(RouterImportView, self).dispatch(request, *args, **kwargs) + + def form_valid(self, form): + conf = get_conf(self.request.user, self.request.session['handle']) + tmpf = NamedTemporaryFile(prefix='import', suffix='.xml', + delete=False) + tmpf.write(form.cleaned_data['xml'].read()) + tmpf.close() + z = Zookeeper(handle=conf.handle) + z.add_router_certificate_request(tmpf.name) + z.run_rpkid_now() + os.remove(tmpf.name) + return super(RouterImportView, self).form_valid(form) + + def get_context_data(self, **kwargs): + kwargs['form_title'] = 'Import Router Certificate Request' + kwargs['cancel_url'] = reverse(dashboard) + return super(RouterImportView, self).get_context_data(**kwargs) -- cgit v1.2.3 From d4f19b6a2957b11d286b1306cc1b209ee18e200c Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Sun, 5 Oct 2014 01:15:55 +0000 Subject: Address incompatible API changes in Django 1.7: apps.populate(), MIDDLEWARE_CLASSES. Fixes #717. svn path=/trunk/; revision=5986 --- ca/irbe_cli | 7 +++++++ ca/tests/yamlconf.py | 7 +++++++ rpki/gui/script_util.py | 6 ++++++ rpki/irdbd.py | 11 ++++++++++- rpki/rpkic.py | 7 +++++++ 5 files changed, 37 insertions(+), 1 deletion(-) diff --git a/ca/irbe_cli b/ca/irbe_cli index 1becd403..91c12aa9 100755 --- a/ca/irbe_cli +++ b/ca/irbe_cli @@ -322,6 +322,8 @@ while argv: argv = q_pdu.client_getopt(argv[1:]) q_msg.append(q_pdu) +import django + from django.conf import settings settings.configure( @@ -334,8 +336,13 @@ settings.configure( "PORT" : "", "OPTIONS" : { "init_command": "SET storage_engine=INNODB" }}}, INSTALLED_APPS = ("rpki.irdb",), + MIDDLEWARE_CLASSES = (), ) +if django.VERSION >= (1, 7): + from django.apps import apps + apps.populate(settings.INSTALLED_APPS) + import rpki.irdb server_ca = rpki.irdb.ServerCA.objects.get() diff --git a/ca/tests/yamlconf.py b/ca/tests/yamlconf.py index 1b339a89..f1073c92 100644 --- a/ca/tests/yamlconf.py +++ b/ca/tests/yamlconf.py @@ -773,13 +773,20 @@ def body(): databases["default"] = databases[db.root.irdb_name] + import django + from django.conf import settings settings.configure( DATABASES = databases, DATABASE_ROUTERS = ["rpki.irdb.router.DBContextRouter"], + MIDDLEWARE_CLASSES = (), INSTALLED_APPS = ("rpki.irdb",)) + if django.VERSION >= (1, 7): # API change, feh + from django.apps import apps + apps.populate(settings.INSTALLED_APPS) + import rpki.irdb rpki.irdb.models.ca_certificate_lifetime = rpki.sundial.timedelta(days = 3652 * 2) diff --git a/rpki/gui/script_util.py b/rpki/gui/script_util.py index c3a864fd..fb15403d 100644 --- a/rpki/gui/script_util.py +++ b/rpki/gui/script_util.py @@ -16,6 +16,8 @@ This module contains utility functions for use in standalone scripts. """ +import django + from django.conf import settings from rpki import config @@ -40,4 +42,8 @@ def setup(): 'PASSWORD': cfg.get('sql-password'), } }, + MIDDLEWARE_CLASSES = (), ) + if django.VERSION >= (1, 7): + from django.apps import apps + apps.populate(settings.INSTALLED_APPS) diff --git a/rpki/irdbd.py b/rpki/irdbd.py index d53ae67c..ae08b6fb 100644 --- a/rpki/irdbd.py +++ b/rpki/irdbd.py @@ -186,6 +186,9 @@ class main(object): def main(self): global rpki # pylint: disable=W0602 + + import django + from django.conf import settings startup_msg = self.cfg.get("startup-message", "") @@ -211,7 +214,13 @@ class main(object): "PASSWORD" : self.cfg.get("sql-password"), "HOST" : "", "PORT" : "" }}, - INSTALLED_APPS = ("rpki.irdb",),) + INSTALLED_APPS = ("rpki.irdb",), + MIDDLEWARE_CLASSES = (), # API change, feh + ) + + if django.VERSION >= (1, 7): # API change, feh + from django.apps import apps + apps.populate(settings.INSTALLED_APPS) import rpki.irdb # pylint: disable=W0621 diff --git a/rpki/rpkic.py b/rpki/rpkic.py index d7b76c51..8ce28b59 100644 --- a/rpki/rpkic.py +++ b/rpki/rpkic.py @@ -132,6 +132,8 @@ class main(Cmd): self.histfile = cfg.get("history_file", os.path.expanduser("~/.rpkic_history")) self.autosync = cfg.getboolean("autosync", True, section = "rpkic") + import django + from django.conf import settings settings.configure( @@ -144,8 +146,13 @@ class main(Cmd): "PORT" : "", "OPTIONS" : { "init_command": "SET storage_engine=INNODB" }}}, INSTALLED_APPS = ("rpki.irdb",), + MIDDLEWARE_CLASSES = (), # API change, feh ) + if django.VERSION >= (1, 7): # API change, feh + from django.apps import apps + apps.populate(settings.INSTALLED_APPS) + import rpki.irdb # pylint: disable=W0621 try: -- cgit v1.2.3