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

6
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,6 +165,7 @@ class Saml
} }
$idpMetadata = $setting->saml_idp_metadata; $idpMetadata = $setting->saml_idp_metadata;
if (!empty($idpMetadata)) {
$updatedAt = $setting->updated_at->timestamp; $updatedAt = $setting->updated_at->timestamp;
$metadataCache = Cache::get('saml_idp_metadata_cache'); $metadataCache = Cache::get('saml_idp_metadata_cache');
try { try {
@ -185,7 +184,7 @@ class Saml
'updated_at' => $updatedAt, 'updated_at' => $updatedAt,
'url' => $url, 'url' => $url,
'metadata_info' => $metadataInfo, 'metadata_info' => $metadataInfo,
], 604800); ]);
} else { } else {
$metadataInfo = $metadataCache['metadata_info']; $metadataInfo = $metadataCache['metadata_info'];
} }
@ -193,6 +192,7 @@ class Saml
$settings = OneLogin_Saml2_IdPMetadataParser::injectIntoSettings($settings, $metadataInfo); $settings = OneLogin_Saml2_IdPMetadataParser::injectIntoSettings($settings, $metadataInfo);
} catch (Exception $e) { } 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);
if ($custom_settings){ if ($custom_settings){