Minor - flint fixes

pull/2798/head
Julio Montoya 7 years ago
parent 83031035d0
commit bdfb2b1814
  1. 1
      main/lp/lp_list.php
  2. 2
      plugin/keycloak/metadata.php
  3. 31
      plugin/keycloak/settings.dist.php
  4. 20
      plugin/keycloak/start.php

@ -345,7 +345,6 @@ foreach ($categories as $item) {
);
}
if (!empty($options)) {
$icon = learnpath::getSelectedIconHtml($id);
if (!empty($icon)) {

@ -10,7 +10,7 @@ if (!$pluginKeycloak) {
}
/**
* SAML Metadata view
* SAML Metadata view.
*/
require_once 'settings.php';

@ -3,31 +3,30 @@
$spBaseUrl = api_get_path(WEB_PATH).'plugin/keycloak/';
$settingsInfo = array(
$settingsInfo = [
'strict' => false,
'debug' => true,
'sp' => array (
'sp' => [
'entityId' => $spBaseUrl.'metadata.php',
'assertionConsumerService' => array(
'assertionConsumerService' => [
'url' => $spBaseUrl.'start.php?acs',
),
'singleLogoutService' => array (
],
'singleLogoutService' => [
'url' => $spBaseUrl.'start.php?sls',
),
],
'NameIDFormat' => 'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified',
),
'idp' => array(
],
'idp' => [
'entityId' => '', // Example http://localhost:8080/auth/realms/master
'singleSignOnService' => array (
'singleSignOnService' => [
'url' => '', // example http://localhost:8080/auth/realms/master/protocol/saml
),
'singleLogoutService' => array (
],
'singleLogoutService' => [
'url' => '', // example http://localhost:8080/auth/realms/master/protocol/saml
),
],
'x509cert' => '',
),
);
],
];
// advanced settings
//
@ -145,4 +144,4 @@ $settingsInfo = array(
// 'displayname' => 'chamilo',
// 'url' => 'chamilo.org'
// ),
//),
//),

@ -3,8 +3,8 @@
use ChamiloSession as Session;
use OneLogin\Saml2\Auth;
use OneLogin\Saml2\Settings;
use OneLogin\Saml2\AuthnRequest;
use OneLogin\Saml2\Settings;
require_once '../../main/inc/global.inc.php';
@ -40,14 +40,14 @@ $idpData = $settings->getIdPData();
if (isset($_GET['sso'])) {
$auth->login();
# If AuthNRequest ID need to be saved in order to later validate it, do instead
// If AuthNRequest ID need to be saved in order to later validate it, do instead
/*$ssoBuiltUrl = $auth->login(null, [], false, false, true);
$_SESSION['AuthNRequestID'] = $auth->getLastRequestID();
header('Pragma: no-cache');
header('Cache-Control: no-cache, must-revalidate');
header('Location: ' . $ssoBuiltUrl);
exit();*/
} else if (isset($_GET['slo'])) {
} elseif (isset($_GET['slo'])) {
/*
if (isset($idpData['singleLogoutService']) && isset($idpData['singleLogoutService']['url'])) {
$sloUrl = $idpData['singleLogoutService']['url'];
@ -72,14 +72,14 @@ if (isset($_GET['sso'])) {
$nameIdFormat = Session::read('samlNameIdFormat');
$auth->logout($returnTo, $parameters, $nameId, $sessionIndex, false, $nameIdFormat);
# If LogoutRequest ID need to be saved in order to later validate it, do instead
// If LogoutRequest ID need to be saved in order to later validate it, do instead
// $sloBuiltUrl = $auth->logout(null, [], $nameId, $sessionIndex, true);
/*$_SESSION['LogoutRequestID'] = $auth->getLastRequestID();
header('Pragma: no-cache');
header('Cache-Control: no-cache, must-revalidate');
header('Location: ' . $sloBuiltUrl);
exit();*/
} else if (isset($_GET['acs'])) {
} elseif (isset($_GET['acs'])) {
$requestID = Session::read('AuthNRequestID');
$auth->processResponse($requestID);
$errors = $auth->getErrors();
@ -99,7 +99,6 @@ if (isset($_GET['sso'])) {
Session::write('samlSessionIndex', $auth->getSessionIndex());
Session::erase('AuthNRequestID');
$keyCloackUserName = Session::read('samlNameId');
$userInfo = api_get_user_info_from_username($keyCloackUserName);
@ -138,7 +137,7 @@ if (isset($_GET['sso'])) {
}
header('Location: '.api_get_path(WEB_PATH));
exit;
} else if (isset($_GET['sls'])) {
} elseif (isset($_GET['sls'])) {
$requestID = Session::read('LogoutRequestID');
$auth->processSLO(false, $requestID);
$errors = $auth->getErrors();
@ -170,9 +169,9 @@ if (isset($_SESSION['samlUserdata'])) {
$content .= 'You have the following attributes:<br>';
$content .= '<table class="table"><thead><th>Name</th><th>Values</th></thead><tbody>';
foreach ($attributes as $attributeName => $attributeValues) {
$content .= '<tr><td>' . htmlentities($attributeName) . '</td><td><ul>';
$content .= '<tr><td>'.htmlentities($attributeName).'</td><td><ul>';
foreach ($attributeValues as $attributeValue) {
$content .= '<li>' . htmlentities($attributeValue) . '</li>';
$content .= '<li>'.htmlentities($attributeValue).'</li>';
}
$content .= '</ul></td></tr>';
}
@ -181,7 +180,6 @@ if (isset($_SESSION['samlUserdata'])) {
$content .= "<p>You don't have any attribute</p>";
}
$content .= '<p><a href="?slo" >Logout</a></p>';
} else {
$content .= '<p><a href="?sso" >Login</a></p>';
@ -189,4 +187,4 @@ if (isset($_SESSION['samlUserdata'])) {
}
$template->assign('content', $content);
$template->display_one_col_template();
$template->display_one_col_template();

Loading…
Cancel
Save