from ipsilon.tools.saml2metadata import SAML2_NAMEID_MAP
from ipsilon.tools.saml2metadata import SAML2_SERVICE_MAP
from ipsilon.tools.certs import Certificate
-from string import Template
+from ipsilon.tools import files
import argparse
import logging
import os
raise
path = None
- if args['saml_httpd']:
+ if not args['saml_no_httpd']:
path = os.path.join(SAML2_HTTPDIR, args['hostname'])
os.makedirs(path, 0750)
else:
sp_metafile = os.path.join(path, 'metadata.xml')
m.output(sp_metafile)
- if args['saml_httpd']:
+ if not args['saml_no_httpd']:
idp_metafile = os.path.join(path, 'idp-metadata.xml')
with open(idp_metafile, 'w+') as f:
f.write(idpmeta)
# default location, enable the default page
psp = ''
- with open(SAML2_TEMPLATE) as f:
- template = f.read()
- t = Template(template)
- hunk = t.substitute(saml_base=args['saml_base'],
- saml_protect=saml_protect,
- saml_sp_key=c.key,
- saml_sp_cert=c.cert,
- saml_sp_meta=sp_metafile,
- saml_idp_meta=idp_metafile,
- saml_sp=args['saml_sp'],
- saml_auth=saml_auth, sp=psp)
-
- with open(SAML2_CONFFILE, 'w+') as f:
- f.write(hunk)
+ samlopts = {'saml_base': args['saml_base'],
+ 'saml_protect': saml_protect,
+ 'saml_sp_key': c.key,
+ 'saml_sp_cert': c.cert,
+ 'saml_sp_meta': sp_metafile,
+ 'saml_idp_meta': idp_metafile,
+ 'saml_sp': args['saml_sp'],
+ 'saml_auth': saml_auth,
+ 'sp': psp}
+ files.write_from_template(SAML2_CONFFILE, SAML2_TEMPLATE, samlopts)
files.fix_user_dirs(SAML2_HTTPDIR, args['httpd_user'])
help="Account allowed to create a SP")
parser.add_argument('--httpd-user', default='apache',
help="Web server account used to read certs")
- parser.add_argument('--saml', action='store_true', default=False,
+ parser.add_argument('--saml', action='store_true', default=True,
help="Whether to install a saml2 SP")
parser.add_argument('--saml-idp-metadata', default=None,
help="A URL pointing at the IDP Metadata (FILE or HTTP)")
- parser.add_argument('--saml-httpd', action='store_true', default=False,
- help="Automatically configure httpd")
+ parser.add_argument('--saml-no-httpd', action='store_true', default=False,
+ help="Do not configure httpd")
parser.add_argument('--saml-base', default='/',
help="Where saml2 authdata is available")
parser.add_argument('--saml-auth', default=SAML2_PROTECTED,