aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2012-10-16 16:04:50 +0000
committerRob Austein <sra@hactrn.net>2012-10-16 16:04:50 +0000
commit008532eb628953028af9ef8df7d311c7f09c1e16 (patch)
tree6d910fb79762bb4833f98734533692bdcf68e784
parent383984b4e67d6196c96eabf5388c845071373d26 (diff)
Make schema checking configurable at runtime, reenable inbound schema
checking as the default. svn path=/branches/tk274/; revision=4779
-rw-r--r--rpkid/rpki/config.py10
-rw-r--r--rpkid/rpki/x509.py2
2 files changed, 11 insertions, 1 deletions
diff --git a/rpkid/rpki/config.py b/rpkid/rpki/config.py
index 87f1f52e..1ade720b 100644
--- a/rpkid/rpki/config.py
+++ b/rpkid/rpki/config.py
@@ -269,6 +269,16 @@ class parser(object):
pass
try:
+ rpki.x509.XML_CMS_object.check_inbound_schema = self.get("check_inbound_schema")
+ except ConfigParser.NoOptionError:
+ pass
+
+ try:
+ rpki.x509.XML_CMS_object.check_outbound_schema = self.get("check_outbound_schema")
+ except ConfigParser.NoOptionError:
+ pass
+
+ try:
rpki.async.gc_summary(self.getint("gc_summary"), self.getint("gc_summary_threshold", 0))
except ConfigParser.NoOptionError:
pass
diff --git a/rpkid/rpki/x509.py b/rpkid/rpki/x509.py
index 87ae72e2..5eca40ce 100644
--- a/rpkid/rpki/x509.py
+++ b/rpkid/rpki/x509.py
@@ -1588,7 +1588,7 @@ class XML_CMS_object(Wrapped_CMS_object):
## @var check_inbound_schema
# If set, perform RelaxNG schema check on inbound messages.
- check_inbound_schema = False # XXX
+ check_inbound_schema = True
## @var check_outbound_schema
# If set, perform RelaxNG schema check on outbound messages.