Skip to content

Rciam 1.18 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ioigoume wants to merge 28 commits into
base: simplesamlphp-1.18
Choose a base branch
from
Open

Rciam 1.18 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
461b13f
Bump robrichards/xmlseclibs dependency to 3.1.1
NicolasLiampotis Jan 11, 2021
774b879
Add `eduPersonUniqueId` to URN prefix attributemap
nikosev Jan 13, 2021
4037f9f
Add `eduPersonOrcid` to URN prefix attributemap
nikosev Jan 13, 2021
12be4d6
Add `eduPersonOrcid` URN to attributemap
nikosev Jan 13, 2021
dd9de78
Add `isServiceUser` attribute in attributemap
nikosev Jan 14, 2021
2a9c965
Preserve values of duplicate variables when parsing SAML metadata
NicolasLiampotis Jan 13, 2021
cd4f1db
Add voPerson attributes
ioigoume Jan 12, 2021
98716b7
Merge pull request #6 from ioigoume/RCIAM-480_Add_voperson_attributes…
NicolasLiampotis Jan 15, 2021
c1eb437
Merge pull request #7 from nikosev/feature-epuid_urnprefix
NicolasLiampotis Jan 21, 2021
cf17c53
Merge pull request #8 from nikosev/feature-edupersonorcid_attribute
NicolasLiampotis Jan 21, 2021
288b526
Merge pull request #9 from nikosev/hotfix-saml_xml_parser
NicolasLiampotis Jan 21, 2021
688a961
Merge pull request #10 from nikosev/feature-is_service_user
NicolasLiampotis Jan 21, 2021
4373594
Add `subject-id` attribute to attributemap
nikosev Jan 14, 2021
3f8582b
Merge pull request #12 from nikosev/feature-subject_id
NicolasLiampotis Feb 11, 2021
5d8d792
Add `pairwise-id` attribute to attributemap
nikosev Jan 14, 2021
d8b993b
Update composer.lock
Feb 15, 2021
799a35f
Merge pull request #14 from Tas-sos/update_composer
NicolasLiampotis Feb 16, 2021
c52a016
Merge pull request #13 from nikosev/feature-pairwise_id
NicolasLiampotis Feb 20, 2021
88e65bc
Add voPersonID and voPersonScopedAffiliation
NicolasLiampotis Jun 29, 2021
1ad2139
Fix `vopersoncertificate*` key's case
nikosev Jul 27, 2021
3486074
Add definition for `distinguishedName`
nikosev Jul 27, 2021
99068d6
Merge pull request #16 from nikosev/hotfix-voperson_definitions
NicolasLiampotis Aug 23, 2021
0c8158a
Edit attribute definition
nikosev Nov 10, 2021
96e0fcb
Merge pull request #17 from nikosev/feature-edit_attribute_definition
NicolasLiampotis Nov 11, 2021
a4233a4
Define the log level for shown SAML messages
nikosev Nov 12, 2021
f4a2491
Merge pull request #18 from nikosev/feature-saml_messages_log_level
NicolasLiampotis Nov 15, 2021
2bf24bc
Fix default value for `saml.level`
nikosev Nov 16, 2021
808dd74
Merge pull request #19 from nikosev/hotfix-saml_messages_log_level
NicolasLiampotis Nov 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions attributemap/addurnprefix.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
'eduPersonAffiliation' => 'urn:mace:dir:attribute-def:eduPersonAffiliation',
'eduPersonScopedAffiliation' => 'urn:mace:dir:attribute-def:eduPersonScopedAffiliation',
'eduPersonEntitlement' => 'urn:mace:dir:attribute-def:eduPersonEntitlement',
'eduPersonOrcid' => 'urn:mace:dir:attribute-def:eduPersonOrcid',
'eduPersonOrgDN' => 'urn:mace:dir:attribute-def:eduPersonOrgDN',
'eduPersonOrgUnitDN' => 'urn:mace:dir:attribute-def:eduPersonOrgUnitDN',
'eduPersonUniqueId' => 'urn:mace:dir:attribute-def:eduPersonUniqueId',
];
10 changes: 10 additions & 0 deletions attributemap/name2oid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
'initials' => 'urn:oid:2.5.4.43',
'internationaliSDNNumber' => 'urn:oid:2.5.4.25',
'isMemberOf' => 'urn:oid:1.3.6.1.4.1.5923.1.5.1.1',
'isServiceUser' => 'urn:mace:egi.eu:attribute-def:isServiceUser',
'janetMailbox' => 'urn:oid:0.9.2342.19200300.100.1.46',
'jpegPhoto' => 'urn:oid:0.9.2342.19200300.100.1.60',
'knowledgeInformation' => 'urn:oid:2.5.4.2',
Expand Down Expand Up @@ -114,6 +115,7 @@
'owner' => 'urn:oid:2.5.4.32',
'pager' => 'urn:oid:0.9.2342.19200300.100.1.42',
'pagerTelephoneNumber' => 'urn:oid:0.9.2342.19200300.100.1.42',
'pairwise-id' => 'urn:oasis:names:tc:SAML:attribute:pairwise-id',
'personalSignature' => 'urn:oid:0.9.2342.19200300.100.1.53',
'personalTitle' => 'urn:oid:0.9.2342.19200300.100.1.40',
'photo' => 'urn:oid:0.9.2342.19200300.100.1.7',
Expand Down Expand Up @@ -168,6 +170,7 @@
'stateOrProvinceName' => 'urn:oid:2.5.4.8',
'street' => 'urn:oid:2.5.4.9',
'streetAddress' => 'urn:oid:2.5.4.9',
'subject-id' => 'urn:oasis:names:tc:SAML:attribute:subject-id',
'subtreeMaximumQuality' => 'urn:oid:0.9.2342.19200300.100.1.52',
'subtreeMinimumQuality' => 'urn:oid:0.9.2342.19200300.100.1.51',
'supportedAlgorithms' => 'urn:oid:2.5.4.52',
Expand All @@ -187,6 +190,13 @@
'userPassword' => 'urn:oid:2.5.4.35',
'userSMIMECertificate' => 'urn:oid:2.16.840.1.113730.3.1.40',
'userid' => 'urn:oid:0.9.2342.19200300.100.1.1',
'voPersonCertificateDN' => 'urn:oid:1.3.6.1.4.1.25178.4.1.3',
'voPersonCertificateIssuerDN' => 'urn:oid:1.3.6.1.4.1.25178.4.1.4',
'voPersonExternalAffiliation' => 'urn:oid:1.3.6.1.4.1.25178.4.1.11',
'voPersonExternalID' => 'urn:oid:1.3.6.1.4.1.25178.4.1.5',
'voPersonID' => 'urn:oid:1.3.6.1.4.1.25178.4.1.6',
'voPersonScopedAffiliation' => 'urn:oid:1.3.6.1.4.1.25178.4.1.12',
'voPersonVerifiedEmail' => 'urn:oid:1.3.6.1.4.1.25178.4.1.14',
'x121Address' => 'urn:oid:2.5.4.24',
'x500UniqueIdentifier' => 'urn:oid:2.5.4.45',
];
1 change: 1 addition & 0 deletions attributemap/name2urn.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
'eduPersonAssurance' => 'urn:mace:dir:attribute-def:eduPersonAssurance',
'eduPersonEntitlement' => 'urn:mace:dir:attribute-def:eduPersonEntitlement',
'eduPersonNickname' => 'urn:mace:dir:attribute-def:eduPersonNickname',
'eduPersonOrcid' => 'urn:mace:dir:attribute-def:eduPersonOrcid',
'eduPersonOrgDN' => 'urn:mace:dir:attribute-def:eduPersonOrgDN',
'eduPersonOrgUnitDN' => 'urn:mace:dir:attribute-def:eduPersonOrgUnitDN',
'eduPersonPrimaryAffiliation' => 'urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation',
Expand Down
10 changes: 10 additions & 0 deletions attributemap/oid2name.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<?php
$attributemap = [
'urn:mace:egi.eu:attribute-def:isServiceUser' => 'isServiceUser',
'urn:oasis:names:tc:SAML:attribute:pairwise-id' => 'pairwise-id',
'urn:oasis:names:tc:SAML:attribute:subject-id' => 'subject-id',
'urn:oid:0.9.2342.19200300.100.1.1' => 'uid',
'urn:oid:0.9.2342.19200300.100.1.10' => 'manager',
'urn:oid:0.9.2342.19200300.100.1.11' => 'documentIdentifier',
Expand Down Expand Up @@ -104,6 +107,13 @@
'urn:oid:1.3.6.1.4.1.25178.1.2.19' => 'schacUserStatus',
'urn:oid:1.3.6.1.4.1.25178.1.2.20' => 'schacProjectMembership',
'urn:oid:1.3.6.1.4.1.25178.1.2.21' => 'schacProjectSpecificRole',
'urn:oid:1.3.6.1.4.1.25178.4.1.3' => 'voPersonCertificateDN',
'urn:oid:1.3.6.1.4.1.25178.4.1.4' => 'voPersonCertificateIssuerDN',
'urn:oid:1.3.6.1.4.1.25178.4.1.5' => 'voPersonExternalID',
'urn:oid:1.3.6.1.4.1.25178.4.1.6' => 'voPersonID',
'urn:oid:1.3.6.1.4.1.25178.4.1.11' => 'voPersonExternalAffiliation',
'urn:oid:1.3.6.1.4.1.25178.4.1.12' => 'voPersonScopedAffiliation',
'urn:oid:1.3.6.1.4.1.25178.4.1.14' => 'voPersonVerifiedEmail',
'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',
Expand Down
1 change: 1 addition & 0 deletions attributemap/oid2urn.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
'urn:oid:1.3.6.1.4.1.5923.1.1.1.11' => 'urn:mace:dir:attribute-def:eduPersonAssurance',
'urn:oid:1.3.6.1.4.1.5923.1.1.1.10' => 'urn:mace:dir:attribute-def:eduPersonTargetedID',
'urn:oid:1.3.6.1.4.1.5923.1.1.1.13' => 'urn:mace:dir:attribute-def:eduPersonUniqueId',
'urn:oid:1.3.6.1.4.1.5923.1.1.1.16' => 'urn:mace:dir:attribute-def:eduPersonOrcid',
'urn:oid:1.3.6.1.4.1.5923.1.1.1.2' => 'urn:mace:dir:attribute-def:eduPersonNickname',
'urn:oid:1.3.6.1.4.1.5923.1.1.1.3' => 'urn:mace:dir:attribute-def:eduPersonOrgDN',
'urn:oid:1.3.6.1.4.1.5923.1.1.1.4' => 'urn:mace:dir:attribute-def:eduPersonOrgUnitDN',
Expand Down
2 changes: 2 additions & 0 deletions attributemap/removeurnprefix.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
'urn:mace:dir:attribute-def:eduPersonAffiliation' => 'eduPersonAffiliation',
'urn:mace:dir:attribute-def:eduPersonScopedAffiliation' => 'eduPersonScopedAffiliation',
'urn:mace:dir:attribute-def:eduPersonEntitlement' => 'eduPersonEntitlement',
'urn:mace:dir:attribute-def:eduPersonOrcid' => 'eduPersonOrcid',
'urn:mace:dir:attribute-def:eduPersonOrgDN' => 'eduPersonOrgDN',
'urn:mace:dir:attribute-def:eduPersonOrgUnitDN' => 'eduPersonOrgUnitDN',
'urn:mace:dir:attribute-def:eduPersonUniqueId' => 'eduPersonUniqueId',
];
1 change: 1 addition & 0 deletions attributemap/urn2name.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
'urn:mace:dir:attribute-def:eduPersonAssurance' => 'eduPersonAssurance',
'urn:mace:dir:attribute-def:eduPersonEntitlement' => 'eduPersonEntitlement',
'urn:mace:dir:attribute-def:eduPersonNickname' => 'eduPersonNickname',
'urn:mace:dir:attribute-def:eduPersonOrcid' => 'eduPersonOrcid',
'urn:mace:dir:attribute-def:eduPersonOrgDN' => 'eduPersonOrgDN',
'urn:mace:dir:attribute-def:eduPersonOrgUnitDN' => 'eduPersonOrgUnitDN',
'urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation' => 'eduPersonPrimaryAffiliation',
Expand Down
1 change: 1 addition & 0 deletions attributemap/urn2oid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
'urn:mace:dir:attribute-def:eduPersonAssurance' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.11',
'urn:mace:dir:attribute-def:eduPersonEntitlement' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.7',
'urn:mace:dir:attribute-def:eduPersonNickname' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.2',
'urn:mace:dir:attribute-def:eduPersonOrcid' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.16',
'urn:mace:dir:attribute-def:eduPersonOrgDN' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.3',
'urn:mace:dir:attribute-def:eduPersonOrgUnitDN' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.4',
'urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.5',
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"ext-mbstring": "*",
"gettext/gettext": "^4.6",
"phpmailer/phpmailer": "^6.0",
"robrichards/xmlseclibs": "^3.0.4",
"robrichards/xmlseclibs": "^3.1.1",
"simplesamlphp/saml2": "^3.4 || ^4.0",
"simplesamlphp/simplesamlphp-module-adfs": "^0.9",
"simplesamlphp/simplesamlphp-module-authcrypt": "^0.9",
Expand Down
Loading