Skip to content

Commit

Permalink
Merge branch 'master' of github.com:cilogon/service-lib into CIL-540
Browse files Browse the repository at this point in the history 
Conflicts:
	src/Service/Util.php
  • Loading branch information
@terrencegf
terrencegf committed Mar 19, 2020
2 parents 0d68785 + 5b4d639 commit ae3413d
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 30 deletions.
25 changes: 13 additions & 12 deletions src/Service/DBService.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -445,9 +445,9 @@ public function clearClient()
* For more than 1 parameter, parameters can include:
* $remote_user, $idp, $idp_display_name,
* $first_name, $last_name, $display_name, $email,
* $eppn, $eptid, $openid, $oidc, $affiliation,
* $eppn, $eptid, $openid, $oidc,
* $subject_id, $pairwise_id, $affiliation,
* $ou, $member_of, $acr, $entitlement, $itrustuin
* $subject_id, $pairwise_id
*
* @return bool True if the servlet returned correctly. Else false.
*/
Expand All @@ -463,15 +463,16 @@ public function getUser(...$args)
} elseif ($numargs > 1) {
$params = array('remote_user', 'idp', 'idp_display_name',
'first_name', 'last_name', 'display_name', 'email',
'eppn', 'eptid', 'open_id', 'oidc', 'affiliation',
'ou', 'member_of', 'acr', 'entitlement',
'itrustuin', 'subject_id', 'pairwise_id');
'eppn', 'eptid', 'open_id', 'oidc',
'subject_id', 'pairwise_id',
'affiliation', 'ou', 'member_of', 'acr',
'entitlement', 'itrustuin');
$cmd = 'action=getUser';
$attr_arr = array();
for ($i = 0; $i < $numargs; $i++) {
$arg = $args[$i];
if (strlen($arg) > 0) {
if ($i >= 13) {
if ($i >= 15) {
// Put params after $ou into JSON object
$attr_arr[$params[$i]] = $arg;
} else {
Expand Down Expand Up @@ -810,6 +811,12 @@ public function call($params)
if (preg_match('/oidc=([^\r\n]+)/', $output, $match)) {
$this->oidc = urldecode($match[1]);
}
if (preg_match('/subject_id=([^\r\n]+)/', $output, $match)) {
$this->subject_id = urldecode($match[1]);
}
if (preg_match('/pairwise_id=([^\r\n]+)/', $output, $match)) {
$this->pairwise_id = urldecode($match[1]);
}
if (preg_match('/affiliation=([^\r\n]+)/', $output, $match)) {
$this->affiliation = urldecode($match[1]);
}
Expand Down Expand Up @@ -879,12 +886,6 @@ public function call($params)
if (isset($attr_arr['itrustuin'])) {
$this->itrustuin = $attr_arr['itrustuin'];
}
if (isset($attr_arr['subject_id'])) {
$this->subject_id = $attr_arr['subject_id'];
}
if (isset($attr_arr['pairwise_id'])) {
$this->pairwise_id = $attr_arr['pairwise_id'];
}
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/Service/Loggit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,10 @@ public function info($message, $missing = false, $level = PEAR_LOG_INFO)

if ($missing) { // Output any important missing user session vars
$uservars = array('ePPN', 'ePTID', 'openidID', 'oidcID',
'subjectID', 'pairwiseID',
'firstname', 'lastname', 'displayname', 'emailaddr',
'affiliation', 'ou', 'memberof', 'acr', 'entitlement',
'itrustuin', 'subjectID', 'pairwiseID');
'itrustuin');
foreach ($uservars as $uv) {
if (!isset($_SESSION[$uv])) {
$envstr .= $uv . '="MISSING" ';
Expand Down
34 changes: 17 additions & 17 deletions src/Service/Util.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -557,15 +557,15 @@ public static function sendErrorAlert(
'ePTID' => 'ePTID',
'openID' => 'OpenID ID',
'oidcID' => 'OIDC ID',
'subjectID' => 'Subject ID',
'pairwiseID' => 'Pairwise ID',
'loa' => 'LOA',
'affiliation' => 'Affiliation',
'ou' => 'OU',
'memberof' => 'MemberOf',
'acr' => 'AuthnContextClassRef',
'entitlement' => 'Entitlement',
'itrustuin' => 'iTrustUIN',
'subjectID' => 'Subject ID',
'pairwiseID' => 'Pairwise ID',
'cilogon_skin' => 'Skin Name',
'authntime' => 'Authn Time'
);
Expand Down Expand Up @@ -705,14 +705,14 @@ public static function getAuthzIdP($url)
* ePTID - User's ePTID (for SAML IdPs)
* openidID - User's OpenID 2.0 Identifier (Google deprecated)
* oidcID - User's OpenID Connect Identifier
* subjectID - User's university subject identifier
* pairwiseID - User's university pairwise identifier
* affiliation - User's affiliation
* ou - User's organizational unit (OU)
* memberof - User's isMemberOf group info
* acr - Authentication Context Class Ref
* entitlement - User's entitlement
* itrustuin - User's univerity ID number
* subjectID - User's university subject identifier
* pairwiseID - User's university pairwise identifier
*/
public static function saveUserToDataStore(...$args)
{
Expand All @@ -735,14 +735,14 @@ public static function saveUserToDataStore(...$args)
$ePTID = static::getSessionVar('ePTID');
$openidID = static::getSessionVar('openidID');
$oidcID = static::getSessionVar('oidcID');
$subjectID = static::getSessionVar('subjectID');
$pairwiseID = static::getSessionVar('pairwiseID');
$affiliation = static::getSessionVar('affiliation');
$ou = static::getSessionVar('ou');
$memberof = static::getSessionVar('memberof');
$acr = static::getSessionVar('acr');
$entitlement = static::getSessionVar('entitlement');
$itrustuin = static::getSessionVar('itrustuin');
$subjectID = static::getSessionVar('subjectID');
$pairwiseID = static::getSessionVar('pairwiseID');

// For the new Google OAuth 2.0 endpoint, we want to keep the
// old Google OpenID endpoint URL in the database (so user does
Expand Down Expand Up @@ -775,14 +775,14 @@ public static function saveUserToDataStore(...$args)
$ePTID,
$openidID,
$oidcID,
$subjectID,
$pairwiseID,
$affiliation,
$ou,
$memberof,
$acr,
$entitlement,
$itrustuin,
$subjectID,
$pairwiseID
$itrustuin
);
static::setSessionVar('uid', $dbs->user_uid);
static::setSessionVar('dn', $dbs->distinguished_name);
Expand Down Expand Up @@ -854,6 +854,10 @@ public static function saveUserToDataStore(...$args)
$openidID : '<MISSING>') . "\n" .
'OIDC ID = ' . ((strlen($oidcID) > 0) ?
$oidcID : '<MISSING>') . "\n" .
'Subject ID = ' . ((strlen($subjectID) > 0) ?
$subjectID : '<MISSING>') . "\n" .
'Pairwise ID = ' . ((strlen($pairwiseID) > 0) ?
$pairwiseID : '<MISSING>') . "\n" .
'Affiliation = ' . ((strlen($affiliation) > 0) ?
$affiliation : '<MISSING>') . "\n" .
'OU = ' . ((strlen($ou) > 0) ?
Expand All @@ -866,10 +870,6 @@ public static function saveUserToDataStore(...$args)
$entitlement : '<MISSING>') . "\n" .
'iTrustUIN = ' . ((strlen($itrustuin) > 0) ?
$itrustuin : '<MISSING>') . "\n" .
'Subject ID = ' . ((strlen($subjectID) > 0) ?
$subjectID : '<MISSING>') . "\n" .
'Pairwise ID = ' . ((strlen($pairwiseID) > 0) ?
$pairwiseID : '<MISSING>') . "\n" .
'Database UID = ' . ((strlen(
$i = static::getSessionVar('uid')
) > 0) ? $i : '<MISSING>') . "\n" .
Expand Down Expand Up @@ -900,9 +900,9 @@ public static function setUserAttributeSessionVars(...$args)
$attrs = array('remoteuser', 'idp', 'idpname', 'firstname',
'lastname', 'displayname', 'emailaddr',
'loa', 'ePPN', 'ePTID', 'openidID', 'oidcID',
'subjectID', 'pairwiseID',
'affiliation', 'ou', 'memberof', 'acr',
'entitlement', 'itrustuin', 'subjectID',
'pairwiseID');
'entitlement', 'itrustuin');
$numargs = count($args);
for ($i = 0; $i < $numargs; $i++) {
static::setSessionVar($attrs[$i], $args[$i]);
Expand Down Expand Up @@ -970,14 +970,14 @@ public static function unsetUserSessionVars()
static::unsetSessionVar('ePTID');
static::unsetSessionVar('openidID');
static::unsetSessionVar('oidcID');
static::unsetSessionVar('subjectID');
static::unsetSessionVar('pairwiseID');
static::unsetSessionVar('affiliation');
static::unsetSessionVar('ou');
static::unsetSessionVar('memberof');
static::unsetSessionVar('acr');
static::unsetSessionVar('entitlement');
static::unsetSessionVar('itrustuin');
static::unsetSessionVar('subjectID');
static::unsetSessionVar('pairwiseID');

// Current skin
static::unsetSessionVar('cilogon_skin');
Expand Down

0 comments on commit ae3413d

Please sign in to comment.