Commit 5809da12 authored by dockx thibault's avatar dockx thibault
Browse files

Merge branch '6174-supannex-add-new-field-edupersonuniqueid-within-supannex-2' into '1.4-dev'

Resolve "[supannEx] - Add eduPersonUniqueId data to be archived"

Closes #6174

See merge request fusiondirectory/fd-plugins!921
parents 83abf17a 8116284c
......@@ -41,15 +41,7 @@ attributetype ( 1.3.6.1.4.1.38414.66.1.6 NAME 'fdSupannRelationEntite'
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} )
attributetype ( 1.3.6.1.4.1.5923.1.1.1.13
NAME 'eduPersonUniqueId'
DESC 'eduPersonUniqueId per Internet2'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX '1.3.6.1.4.1.1466.115.121.1.15' SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.66.1.7
NAME 'fdEduPersonUniqueIdDns'
attributetype ( 1.3.6.1.4.1.38414.66.1.7 NAME 'fdEduPersonUniqueIdDns'
DESC 'Helper for eduPersonUniqueId DNS'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
......@@ -62,6 +54,6 @@ objectclass (1.3.6.1.4.1.38414.66.2.1 NAME 'fdSupannExt' SUP top AUXILIARY
MAY (
fdSupannStartDate $ fdSupannEndDate $
fdSupannRelationEntiteType $ fdSupannRelationEntiteRole $ fdSupannRelationEntiteCode $
fdSupannRelationEntite $ eduPersonUniqueId $ fdEduPersonUniqueIdDns
fdSupannRelationEntite $ fdEduPersonUniqueIdDns
) )
......@@ -30,6 +30,7 @@ class supannPersonalExt extends simplePlugin
'plDescription' => _('SUPANN Non-Official Extension'),
'plObjectType' => ['user'],
'plObjectClass' => ['fdSupannExt'],
'plDepends' => ['supannAccount'],
'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
];
......@@ -78,6 +79,11 @@ class supannPersonalExt extends simplePlugin
]
);
//Allows the ID of once set to always remain set
if (!empty($this->attributesAccess['fdEduPersonUniqueIdDns']->getValue())) {
$this->attributesAccess['unique_ids']->setValue(TRUE);
}
if (empty($this->attributesAccess['eduPersonUniqueId']->getValue())) {
$this->aUniqueId = $this->generateUniqueUserId();
if (!$this->isUserUniqueIdExist($this->aUniqueId)) {
......
......@@ -80,20 +80,14 @@ attributetype ( 1.3.6.1.4.1.5923.1.1.1.11
EQUALITY caseIgnoreMatch
SYNTAX '1.3.6.1.4.1.1466.115.121.1.15' )
#### Classes :
objectclass ( 1.3.6.1.4.1.5923.1.1.2
NAME 'eduPerson'
AUXILIARY
MAY ( eduPersonAffiliation $ eduPersonNickname $
eduPersonOrgDN $ eduPersonOrgUnitDN $
eduPersonPrimaryAffiliation $ eduPersonPrincipalName $
eduPersonEntitlement $ eduPersonPrimaryOrgUnitDN $
eduPersonScopedAffiliation $ eduPersonTargetedID $ eduPersonAssurance ) )
attributetype ( 1.3.6.1.4.1.5923.1.1.1.13 NAME 'eduPersonUniqueId'
DESC 'eduPersonUniqueId per Internet2'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX '1.3.6.1.4.1.1466.115.121.1.15' SINGLE-VALUE )
# "eduOrg" attributes
#
attributetype ( 1.3.6.1.4.1.5923.1.2.1.2
NAME 'eduOrgHomePageURI'
DESC 'eduOrg per Internet2 and EDUCAUSE'
......@@ -124,15 +118,23 @@ attributetype ( 1.3.6.1.4.1.5923.1.2.1.6
EQUALITY caseExactMatch
SYNTAX '1.3.6.1.4.1.1466.115.121.1.15' )
#
#
# eduOrg objectclass definition
#
#
objectclass ( 1.3.6.1.4.1.5923.1.2.2
NAME 'eduOrg'
AUXILIARY
MAY ( cn $ eduOrgHomePageURI $
eduOrgIdentityAuthNPolicyURI $ eduOrgLegalName $
eduOrgSuperiorURI $ eduOrgWhitePagesURI ))
#### eduPerson objectclass definition
objectclass ( 1.3.6.1.4.1.5923.1.1.2
NAME 'eduPerson'
AUXILIARY
MAY ( eduPersonAffiliation $ eduPersonNickname $
eduPersonOrgDN $ eduPersonOrgUnitDN $
eduPersonPrimaryAffiliation $ eduPersonPrincipalName $
eduPersonEntitlement $ eduPersonPrimaryOrgUnitDN $ eduPersonUniqueId $
eduPersonScopedAffiliation $ eduPersonTargetedID $ eduPersonAssurance ) )
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment