summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Dittberner <jandd@cacert.org>2016-05-06 22:17:34 +0200
committerJan Dittberner <jandd@cacert.org>2016-05-06 22:17:34 +0200
commitab83b670205eb3434e73ac902cd2b14773351acb (patch)
tree30811314ffaa51dd154d359c595cfa4f6c1630a7
parent6a4a7bdc329eab6608a3fc32bf22c59d8612217c (diff)
downloadcacert-infradocs-ab83b670205eb3434e73ac902cd2b14773351acb.tar.gz
cacert-infradocs-ab83b670205eb3434e73ac902cd2b14773351acb.tar.xz
cacert-infradocs-ab83b670205eb3434e73ac902cd2b14773351acb.zip
Fix SAN and secondary flag handling
This commit fixes the handling of Subject Alternative Names and sslcert directives with the 'secondary' flag. The sslcertlist table column widths have been adjusted to give more room for the SAN data.
-rw-r--r--docs/sphinxext/cacert.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/docs/sphinxext/cacert.py b/docs/sphinxext/cacert.py
index 12da1d3..cefcba2 100644
--- a/docs/sphinxext/cacert.py
+++ b/docs/sphinxext/cacert.py
@@ -48,8 +48,7 @@ def create_table_row(rowdata):
def subject_alternative_names(argument):
- import pdb; pdb.set_trace()
- value = [san.strip() for san in argument.strip()]
+ value = [san.strip() for san in argument.split(',')]
# TODO: sanity checks for SANs
return value
@@ -80,7 +79,7 @@ class CAcertSSLCert(Directive):
}
def run(self):
- if self.options.get('secondary'):
+ if 'secondary' in self.options:
missing = [
required for required in ('certfile', 'keyfile', 'serial')
if required not in self.options
@@ -249,7 +248,7 @@ def process_sslcert_nodes(app, doctree, docname):
tgroup = nodes.tgroup(cols=2)
table += tgroup
tgroup += nodes.colspec(colwidth=1)
- tgroup += nodes.colspec(colwidth=3)
+ tgroup += nodes.colspec(colwidth=5)
tbody = nodes.tbody()
tgroup += tbody
tbody += create_table_row([