catalyst · tuanngocnguyen · Dec 4, 2024 · Nov 14, 2024 · Nov 20, 2024 · Sep 28, 2020
diff --git a/.extlib/UPGRADE.md b/.extlib/UPGRADE.md
@@ -8,38 +8,28 @@ SimpleSAMLphp
 We need to manually build simplesaml sometimes as the release contains dependencies we don't want.
 
 ### Get upstream simplesaml.
+Make sure to checkout the latest version tag
 ```bash
 git clone [email protected]:simplesamlphp/simplesamlphp.git simplesamlphp
-
-cd /var/simplesamlphp
-cp -r config-templates/* config/
-cp -r metadata-templates/* metadata/
+cd simplesamlphp
+git checkout v2.3.3
 ```
 ### Install composer
-```bash
-php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-php -r "if (hash_file('sha384', 'composer-setup.php') === '756890a4488ce9024fc62c56153228907f1545c228516cbf63f885e036d37e9a59d27d63f46af1d4d07ee0f76181c7d3') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
-php composer-setup.php
-php -r "unlink('composer-setup.php');"
-```
-### Remove any dependencies we don't want.
-Remove symfony/config/Tests/Fixtures as PHPLint fails due to unexpected end of file error in Fixtures/ParseError.php.
-In 1.17 build, we removed symfony/polyfill-php70 from composer.lock.
+[Composer Install Guide](https://getcomposer.org/doc/00-intro.md#installation-linux-unix-macos)
 
 ### Install the external dependencies (excluding dev)
 Make sure you run the install with "--no-dev" as below.
+Remove any depdnencies we don't want.
 ```bash
-php composer.phar install --no-dev
-npm install
-npm run build
+composer install --no-dev
+composer remove phpmailer/phpmailer
 ```
 
-### Review simplesamlphp bin/build-release.sh
-Simplesamlphp uses a bin/build-release.sh to generate their release
-This script removes a number of system files that are not required like .gitignore, composer.* files, node_modules directory.
-
-Review the latest version of this file and remove anything not required:
-https://github.com/simplesamlphp/simplesamlphp/blob/master/bin/build-release.sh
+### Clean Files
+See the cleaning step in the [workflow](https://github.com/simplesamlphp/simplesamlphp/blob/master/.github/workflows/build-release.yml), At the time of writing this deletes everything referenced in `.gitattributes`. We also remove
+* `composer.json`
+* `composer.lock`
+* `modules/.gitignore`
 ### Copy into auth_saml2
 Copy the updated simplesaml files into auth/saml/.extlib/simplesaml.
 
@@ -59,45 +49,6 @@ Update the version of SSP in the supported branches. Make sure you do this is AL
 even if you have only updated SSP in one branch. It shouldn't matter which README you look at they
 should be consistent.
 
-# Using a published release 
-Sometimes you might get away with using a published release with the following instructions.
-
-Do not copy & paste blindly, this is the general idea only.
-
-```bash
-cd auth/saml2/.extlib
-
-# We will delete stuff and compare later.
-# Ensure everything is commited into git.
-git checkout -b issueXXX_extlib-upgrade 
-git status
-```
-
-```bash
-rm -rf simplesamlphp
-
-curl -L https://simplesamlphp.org/download?latest | tar vxz
-mv simplesamlphp-1.15.4 simplesamlphp
-rm -rf simplesamlphp/config
-rm -rf simplesamlphp/metadata
-
-git add simplesamlphp
-git commit -m 'Issue #XXX - Updating with code from simplesamlphp-1.15.4' # Customise the message!
-
-# Check what was customised when this document was updated, you may want to cherry pick it.
-git show a32804374772709d65264ab823f8a3b3adfc6391  
-
-# Analyse what is different, backport modifications as needed.
-git diff master..HEAD
-
-# Analyse your changes, try to keep as close as possible to the upstream code.
-git diff HEAD
-
-# Done!
-git add simplesamlphp
-git commit -m 'Issue #XXX - Backporting modifications for auth_saml2' # Customise the message!
-```
-
 # Testing locally
 1> Set up IDP locally as suggested here: https://simplesamlphp.org/docs/stable/simplesamlphp-idp
 

diff --git a/.extlib/simplesamlphp/SECURITY.md b/.extlib/simplesamlphp/SECURITY.md
@@ -12,7 +12,7 @@ The 1.19 branch will receive security and critical bug fixes until the end of 20
 
 ## Reporting a Vulnerability
 
-In case you find a vulnerability in SimpleSAMLphp, or you want to confirm a possible security issue in the software, please get in touch with us through [UNINETT's CERT team](https://www.uninett.no/cert). Please use our PGP public key to encrypt any possible sensitive data that you may need to submit. We will get back to you as soon as possible according to our working hours in Central European Time.
+In case you find a vulnerability in SimpleSAMLphp, or you want to confirm a possible security issue in the software, please get in touch with us through [Sikt's CERT team](https://sikt.no/abuse). Please use our PGP public key to encrypt any possible sensitive data that you may need to submit. We will get back to you as soon as possible according to our working hours in Central European Time.
 
 When reporting a security issue, please add as much information as possible to help us identify, confirm, replicate and fix the problem. In particular, remember to include the following information in your report:
 

diff --git a/.extlib/simplesamlphp/attributemap/entra2name.php b/.extlib/simplesamlphp/attributemap/entra2name.php
@@ -0,0 +1,25 @@
+<?php
+
+$attributemap = [
+    /**
+     * Renamed Attributes to match other 2name mappings
+     */
+    "http://schemas.microsoft.com/identity/claims/objectidentifier" => 'uid',
+    "http://schemas.microsoft.com/identity/claims/displayname" => 'displayName',
+    "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" => 'givenName',
+    "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" => 'sn',
+    "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" => 'emailAddress',
+    "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" => 'mail',
+
+    /**
+     * Additional/Optional Claim, using default value
+     */
+    "http://schemas.microsoft.com/ws/2008/06/identity/claims/groups" => 'groups',
+
+    /**
+     * Additional Attributes from Entra
+     */
+    "http://schemas.microsoft.com/claims/authnmethodsreferences" => 'authNMethodsReferences',
+    "http://schemas.microsoft.com/identity/claims/identityprovider" => 'idp',
+    "http://schemas.microsoft.com/identity/claims/tenantid" => 'tenantId',
+];
diff --git a/.extlib/simplesamlphp/attributemap/name2entra.php b/.extlib/simplesamlphp/attributemap/name2entra.php
@@ -0,0 +1,25 @@
+<?php 
+
+$attributemap = [
+    /**
+     * Renamed Attributes to match other 2name mappings, mapped back to default Entra claim names
+     */
+    'uid' => 'http://schemas.microsoft.com/identity/claims/objectidentifier',
+    'displayName' => 'http://schemas.microsoft.com/identity/claims/displayname',
+    'givenName' => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname',
+    'sn' => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname',
+    'emailAddress' => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress',
+    'mail' => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name',
+
+    /**
+     * Additional/Optional Claim, using default value, mapped back to original claim names
+     */
+    'groups' => 'http://schemas.microsoft.com/ws/2008/06/identity/claims/groups',
+
+    /**
+     * Additional Attributes from Entra, mapped back to original claims
+     */
+    'authNMethodsReferences' => 'http://schemas.microsoft.com/claims/authnmethodsreferences',
+    'idp' => 'http://schemas.microsoft.com/identity/claims/identityprovider',
+    'tenantId' => 'http://schemas.microsoft.com/identity/claims/tenantid',
+];
diff --git a/.extlib/simplesamlphp/attributemap/name2oid.php b/.extlib/simplesamlphp/attributemap/name2oid.php
@@ -44,18 +44,21 @@
     'eduOrgSuperiorURI'             => 'urn:oid:1.3.6.1.4.1.5923.1.2.1.5',
     'eduOrgWhitePagesURI'           => 'urn:oid:1.3.6.1.4.1.5923.1.2.1.6',
     'eduPersonAffiliation'          => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.1',
+    'eduPersonAnalyticsTag'         => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.17',
     'eduPersonAssurance'            => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.11',
+    'eduPersonDisplayPronouns'      => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.18',
     'eduPersonEntitlement'          => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.7',
     'eduPersonNickname'             => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.2',
+    'eduPersonOrcid'                => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.16',
     'eduPersonOrgDN'                => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.3',
     'eduPersonOrgUnitDN'            => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.4',
     'eduPersonPrimaryAffiliation'   => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.5',
     'eduPersonPrimaryOrgUnitDN'     => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.8',
     'eduPersonPrincipalName'        => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.6',
+    'eduPersonPrincipalNamePrior'   => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.12',
     'eduPersonScopedAffiliation'    => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.9',
     'eduPersonTargetedID'           => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.10',
     'eduPersonUniqueId'             => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.13',
-    'eduPersonOrcid'                => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.16',
     'email'                         => 'urn:oid:1.2.840.113549.1.9.1',
     'emailAddress'                  => 'urn:oid:1.2.840.113549.1.9.1',
     'employeeNumber'                => 'urn:oid:2.16.840.1.113730.3.1.3',

diff --git a/.extlib/simplesamlphp/attributemap/oid2name.php b/.extlib/simplesamlphp/attributemap/oid2name.php
@@ -1,13 +1,20 @@
 <?php
 $attributemap = [
     'urn:oid:0.9.2342.19200300.100.1.1'  => 'uid',
+    'urn:oid:0.9.2342.19200300.100.1.2'  => 'textEncodedORAddress',
+    'urn:oid:0.9.2342.19200300.100.1.3'  => 'mail',
+    'urn:oid:0.9.2342.19200300.100.1.4'  => 'info',
+    'urn:oid:0.9.2342.19200300.100.1.5'  => 'drink',
+    'urn:oid:0.9.2342.19200300.100.1.6'  => 'roomNumber',
+    'urn:oid:0.9.2342.19200300.100.1.7'  => 'photo',
+    'urn:oid:0.9.2342.19200300.100.1.8'  => 'userClass',
+    'urn:oid:0.9.2342.19200300.100.1.9'  => 'host',
     'urn:oid:0.9.2342.19200300.100.1.10' => 'manager',
     'urn:oid:0.9.2342.19200300.100.1.11' => 'documentIdentifier',
     'urn:oid:0.9.2342.19200300.100.1.12' => 'documentTitle',
     'urn:oid:0.9.2342.19200300.100.1.13' => 'documentVersion',
     'urn:oid:0.9.2342.19200300.100.1.14' => 'documentAuthor',
     'urn:oid:0.9.2342.19200300.100.1.15' => 'documentLocation',
-    'urn:oid:0.9.2342.19200300.100.1.2'  => 'textEncodedORAddress',
     'urn:oid:0.9.2342.19200300.100.1.20' => 'homePhone',
     'urn:oid:0.9.2342.19200300.100.1.21' => 'secretary',
     'urn:oid:0.9.2342.19200300.100.1.22' => 'otherMailbox',
@@ -16,13 +23,11 @@
     'urn:oid:0.9.2342.19200300.100.1.27' => 'mDRecord',
     'urn:oid:0.9.2342.19200300.100.1.28' => 'mXRecord',
     'urn:oid:0.9.2342.19200300.100.1.29' => 'nSRecord',
-    'urn:oid:0.9.2342.19200300.100.1.3'  => 'mail',
     'urn:oid:0.9.2342.19200300.100.1.30' => 'sOARecord',
     'urn:oid:0.9.2342.19200300.100.1.31' => 'cNAMERecord',
     'urn:oid:0.9.2342.19200300.100.1.37' => 'associatedDomain',
     'urn:oid:0.9.2342.19200300.100.1.38' => 'associatedName',
     'urn:oid:0.9.2342.19200300.100.1.39' => 'homePostalAddress',
-    'urn:oid:0.9.2342.19200300.100.1.4'  => 'info',
     'urn:oid:0.9.2342.19200300.100.1.40' => 'personalTitle',
     'urn:oid:0.9.2342.19200300.100.1.41' => 'mobile',
     'urn:oid:0.9.2342.19200300.100.1.42' => 'pager',
@@ -33,27 +38,21 @@
     'urn:oid:0.9.2342.19200300.100.1.47' => 'mailPreferenceOption',
     'urn:oid:0.9.2342.19200300.100.1.48' => 'buildingName',
     'urn:oid:0.9.2342.19200300.100.1.49' => 'dSAQuality',
-    'urn:oid:0.9.2342.19200300.100.1.5'  => 'drink',
     'urn:oid:0.9.2342.19200300.100.1.50' => 'singleLevelQuality',
     'urn:oid:0.9.2342.19200300.100.1.51' => 'subtreeMinimumQuality',
     'urn:oid:0.9.2342.19200300.100.1.52' => 'subtreeMaximumQuality',
     'urn:oid:0.9.2342.19200300.100.1.53' => 'personalSignature',
     'urn:oid:0.9.2342.19200300.100.1.54' => 'dITRedirect',
     'urn:oid:0.9.2342.19200300.100.1.55' => 'audio',
     'urn:oid:0.9.2342.19200300.100.1.56' => 'documentPublisher',
-    'urn:oid:0.9.2342.19200300.100.1.6'  => 'roomNumber',
     'urn:oid:0.9.2342.19200300.100.1.60' => 'jpegPhoto',
-    'urn:oid:0.9.2342.19200300.100.1.7'  => 'photo',
-    'urn:oid:0.9.2342.19200300.100.1.8'  => 'userClass',
-    'urn:oid:0.9.2342.19200300.100.1.9'  => 'host',
-    'urn:oid:1.2.840.113549.1.9.1'       => 'email',
     'urn:oid:1.2.752.194.10.2.2'         => 'sisSchoolGrade',
     'urn:oid:1.2.752.194.10.2.1'         => 'sisLegalGuardianFor',
     'urn:oid:1.2.752.194.10.3'           => 'sisOrgDepartment',
     'urn:oid:1.2.752.194.10.2.4'         => 'sisSchoolUnitCode',
+    'urn:oid:1.2.840.113549.1.9.1'       => 'email',
+    'urn:oid:1.3.6.1.4.1.250.1.57'       => 'labeledURI',
     'urn:oid:1.3.6.1.4.1.2428.90.1.1'    => 'norEduOrgUniqueNumber',
-    'urn:oid:1.3.6.1.4.1.2428.90.1.11'   => 'norEduOrgSchemaVersion',
-    'urn:oid:1.3.6.1.4.1.2428.90.1.12'   => 'norEduOrgNIN',
     'urn:oid:1.3.6.1.4.1.2428.90.1.2'    => 'norEduOrgUnitUniqueNumber',
     'urn:oid:1.3.6.1.4.1.2428.90.1.3'    => 'norEduPersonBirthDate',
     'urn:oid:1.3.6.1.4.1.2428.90.1.4'    => 'norEduPersonLIN',
@@ -62,13 +61,9 @@
     'urn:oid:1.3.6.1.4.1.2428.90.1.7'    => 'norEduOrgUniqueIdentifier',
     'urn:oid:1.3.6.1.4.1.2428.90.1.8'    => 'norEduOrgUnitUniqueIdentifier',
     'urn:oid:1.3.6.1.4.1.2428.90.1.9'    => 'federationFeideSchemaVersion',
-    'urn:oid:1.3.6.1.4.1.24552.500.1.1.1.13' => 'sshPublicKey',
-    'urn:oid:1.3.6.1.4.1.250.1.57'       => 'labeledURI',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.11'   => 'norEduOrgSchemaVersion',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.12'   => 'norEduOrgNIN',
     'urn:oid:1.3.6.1.4.1.5923.1.1.1.1'   => 'eduPersonAffiliation',
-    'urn:oid:1.3.6.1.4.1.5923.1.1.1.11'  => 'eduPersonAssurance',
-    'urn:oid:1.3.6.1.4.1.5923.1.1.1.10'  => 'eduPersonTargetedID',
-    'urn:oid:1.3.6.1.4.1.5923.1.1.1.13'  => 'eduPersonUniqueId',
-    'urn:oid:1.3.6.1.4.1.5923.1.1.1.16'  => 'eduPersonOrcid',
     'urn:oid:1.3.6.1.4.1.5923.1.1.1.2'   => 'eduPersonNickname',
     'urn:oid:1.3.6.1.4.1.5923.1.1.1.3'   => 'eduPersonOrgDN',
     'urn:oid:1.3.6.1.4.1.5923.1.1.1.4'   => 'eduPersonOrgUnitDN',
@@ -77,12 +72,20 @@
     'urn:oid:1.3.6.1.4.1.5923.1.1.1.7'   => 'eduPersonEntitlement',
     'urn:oid:1.3.6.1.4.1.5923.1.1.1.8'   => 'eduPersonPrimaryOrgUnitDN',
     'urn:oid:1.3.6.1.4.1.5923.1.1.1.9'   => 'eduPersonScopedAffiliation',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.10'  => 'eduPersonTargetedID',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.11'  => 'eduPersonAssurance',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.12'  => 'eduPersonPrincipalNamePrior',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.13'  => 'eduPersonUniqueId',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.16'  => 'eduPersonOrcid',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.17'  => 'eduPersonAnalyticsTag',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.18'  => 'eduPersonDisplayPronouns',
     'urn:oid:1.3.6.1.4.1.5923.1.2.1.2'   => 'eduOrgHomePageURI',
     'urn:oid:1.3.6.1.4.1.5923.1.2.1.3'   => 'eduOrgIdentityAuthNPolicyURI',
     'urn:oid:1.3.6.1.4.1.5923.1.2.1.4'   => 'eduOrgLegalName',
     'urn:oid:1.3.6.1.4.1.5923.1.2.1.5'   => 'eduOrgSuperiorURI',
     'urn:oid:1.3.6.1.4.1.5923.1.2.1.6'   => 'eduOrgWhitePagesURI',
     'urn:oid:1.3.6.1.4.1.5923.1.5.1.1'   => 'isMemberOf',
+    'urn:oid:1.3.6.1.4.1.24552.500.1.1.1.13' => 'sshPublicKey',
     'urn:oid:1.3.6.1.4.1.25178.1.0.2.3'  => 'schacYearOfBirth',
     'urn:oid:1.3.6.1.4.1.25178.1.2.1'    => 'schacMotherTongue',
     'urn:oid:1.3.6.1.4.1.25178.1.2.2'    => 'schacGender',
@@ -124,16 +127,16 @@
     'urn:oid:1.3.6.1.4.1.25178.4.2.3'    => 'voPosixAccountHomeDirectory',
     'urn:oid:1.3.6.1.4.1.25178.4.2.4'    => 'voPosixAccountLoginShell',
     'urn:oid:1.3.6.1.4.1.25178.4.2.5'    => 'voPosixAccountUidNumber',
-    'urn:oid:2.16.840.1.113730.3.1.1'    => 'carLicense',
-    'urn:oid:2.16.840.1.113730.3.1.2'    => 'departmentNumber',
-    'urn:oid:2.16.840.1.113730.3.1.216'  => 'userPKCS12',
-    'urn:oid:2.16.840.1.113730.3.1.241'  => 'displayName',
-    'urn:oid:2.16.840.1.113730.3.1.3'    => 'employeeNumber',
-    'urn:oid:2.16.840.1.113730.3.1.39'   => 'preferredLanguage',
-    'urn:oid:2.16.840.1.113730.3.1.4'    => 'employeeType',
-    'urn:oid:2.16.840.1.113730.3.1.40'   => 'userSMIMECertificate',
     'urn:oid:2.5.4.0'                    => 'objectClass',
     'urn:oid:2.5.4.1'                    => 'aliasedObjectName',
+    'urn:oid:2.5.4.2'                    => 'knowledgeInformation',
+    'urn:oid:2.5.4.3'                    => 'cn',
+    'urn:oid:2.5.4.4'                    => 'sn',
+    'urn:oid:2.5.4.5'                    => 'serialNumber',
+    'urn:oid:2.5.4.6'                    => 'c',
+    'urn:oid:2.5.4.7'                    => 'l',
+    'urn:oid:2.5.4.8'                    => 'st',
+    'urn:oid:2.5.4.9'                    => 'street',
     'urn:oid:2.5.4.10'                   => 'o',
     'urn:oid:2.5.4.11'                   => 'ou',
     'urn:oid:2.5.4.12'                   => 'title',
@@ -144,7 +147,6 @@
     'urn:oid:2.5.4.17'                   => 'postalCode',
     'urn:oid:2.5.4.18'                   => 'postOfficeBox',
     'urn:oid:2.5.4.19'                   => 'physicalDeliveryOfficeName',
-    'urn:oid:2.5.4.2'                    => 'knowledgeInformation',
     'urn:oid:2.5.4.20'                   => 'telephoneNumber',
     'urn:oid:2.5.4.21'                   => 'telexNumber',
     'urn:oid:2.5.4.22'                   => 'teletexTerminalIdentifier',
@@ -155,7 +157,6 @@
     'urn:oid:2.5.4.27'                   => 'destinationIndicator',
     'urn:oid:2.5.4.28'                   => 'preferredDeliveryMethod',
     'urn:oid:2.5.4.29'                   => 'presentationAddress',
-    'urn:oid:2.5.4.3'                    => 'cn',
     'urn:oid:2.5.4.30'                   => 'supportedApplicationContext',
     'urn:oid:2.5.4.31'                   => 'member',
     'urn:oid:2.5.4.32'                   => 'owner',
@@ -166,7 +167,6 @@
     'urn:oid:2.5.4.37'                   => 'cACertificate',
     'urn:oid:2.5.4.38'                   => 'authorityRevocationList',
     'urn:oid:2.5.4.39'                   => 'certificateRevocationList',
-    'urn:oid:2.5.4.4'                    => 'sn',
     'urn:oid:2.5.4.40'                   => 'crossCertificatePair',
     'urn:oid:2.5.4.41'                   => 'name',
     'urn:oid:2.5.4.42'                   => 'givenName',
@@ -177,15 +177,18 @@
     'urn:oid:2.5.4.47'                   => 'enhancedSearchGuide',
     'urn:oid:2.5.4.48'                   => 'protocolInformation',
     'urn:oid:2.5.4.49'                   => 'distinguishedName',
-    'urn:oid:2.5.4.5'                    => 'serialNumber',
     'urn:oid:2.5.4.50'                   => 'uniqueMember',
     'urn:oid:2.5.4.51'                   => 'houseIdentifier',
     'urn:oid:2.5.4.52'                   => 'supportedAlgorithms',
     'urn:oid:2.5.4.53'                   => 'deltaRevocationList',
     'urn:oid:2.5.4.54'                   => 'dmdName',
-    'urn:oid:2.5.4.6'                    => 'c',
     'urn:oid:2.5.4.65'                   => 'pseudonym',
-    'urn:oid:2.5.4.7'                    => 'l',
-    'urn:oid:2.5.4.8'                    => 'st',
-    'urn:oid:2.5.4.9'                    => 'street',
+    'urn:oid:2.16.840.1.113730.3.1.1'    => 'carLicense',
+    'urn:oid:2.16.840.1.113730.3.1.2'    => 'departmentNumber',
+    'urn:oid:2.16.840.1.113730.3.1.3'    => 'employeeNumber',
+    'urn:oid:2.16.840.1.113730.3.1.4'    => 'employeeType',
+    'urn:oid:2.16.840.1.113730.3.1.39'   => 'preferredLanguage',
+    'urn:oid:2.16.840.1.113730.3.1.40'   => 'userSMIMECertificate',
+    'urn:oid:2.16.840.1.113730.3.1.216'  => 'userPKCS12',
+    'urn:oid:2.16.840.1.113730.3.1.241'  => 'displayName',
 ];
diff --git a/.extlib/simplesamlphp/bin/console b/.extlib/simplesamlphp/bin/console
@@ -1,6 +1,8 @@
 #!/usr/bin/env php
 <?php
 
+declare(strict_types=1);
+
 use SimpleSAML\Console\Application;
 use SimpleSAML\Kernel;
 use Symfony\Component\Console\Input\ArgvInput;
@@ -11,7 +13,7 @@ set_time_limit(0);
 require __DIR__.'/../vendor/autoload.php';
 
 $input = new ArgvInput();
-$module = $input->getParameterOption(['--modules', '-m'], 'core');
+$module = $input->getParameterOption(['--module', '-m'], 'core');
 $kernel = new Kernel($module);
 
 $application = new Application($kernel);