From 112dec11d2db830006739a391c56487c5c92d42c Mon Sep 17 00:00:00 2001 From: Herbert Kruitbosch Date: Tue, 28 Nov 2017 15:02:59 +0100 Subject: [PATCH] create settings --- README.md | 2 +- rugwebsite/__init__.py | 2 +- .../management/commands/init-saml2-settings.py | 16 +++++++++------- .../management/commands/settings_template.py | 1 + 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 30cfeb9..15e27c0 100755 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ packages, like django, python3-saml, etc. mkdir rugwebsite && cd rugwebsite virtualenv --python=/usr/bin/python3.5 venv source venv/bin/activate - pip3 install git+ssh://git@git.webhosting.rug.nl:222/p253591/rug-website.git + pip3 install -U gunicorn git+ssh://git@git.webhosting.rug.nl:222/p253591/rug-website.git ## Settings and X509 certificate diff --git a/rugwebsite/__init__.py b/rugwebsite/__init__.py index 71825a3..d1a2f77 100644 --- a/rugwebsite/__init__.py +++ b/rugwebsite/__init__.py @@ -1 +1 @@ -__version__ = '0.1.20' \ No newline at end of file +__version__ = '0.1.21' \ No newline at end of file diff --git a/rugwebsite/management/commands/init-saml2-settings.py b/rugwebsite/management/commands/init-saml2-settings.py index 4257358..a2d66b7 100644 --- a/rugwebsite/management/commands/init-saml2-settings.py +++ b/rugwebsite/management/commands/init-saml2-settings.py @@ -22,8 +22,8 @@ class Command(BaseCommand): parser.add_argument('--city', required=True, nargs=1, type=str, dest='city', help='For example: London or Groningen') parser.add_argument('--state', required=True, nargs=1, type=str, dest='state', help='For example: State or province, for example California or Groningen.') parser.add_argument('--organisation', required=True, nargs=1, type=str, dest='organisation', help='Typically \'University of Groningen\'') - parser.add_argument('--organisation-unit', required=True, nargs=1, type=str, dest='organisation-unit', help='For example: \'Research and Innovation\' Support or \'Faculty of smart people\'') - parser.add_argument('--common-name', required=True, nargs=1, type=str, dest='common-name') + parser.add_argument('--organisation-unit', required=True, nargs=1, type=str, dest='organisation_unit', help='For example: \'Research and Innovation\' Support or \'Faculty of smart people\'') + parser.add_argument('--common-name', required=True, nargs=1, type=str, dest='common_name') parser.add_argument('--alternative', nargs='*', type=str, dest='alternatives') parser.add_argument('--support-name', required=True, nargs=1, type=str, dest='support_name') parser.add_argument('--support-email', required=True, nargs=1, type=str, dest='support_email') @@ -34,9 +34,11 @@ class Command(BaseCommand): parser.add_argument('--expires-after-days', nargs='?', type=int, default=10 * 365, dest='expires') def handle(self, *args, **options): - for option in {'country', 'city', 'state', 'organisation', 'organisation-unit', 'common-name', 'support-name', - 'support-email', 'technical-name', 'technical-email', 'entity-id', 'base-url'}: - assert option in options and options[option] is not None and len(options[option]) == 1, "Exepecte one " \ + print('=' * 100) + print(options) + for option in {'country', 'city', 'state', 'organisation', 'organisation_unit', 'common_name', 'support_name', + 'support_email', 'technical_name', 'technical_email', 'entity_id', 'base_url'}: + assert option in options and options[option] is not None and len(options[option]) == 1, "Expected one " \ "value for option" \ ": " + option options[option] = options[option][0] @@ -47,8 +49,8 @@ class Command(BaseCommand): x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, options['state']), x509.NameAttribute(NameOID.LOCALITY_NAME, options['city']), x509.NameAttribute(NameOID.ORGANIZATION_NAME, options['organisation']), - x509.NameAttribute(NameOID.ORGANIZATIONAL_UNIT_NAME, options['organisation-unit']), - x509.NameAttribute(NameOID.COMMON_NAME, options['common-name']), + x509.NameAttribute(NameOID.ORGANIZATIONAL_UNIT_NAME, options['organisation_unit']), + x509.NameAttribute(NameOID.COMMON_NAME, options['common_name']), ]) cert = ( x509.CertificateBuilder() diff --git a/rugwebsite/management/commands/settings_template.py b/rugwebsite/management/commands/settings_template.py index 3f912c6..9eb44ab 100644 --- a/rugwebsite/management/commands/settings_template.py +++ b/rugwebsite/management/commands/settings_template.py @@ -17,6 +17,7 @@ SUPPORT_NAME = '{support_name}' SUPPORT_EMAIL = '{support_email}' ORGANISATION = '{organisation}' +ORGANISATION_UNIT = '{organisation_unit}' SAML_ROUTE = BASE_URL + 'sso/saml/'