Skip to content
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

Fix session key handling #24

Closed
wants to merge 4 commits into from
Closed

Fix session key handling #24

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f78ee1d
[FIX] Move username check to a place where it makes sense
stucki Oct 12, 2017
f9e9b35
[TASK] Improve Shibboleth session key extraction
stucki Oct 12, 2017
3191d75
[TASK] Stop Shibboleth session key search after first match
stucki Oct 12, 2017
2e49d04
[CLEANUP] Remove unused code
stucki Oct 12, 2017
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
67 changes: 39 additions & 28 deletions Classes/ShibbolethAuthentificationService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,24 +122,33 @@ function init() {
$posOfShibInKey = strpos($serverEnvKey,'Shib');
if ($posOfShibInKey !== FALSE && $posOfShibInKey < $shortestPrefixLength) {
$shortestPrefixLength = $posOfShibInKey;
$this->envShibPrefix = substr($serverEnvKey, 0, $posOfShibInKey);
$this->hasShibbolethSession = TRUE;
$separationChar = substr($serverEnvKey, $posOfShibInKey+4,1);
$this->shibSessionIdKey = $this->envShibPrefix . 'Shib'.$separationChar.'Session'.$separationChar.'ID';
$this->shibApplicationIdKey = $this->envShibPrefix . 'Shib'.$separationChar.'Application'.$separationChar.'ID';
}
}
/*
// Another chance to detect Shibboleth session present; just for safety, as code before not well tested at the moment
if (!$this->hasShibbolethSession && isset($_SERVER['AUTH_TYPE']) && $_SERVER['AUTH_TYPE'] == 'shibboleth') {
if (isset($_SERVER['Shib_Session_ID']) && $_SERVER['Shib_Session_ID'] != '') {
$this->hasShibbolethSession = TRUE;
$this->envShibPrefix = '';
$this->shibSessionIdKey = 'Shib_Session_ID';
$this->shibApplicationIdKey = 'Shib_Application_ID';
$shibKey = substr($serverEnvKey, $posOfShibInKey);
switch($shibKey) {
case 'Shib_Application_ID':
case 'Shib_Session_ID':
$shibApplicationIdKey = 'Shib_Application_ID';
$shibSessionIdKey = 'Shib_Session_ID';
break;
case 'Shib-Application-ID':
case 'Shib-Session-ID':
$shibApplicationIdKey = 'Shib-Application-ID';
$shibSessionIdKey = 'Shib-Session-ID';
break;
default:
// Ignore any other keys, e.g. Shib-Identity-Provider
}

if ($shibSessionIdKey) {
$this->envShibPrefix = substr($serverEnvKey, 0, $posOfShibInKey);
$this->shibApplicationIdKey = $this->envShibPrefix . $shibApplicationIdKey;
$this->shibSessionIdKey = $this->envShibPrefix . $shibSessionIdKey;
$this->hasShibbolethSession = TRUE;

// Stop the search when a key was found
break;
}
}
}
*/

return $available;
}
Expand Down Expand Up @@ -237,18 +246,6 @@ function getUser() {
return false;
}

if ($user[$this->db_user['username_column']] == '') {
if($this->writeDevLog)
GeneralUtility::devlog(
$this->mode.': Username is empty string. Never do this!',
'shibboleth',
3,
$this->shibboleth_extConf[$this->authInfo['loginType'].'_autoImport']
);
$this->logoffPresentUser();
return FALSE;
}

if($this->writeDevLog) GeneralUtility::devlog('getUser: offering $user for authentication','shibboleth',0,$user);

if (!$isAlreadyThere) {
Expand Down Expand Up @@ -307,6 +304,20 @@ function authUser(&$user) {
// We now can auto-import; we won't be in authUser, if getUser didn't detect auto-import configuration.
$user['uid'] = $userhandler->synchronizeUserData($user);
if($this->writeDevLog) GeneralUtility::devlog('authUser: after insert/update DB $uid=' . $user['uid'] . '; ($user attached).','shibboleth',0,$user);

if ($user[$this->db_user['username_column']] == '') {
if($this->writeDevLog) {
GeneralUtility::devlog(
$this->mode.': Username is empty string. Never do this!',
'shibboleth',
3,
$this->shibboleth_extConf[$this->authInfo['loginType'].'_autoImport']
);
}
$this->logoffPresentUser();
return false;
}

if ((! $user['disable']) AND ($user['uid']>0)) return 200;
if (defined('TYPO3_MODE') AND (TYPO3_MODE == 'BE') AND ($user['disable'])) {
if ($this->writeDevLog) GeneralUtility::devLog('authUser: user created/exists, but is in state "disable"','shibboleth',2,$user);
Expand Down