DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Removed unnecessary default saml settings

Browse source
This commit is contained in:
Johnson Yi 2020-05-09 01:51:48 +10:00
parent c1c37d521c
commit 3d8fce50d0
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
app/Services/Saml.php
View file

@ -158,8 +158,6 @@ class Saml
data_set($settings, 'sp.singleLogoutService.url', route('saml.sls')); data_set($settings, 'sp.singleLogoutService.url', route('saml.sls'));
data_set($settings, 'sp.x509cert', $setting->saml_sp_x509cert); data_set($settings, 'sp.x509cert', $setting->saml_sp_x509cert);
data_set($settings, 'sp.privateKey', $setting->saml_sp_privatekey); data_set($settings, 'sp.privateKey', $setting->saml_sp_privatekey);
data_set($settings, 'security.wantAssertionsSigned', true);
data_set($settings, 'security.requestedAuthnContext', false);
if (!empty(data_get($settings, 'sp.privateKey'))) { if (!empty(data_get($settings, 'sp.privateKey'))) {
data_set($settings, 'security.logoutRequestSigned', true); data_set($settings, 'security.logoutRequestSigned', true);
@ -167,31 +165,33 @@ class Saml
} }
$idpMetadata = $setting->saml_idp_metadata; $idpMetadata = $setting->saml_idp_metadata;
$updatedAt = $setting->updated_at->timestamp; if (!empty($idpMetadata)) {
$metadataCache = Cache::get('saml_idp_metadata_cache'); $updatedAt = $setting->updated_at->timestamp;
try { $metadataCache = Cache::get('saml_idp_metadata_cache');
$url = null; try {
$metadataInfo = null; $url = null;
$metadataInfo = null;
if (empty($metadataCache) || $metadataCache['updated_at'] != $updatedAt) { if (empty($metadataCache) || $metadataCache['updated_at'] != $updatedAt) {
if (filter_var($idpMetadata, FILTER_VALIDATE_URL)) { if (filter_var($idpMetadata, FILTER_VALIDATE_URL)) {
$url = $idpMetadata; $url = $idpMetadata;
$metadataInfo = OneLogin_Saml2_IdPMetadataParser::parseRemoteXML($idpMetadata); $metadataInfo = OneLogin_Saml2_IdPMetadataParser::parseRemoteXML($idpMetadata);
} else {
$metadataInfo = OneLogin_Saml2_IdPMetadataParser::parseXML($idpMetadata);
}
Cache::put('saml_idp_metadata_cache', [
'updated_at' => $updatedAt,
'url' => $url,
'metadata_info' => $metadataInfo,
]);
} else { } else {
$metadataInfo = OneLogin_Saml2_IdPMetadataParser::parseXML($idpMetadata); $metadataInfo = $metadataCache['metadata_info'];
} }
Cache::put('saml_idp_metadata_cache', [ $settings = OneLogin_Saml2_IdPMetadataParser::injectIntoSettings($settings, $metadataInfo);
'updated_at' => $updatedAt, } catch (Exception $e) {
'url' => $url,
'metadata_info' => $metadataInfo,
], 604800);
} else {
$metadataInfo = $metadataCache['metadata_info'];
} }
$settings = OneLogin_Saml2_IdPMetadataParser::injectIntoSettings($settings, $metadataInfo);
} catch (Exception $e) {
} }
$custom_settings = preg_split('/\r\n|\r|\n/', $setting->saml_custom_settings); $custom_settings = preg_split('/\r\n|\r|\n/', $setting->saml_custom_settings);