From 860c51728f9f55bd72347a79aedb5f39f73de662 Mon Sep 17 00:00:00 2001 From: Julio Storch Date: Tue, 14 Feb 2023 15:14:29 +0100 Subject: [PATCH 1/2] Update changelog/clean up --- Makefile | 10 ++----- .../etc/simplesamlphp/97authsources.php | 0 .../metadata/97saml20-idp-hosted.php | 0 .../etc/simplesamlphp/97authsources.php | 24 --------------- .../metadata/97saml20-idp-hosted.php | 30 ------------------- debian/changelog | 13 ++++++++ 6 files changed, 15 insertions(+), 62 deletions(-) rename {conffiles-v1.9 => conffiles-template}/etc/simplesamlphp/97authsources.php (100%) rename {conffiles-v1.9 => conffiles-template}/etc/simplesamlphp/metadata/97saml20-idp-hosted.php (100%) delete mode 100644 conffiles-v1.8/etc/simplesamlphp/97authsources.php delete mode 100644 conffiles-v1.8/etc/simplesamlphp/metadata/97saml20-idp-hosted.php diff --git a/Makefile b/Makefile index aaec7e5..a9adf06 100644 --- a/Makefile +++ b/Makefile @@ -10,17 +10,11 @@ endif #VERSION=1.6 SRCDIRS=debian conffiles simplesamlphp-module-privacyidea/ SRCFILES=Makefile -DEFAULT_CONFFILES=conffiles-v1.9 +DEFAULT_CONFFILES=conffiles-template VERSION_NUMBER=$(shell echo ${VERSION} | sed 's@^[^0-9\.]*\([0-9\.]\+\).*@\1@') select-conffiles: - if [ $(shell echo ${VERSION_NUMBER}\>=1.9 | bc) -eq 1 ]; then \ - echo "Version: $(VERSION). Using conffiles-v1.9"; \ - cp -r conffiles-v1.9 conffiles; \ - else \ - echo "Version smaller than 1.9: $(VERSION). Using conffiles-v1.8."; \ - cp -r conffiles-v1.8 conffiles; \ - fi + cp -r ${DEFAULT_CONFFILES} conffiles clean: rm -fr conffiles diff --git a/conffiles-v1.9/etc/simplesamlphp/97authsources.php b/conffiles-template/etc/simplesamlphp/97authsources.php similarity index 100% rename from conffiles-v1.9/etc/simplesamlphp/97authsources.php rename to conffiles-template/etc/simplesamlphp/97authsources.php diff --git a/conffiles-v1.9/etc/simplesamlphp/metadata/97saml20-idp-hosted.php b/conffiles-template/etc/simplesamlphp/metadata/97saml20-idp-hosted.php similarity index 100% rename from conffiles-v1.9/etc/simplesamlphp/metadata/97saml20-idp-hosted.php rename to conffiles-template/etc/simplesamlphp/metadata/97saml20-idp-hosted.php diff --git a/conffiles-v1.8/etc/simplesamlphp/97authsources.php b/conffiles-v1.8/etc/simplesamlphp/97authsources.php deleted file mode 100644 index 7c004ee..0000000 --- a/conffiles-v1.8/etc/simplesamlphp/97authsources.php +++ /dev/null @@ -1,24 +0,0 @@ -// privacyIDEA authsource -@!@ -hostname = baseConfig.get('hostname') -domainname = baseConfig.get('domainname') -url = baseConfig.get('privacyidea/saml/url', 'https://%s.%s/privacyidea' % (hostname, domainname)) -realm = baseConfig.get('privacyidea/saml/realm', '') -verifyhost = baseConfig.get('privacyidea/saml/verifyhost', 'True') -verifypeer = baseConfig.get('privacyidea/saml/verifypeer', 'True') -print """ -$config['privacyidea'] = array( - 'privacyidea:privacyidea', - 'privacyideaserver' => '%s', - 'sslverifyhost' => %s, - 'sslverifypeer' => %s, - 'realm' => '%s', - 'attributemap' => array('username' => 'uid', - 'surname' => 'surName', - 'givenname' => 'givenName', - 'email' => 'emailAddress', - 'phone' => 'telePhone', - 'mobile' => 'mobilePhone'), - ); -""" % (url, verifyhost, verifypeer, realm) -@!@ diff --git a/conffiles-v1.8/etc/simplesamlphp/metadata/97saml20-idp-hosted.php b/conffiles-v1.8/etc/simplesamlphp/metadata/97saml20-idp-hosted.php deleted file mode 100644 index c01dd47..0000000 --- a/conffiles-v1.8/etc/simplesamlphp/metadata/97saml20-idp-hosted.php +++ /dev/null @@ -1,30 +0,0 @@ -@!@ -entity_id = configRegistry.get('saml/idp/entityID', - 'https://%(hostname)s.%(domainname)s/simplesamlphp/saml2/idp/metadata.php' - % configRegistry) - -hostname = baseConfig.get('hostname') -domainname = baseConfig.get('domainname') -url = baseConfig.get('privacyidea/saml/url', 'https://%s.%s/privacyidea' % (hostname, domainname)) -realm = baseConfig.get('privacyidea/saml/realm', '') -verifyhost = baseConfig.get('privacyidea/saml/verifyhost', 'True') -verifypeer = baseConfig.get('privacyidea/saml/verifypeer', 'True') -uid = baseConfig.get('privacyidea/saml/uidkey', 'uid') -enabled = baseConfig.get('privacyidea/saml/enable') - -if enabled == 'authsource' or enabled.lower() == 'true': - print "$metadata['%s']['auth'] = 'privacyidea';" % (entity_id,) -elif enabled == 'authproc': - print """ - $metadata['%s']['authproc'] = array( - 25 => array( - 'class' => 'privacyidea:privacyidea', - 'privacyideaserver' => '%s', - 'realm' => '%s', - 'uidKey' => '%s', - 'sslverifyhost' => %s, - 'sslverifypeer' => %s, - ), - ); - """ % (entity_id, url, realm, uid, verifyhost, verifypeer) -@!@ diff --git a/debian/changelog b/debian/changelog index 02ca395..aab2b58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +privacyidea-ucs-saml (3.0.0-1) stretch; urgency=medium + + * Simplified the configuration by introducing the Authentication Flow (#164, #166) + !!! Check the docs for the updated template of the configuration - the old configuration file does not work with the new version !!! + * Added implementation of the preferred client mode (#167) + * Added implementation of the token enrollment via challenge (#171) + * Used namespaces to communicate with simpleSAML core (#177) + * Fixed uncaught exceptions (#177, #185) + * Updated UI (#179) + * Add new Features #25 + + -- NetKnights GmbH Tue, 14 Feb 2023 10:00:00 +0200 + privacyidea-ucs-saml (2.1.3-1) stretch; urgency=medium * Add new Features #25 From 7aaa96f2b298446c98a9cece94a2f64d24a7ce12 Mon Sep 17 00:00:00 2001 From: lukasmatusiewicz Date: Fri, 17 Feb 2023 14:25:12 +0100 Subject: [PATCH 2/2] Update changelog --- debian/changelog | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index aab2b58..ed25ed4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,11 @@ privacyidea-ucs-saml (3.0.0-1) stretch; urgency=medium - * Simplified the configuration by introducing the Authentication Flow (#164, #166) + * Simplified the configuration by introducing the Authentication Flow !!! Check the docs for the updated template of the configuration - the old configuration file does not work with the new version !!! - * Added implementation of the preferred client mode (#167) - * Added implementation of the token enrollment via challenge (#171) - * Used namespaces to communicate with simpleSAML core (#177) - * Fixed uncaught exceptions (#177, #185) - * Updated UI (#179) - * Add new Features #25 + * Added implementation of the preferred client mode + * Added implementation of the token enrollment via challenge + * Fixed uncaught exceptions + * Updated UI -- NetKnights GmbH Tue, 14 Feb 2023 10:00:00 +0200