Skip to content

Utils redirect returns a psr7 ResponseInterface #478

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
wants to merge 3 commits into
base: 4.0.0
Choose a base branch
from
Open

Utils redirect returns a psr7 ResponseInterface #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2645674
Replaced the internal redirect handling with a Psr7 response interfac…
May 24, 2021
4e3c3c6
Updated demo1 and demo2 on how to use this library with Psr7 interfaces.
May 24, 2021
7c19182
Removed return type hinting since we still have the return as string …
May 24, 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
1 change: 1 addition & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
},
"require": {
"php": ">=7.3",
"guzzlehttp/guzzle": "^7.3",
"robrichards/xmlseclibs": ">=3.1.1"
},
"require-dev": {
Expand Down
22 changes: 12 additions & 10 deletions demo1/attrs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
<?php

session_start();

$html = '';
if (isset($_SESSION['samlUserdata'])) {
if (!empty($_SESSION['samlUserdata'])) {
$attributes = $_SESSION['samlUserdata'];
echo 'You have the following attributes:<br>';
echo '<table><thead><th>Name</th><th>Values</th></thead><tbody>';
$html .= 'You have the following attributes:<br>';
$html .= '<table><thead><th>Name</th><th>Values</th></thead><tbody>';
foreach ($attributes as $attributeName => $attributeValues) {
echo '<tr><td>' . htmlentities($attributeName) . '</td><td><ul>';
$html .= '<tr><td>' . htmlentities($attributeName) . '</td><td><ul>';
foreach ($attributeValues as $attributeValue) {
echo '<li>' . htmlentities($attributeValue) . '</li>';
$html .= '<li>' . htmlentities($attributeValue) . '</li>';
}
echo '</ul></td></tr>';
$html .= '</ul></td></tr>';
}
echo '</tbody></table>';
$html .= '</tbody></table>';
} else {
echo "<p>You don't have any attribute</p>";
$html .= "<p>You don't have any attribute</p>";
}

echo '<p><a href="index.php?slo" >Logout</a></p>';
$html .= '<p><a href="index.php?slo" >Logout</a></p>';
} else {
echo '<p><a href="index.php?sso2" >Login and access later to this page</a></p>';
$html .= '<p><a href="index.php?sso2" >Login and access later to this page</a></p>';
}

return new \GuzzleHttp\Psr7\Response(200, [], $html);
69 changes: 38 additions & 31 deletions demo1/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,25 @@

$auth = new Auth($settingsInfo);

if (isset($_GET['sso'])) {
$auth->login();
/** @var \GuzzleHttp\Psr7\ServerRequest $request */
$request = \GuzzleHttp\Psr7\ServerRequest::fromGlobals();

if (isset($request->getQueryParams()['sso'])) {
return $auth->login();
# If AuthNRequest ID need to be saved in order to later validate it, do instead
# $ssoBuiltUrl = $auth->login(null, array(), false, false, true);
# $_SESSION['AuthNRequestID'] = $auth->getLastRequestID();
# header('Pragma: no-cache');
# header('Cache-Control: no-cache, must-revalidate');
# header('Location: ' . $ssoBuiltUrl);
# exit();
# return new \GuzzleHttp\Psr7\Response(302, [
# 'Pragma' => 'no-cache',
# 'Cache-Control' => 'no-cache, must-revalidate',
# 'location' => [(string) $ssoBuiltUrl]
#]);

} else if (isset($_GET['sso2'])) {

} else if (isset($request->getQueryParams()['sso2'])) {
$returnTo = $spBaseUrl.'/demo1/attrs.php';
$auth->login($returnTo);
} else if (isset($_GET['slo'])) {
return $auth->login($returnTo);
} else if (isset($request->getQueryParams()['slo'])) {
$returnTo = null;
$paramters = array();
$nameId = null;
Expand All @@ -54,7 +58,7 @@
$sessionIndex = $_SESSION['samlSessionIndex'];
}

$auth->logout($returnTo, $paramters, $nameId, $sessionIndex, false, $nameIdFormat, $nameIdNameQualifier, $nameIdSPNameQualifier);
return $auth->logout($returnTo, $paramters, $nameId, $sessionIndex, false, $nameIdFormat, $nameIdNameQualifier, $nameIdSPNameQualifier);

# If LogoutRequest ID need to be saved in order to later validate it, do instead
# $sloBuiltUrl = $auth->logout(null, $paramters, $nameId, $sessionIndex, true);
Expand All @@ -64,7 +68,7 @@
# header('Location: ' . $sloBuiltUrl);
# exit();

} else if (isset($_GET['acs'])) {
} else if (isset($request->getQueryParams()['acs'])) {
if (isset($_SESSION) && isset($_SESSION['AuthNRequestID'])) {
$requestID = $_SESSION['AuthNRequestID'];
} else {
Expand All @@ -76,15 +80,15 @@
$errors = $auth->getErrors();

if (!empty($errors)) {
echo '<p>' . implode(', ', $errors) . '</p>';
$html = '<p>' . implode(', ', $errors) . '</p>';
if ($auth->getSettings()->isDebugActive()) {
echo '<p>'.$auth->getLastErrorReason().'</p>';
$html .= '<p>'.$auth->getLastErrorReason().'</p>';
}
return new \GuzzleHttp\Psr7\Response(500, [], $html);
}

if (!$auth->isAuthenticated()) {
echo '<p>Not authenticated</p>';
exit();
return new \GuzzleHttp\Psr7\Response(401, [], '<p>Not authenticated</p>');
}

$_SESSION['samlUserdata'] = $auth->getAttributes();
Expand All @@ -95,10 +99,11 @@
$_SESSION['samlSessionIndex'] = $auth->getSessionIndex();

unset($_SESSION['AuthNRequestID']);
if (isset($_POST['RelayState']) && Utils::getSelfURL() != $_POST['RelayState']) {
$auth->redirectTo($_POST['RelayState']);
$relayState = $request->getParsedBody()['RelayState'] ?? null;
if ($relayState !== null && Utils::getSelfURL() !== $relayState) {
return $auth->redirectTo($relayState);
}
} else if (isset($_GET['sls'])) {
} else if (isset($request->getQueryParams()['sls'])) {
if (isset($_SESSION) && isset($_SESSION['LogoutRequestID'])) {
$requestID = $_SESSION['LogoutRequestID'];
} else {
Expand All @@ -108,34 +113,36 @@
$auth->processSLO(false, $requestID);
$errors = $auth->getErrors();
if (empty($errors)) {
echo '<p>Sucessfully logged out</p>';
$html = '<p>Sucessfully logged out</p>';
} else {
echo '<p>' . implode(', ', $errors) . '</p>';
$html = '<p>' . implode(', ', $errors) . '</p>';
if ($auth->getSettings()->isDebugActive()) {
echo '<p>'.$auth->getLastErrorReason().'</p>';
$html .= '<p>'.$auth->getLastErrorReason().'</p>';
}
}
}

if (isset($_SESSION['samlUserdata'])) {
if (!empty($_SESSION['samlUserdata'])) {
$attributes = $_SESSION['samlUserdata'];
echo 'You have the following attributes:<br>';
echo '<table><thead><th>Name</th><th>Values</th></thead><tbody>';
$html .= 'You have the following attributes:<br>';
$html .= '<table><thead><th>Name</th><th>Values</th></thead><tbody>';
foreach ($attributes as $attributeName => $attributeValues) {
echo '<tr><td>' . htmlentities($attributeName) . '</td><td><ul>';
$html .= '<tr><td>' . htmlentities($attributeName) . '</td><td><ul>';
foreach ($attributeValues as $attributeValue) {
echo '<li>' . htmlentities($attributeValue) . '</li>';
$html .= '<li>' . htmlentities($attributeValue) . '</li>';
}
echo '</ul></td></tr>';
$html .= '</ul></td></tr>';
}
echo '</tbody></table>';
$html .= '</tbody></table>';
} else {
echo "<p>You don't have any attribute</p>";
$html .= "<p>You don't have any attribute</p>";
}

echo '<p><a href="?slo" >Logout</a></p>';
$html .= '<p><a href="?slo" >Logout</a></p>';
} else {
echo '<p><a href="?sso" >Login</a></p>';
echo '<p><a href="?sso2" >Login and access to attrs.php page</a></p>';
$html .= '<p><a href="?sso" >Login</a></p>';
$html .= '<p><a href="?sso2" >Login and access to attrs.php page</a></p>';
}

return new \GuzzleHttp\Psr7\Response(200, [], $html);
5 changes: 2 additions & 3 deletions demo1/metadata.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,13 @@
$metadata = $settings->getSPMetadata();
$errors = $settings->validateMetadata($metadata);
if (empty($errors)) {
header('Content-Type: text/xml');
echo $metadata;
return new \GuzzleHttp\Psr7\Response(500, ['Content-Type', 'text/xml'], $metadata);
} else {
throw new Error(
'Invalid SP metadata: '.implode(', ', $errors),
Error::METADATA_SP_INVALID
);
}
} catch (Exception $e) {
echo $e->getMessage();
return new \GuzzleHttp\Psr7\Response(500, [], $e->getMessage());
}
29 changes: 17 additions & 12 deletions demo2/consume.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,36 @@
use OneLogin\Saml2\Response;
use OneLogin\Saml2\Settings;

/** @var \GuzzleHttp\Psr7\ServerRequest $request */
$request = \GuzzleHttp\Psr7\ServerRequest::fromGlobals();
$html = '';

try {
if (isset($_POST['SAMLResponse'])) {
if (isset($request->getParsedBody()['SAMLResponse'])) {
$samlSettings = new Settings();
$samlResponse = new Response($samlSettings, $_POST['SAMLResponse']);
$samlResponse = new Response($samlSettings, $request->getParsedBody()['SAMLResponse']);
if ($samlResponse->isValid()) {
echo 'You are: ' . $samlResponse->getNameId() . '<br>';
$html .= 'You are: ' . $samlResponse->getNameId() . '<br>';
$attributes = $samlResponse->getAttributes();
if (!empty($attributes)) {
echo 'You have the following attributes:<br>';
echo '<table><thead><th>Name</th><th>Values</th></thead><tbody>';
$html .= 'You have the following attributes:<br>';
$html .= '<table><thead><th>Name</th><th>Values</th></thead><tbody>';
foreach ($attributes as $attributeName => $attributeValues) {
echo '<tr><td>' . htmlentities($attributeName) . '</td><td><ul>';
$html .= '<tr><td>' . htmlentities($attributeName) . '</td><td><ul>';
foreach ($attributeValues as $attributeValue) {
echo '<li>' . htmlentities($attributeValue) . '</li>';
$html .= '<li>' . htmlentities($attributeValue) . '</li>';
}
echo '</ul></td></tr>';
$html .= '</ul></td></tr>';
}
echo '</tbody></table>';
$html .= '</tbody></table>';
}
} else {
echo 'Invalid SAML Response';
$html .= 'Invalid SAML Response';
}
} else {
echo 'No SAML Response found in POST.';
$html .= 'No SAML Response found in POST.';
}
return new \GuzzleHttp\Psr7\Response(200, [], 'Invalid SAML Response: ' . $html);
} catch (Exception $e) {
echo 'Invalid SAML Response: ' . $e->getMessage();
return new \GuzzleHttp\Psr7\Response(400, [], 'Invalid SAML Response: ' . $e->getMessage());
}
28 changes: 16 additions & 12 deletions demo2/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
use OneLogin\Saml2\Settings;
use OneLogin\Saml2\Utils;

/** @var \GuzzleHttp\Psr7\ServerRequest $request */
$request = \GuzzleHttp\Psr7\ServerRequest::fromGlobals();

if (!isset($_SESSION['samlUserdata'])) {
$settings = new Settings();
$authRequest = new AuthnRequest($settings);
Expand All @@ -26,27 +29,28 @@

$idpData = $settings->getIdPData();
$ssoUrl = $idpData['singleSignOnService']['url'];
$url = Utils::redirect($ssoUrl, $parameters, true);

header("Location: $url");
return Utils::redirect($ssoUrl, $parameters);
} else {
$html = '';
if (!empty($_SESSION['samlUserdata'])) {
$attributes = $_SESSION['samlUserdata'];
echo 'You have the following attributes:<br>';
echo '<table><thead><th>Name</th><th>Values</th></thead><tbody>';
$html .= 'You have the following attributes:<br>';
$html .= '<table><thead><th>Name</th><th>Values</th></thead><tbody>';
foreach ($attributes as $attributeName => $attributeValues) {
echo '<tr><td>' . htmlentities($attributeName) . '</td><td><ul>';
$html .= '<tr><td>' . htmlentities($attributeName) . '</td><td><ul>';
foreach ($attributeValues as $attributeValue) {
echo '<li>' . htmlentities($attributeValue) . '</li>';
$html .= '<li>' . htmlentities($attributeValue) . '</li>';
}
echo '</ul></td></tr>';
$html .= '</ul></td></tr>';
}
echo '</tbody></table>';
$html .= '</tbody></table>';
if (!empty($_SESSION['IdPSessionIndex'])) {
echo '<p>The SessionIndex of the IdP is: '.$_SESSION['IdPSessionIndex'].'</p>';
$html .= '<p>The SessionIndex of the IdP is: '.$_SESSION['IdPSessionIndex'].'</p>';
}
} else {
echo "<p>You don't have any attribute</p>";
$html .= "<p>You don't have any attribute</p>";
}
echo '<p><a href="slo.php">Logout</a></p>';
$html .= '<p><a href="slo.php">Logout</a></p>';

return new \GuzzleHttp\Psr7\Response(200, [], $html);
}
5 changes: 2 additions & 3 deletions demo2/metadata.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@
use OneLogin\Saml2\Metadata;
use OneLogin\Saml2\Settings;

header('Content-Type: text/xml');

$samlSettings = new Settings();
$sp = $samlSettings->getSPData();

$samlMetadata = Metadata::builder($sp);
echo $samlMetadata;

return new \GuzzleHttp\Psr7\Response(200, ['Content-Type' => 'text/xml'], $samlMetadata);
7 changes: 4 additions & 3 deletions demo2/slo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
use OneLogin\Saml2\Settings;
use OneLogin\Saml2\Utils;

/** @var \GuzzleHttp\Psr7\ServerRequest $request */
$request = \GuzzleHttp\Psr7\ServerRequest::fromGlobals();

$samlSettings = new Settings();

$idpData = $samlSettings->getIdPData();
Expand All @@ -33,6 +36,4 @@

$parameters = array('SAMLRequest' => $samlRequest);

$url = Utils::redirect($sloUrl, $parameters, true);

header("Location: $url");
return Utils::redirect($sloUrl, $parameters);
4 changes: 2 additions & 2 deletions demo2/sso.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
$auth = new OneLogin\Saml2\Auth();

if (!isset($_SESSION['samlUserdata'])) {
$auth->login();
return $auth->login();
} else {
$indexUrl = str_replace('/sso.php', '/index.php', Utils::getSelfURLNoQuery());
Utils::redirect($indexUrl);
return Utils::redirect($indexUrl);
}
Loading