summaryrefslogtreecommitdiffstats
path: root/src/lib/Options.py
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2009-05-19 01:40:51 +0000
committerNarayan Desai <desai@mcs.anl.gov>2009-05-19 01:40:51 +0000
commit260f66263dbb3104eabb930f86bf1fff02389509 (patch)
tree08bfa8a8fd95f65ae4c5c7424988c4ba0bd34918 /src/lib/Options.py
parent229c86e87a277fac5756dd9c33267b4780113198 (diff)
downloadbcfg2-260f66263dbb3104eabb930f86bf1fff02389509.tar.gz
bcfg2-260f66263dbb3104eabb930f86bf1fff02389509.tar.bz2
bcfg2-260f66263dbb3104eabb930f86bf1fff02389509.zip
SSL: Implememt client-side server cN verification
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5244 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Options.py')
-rw-r--r--src/lib/Options.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/Options.py b/src/lib/Options.py
index add106869..a2d9d46ca 100644
--- a/src/lib/Options.py
+++ b/src/lib/Options.py
@@ -217,6 +217,11 @@ CLIENT_CERT = Option('Path to SSL certificate', default=None, cmd="--ssl-cert",
CLIENT_CA = Option('Path to SSL CA Cert', default=None, cmd="--ca-cert",
cf=('communication', 'ca'), odesc='<ca cert>',
long_arg=True)
+CLIENT_SCNS = Option('list of server commonNames', default=None, cmd="--ssl-cns",
+ cf=('communication', 'serverCommonNames'),
+ odesc='<commonName1:commonName2>', cook=list_split,
+ long_arg=True)
+
SERVER_PASSWORD = Option('Communication Password', cmd='-x', odesc='<password>',
cf=('communication', 'password'), default=False)
INSTALL_PREFIX = Option('Installation location', cf=('server', 'prefix'),
@@ -276,6 +281,7 @@ LOGGING_FILE_PATH = Option('Set path of file log', default=None,
CLIENT_SERVICE_MODE = Option('Set client service mode', default='default',
cmd='-s', odesc='<default|disabled|build>')
+
class OptionParser(OptionSet):
'''
OptionParser bootstraps option parsing,