From 4b967213939da2948edd7c68a8f500ecec75f6d6 Mon Sep 17 00:00:00 2001 From: Brady Wetherington Date: Tue, 13 Aug 2024 14:55:13 +0100 Subject: [PATCH 1/5] Attempt to de-escalate SAML login and logout errors --- app/Http/Controllers/Auth/SamlController.php | 28 ++++++++++++++------ app/Services/Saml.php | 6 ++--- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/Auth/SamlController.php b/app/Http/Controllers/Auth/SamlController.php index 769f90349..6a4c1f65b 100644 --- a/app/Http/Controllers/Auth/SamlController.php +++ b/app/Http/Controllers/Auth/SamlController.php @@ -99,12 +99,18 @@ class SamlController extends Controller { $saml = $this->saml; $auth = $saml->getAuth(); - $auth->processResponse(); + $saml_exception = false; + try { + $auth->processResponse(); + } catch (\Exception $e) { + Log::warning("Exception caught in SAML login: " . $e->getMessage()); + $saml_exception = true; + } $errors = $auth->getErrors(); - if (! empty($errors)) { - Log::error('There was an error with SAML ACS: '.implode(', ', $errors)); - Log::error('Reason: '.$auth->getLastErrorReason()); + if (!empty($errors) || $saml_exception) { + Log::warning('There was an error with SAML ACS: ' . implode(', ', $errors)); + Log::warning('Reason: ' . $auth->getLastErrorReason()); return redirect()->route('login')->with('error', trans('auth/message.signin.error')); } @@ -132,12 +138,18 @@ class SamlController extends Controller { $auth = $this->saml->getAuth(); $retrieveParametersFromServer = $this->saml->getSetting('retrieveParametersFromServer', false); - $sloUrl = $auth->processSLO(true, null, $retrieveParametersFromServer, null, true); + $saml_exception = false; + try { + $sloUrl = $auth->processSLO(true, null, $retrieveParametersFromServer, null, true); + } catch (\Exception $e) { + Log::warning("Exception caught in SAML single-logout: " . $e->getMessage()); + $saml_exception = true; + } $errors = $auth->getErrors(); - if (! empty($errors)) { - Log::error('There was an error with SAML SLS: '.implode(', ', $errors)); - Log::error('Reason: '.$auth->getLastErrorReason()); + if (!empty($errors) || $saml_exception) { + Log::warning('There was an error with SAML SLS: ' . implode(', ', $errors)); + Log::warning('Reason: ' . $auth->getLastErrorReason()); return view('errors.403'); } diff --git a/app/Services/Saml.php b/app/Services/Saml.php index 820286801..7ee60233e 100644 --- a/app/Services/Saml.php +++ b/app/Services/Saml.php @@ -337,12 +337,12 @@ class Saml /** * Get a setting. * - * @author Johnson Yi - * * @param string|array|int $key * @param mixed $default * - * @return void + * @return mixed + *@author Johnson Yi + * */ public function getSetting($key, $default = null) { From 10f35c682b3c21497801dd32c72f5d6bd1ccaa6a Mon Sep 17 00:00:00 2001 From: Brady Wetherington Date: Tue, 13 Aug 2024 15:49:51 +0100 Subject: [PATCH 2/5] Re-add space --- app/Services/Saml.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/Saml.php b/app/Services/Saml.php index 7ee60233e..860ec7617 100644 --- a/app/Services/Saml.php +++ b/app/Services/Saml.php @@ -341,7 +341,7 @@ class Saml * @param mixed $default * * @return mixed - *@author Johnson Yi + * @author Johnson Yi * */ public function getSetting($key, $default = null) From 20e4ba05904a8b4b27bac697e7048d57101e2823 Mon Sep 17 00:00:00 2001 From: Florent Bervas Date: Tue, 13 Aug 2024 15:07:16 +0000 Subject: [PATCH 3/5] lang: relocated translation key to existing item in general --- resources/views/hardware/bulk-delete.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/hardware/bulk-delete.blade.php b/resources/views/hardware/bulk-delete.blade.php index df19c9005..df988f5ad 100644 --- a/resources/views/hardware/bulk-delete.blade.php +++ b/resources/views/hardware/bulk-delete.blade.php @@ -30,7 +30,7 @@ {{ trans('admin/hardware/table.id') }} - {{ trans('admin/hardware/table.name') }} + {{ trans('general.asset_name') }} {{ trans('admin/hardware/table.location')}} {{ trans('admin/hardware/table.assigned_to') }} From 198afee946a1793c59dc8f2c6cda79159d76125f Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 13 Aug 2024 16:42:23 +0100 Subject: [PATCH 4/5] =?UTF-8?q?Fixed=20select2=20=E2=80=9Cx=E2=80=9D=20col?= =?UTF-8?q?or=20on=20mult-select=20and=20border=20color?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: snipe --- public/css/build/app.css | 7 +++++++ public/css/build/overrides.css | 7 +++++++ public/css/dist/all.css | 14 ++++++++++++++ public/mix-manifest.json | 6 +++--- resources/assets/less/overrides.less | 9 +++++++++ 5 files changed, 40 insertions(+), 3 deletions(-) diff --git a/public/css/build/app.css b/public/css/build/app.css index 62573c549..20d3864e0 100644 --- a/public/css/build/app.css +++ b/public/css/build/app.css @@ -823,6 +823,13 @@ body { width: 8.33333333%; } } +.select2-selection__choice__remove { + color: white !important; +} +.select2-selection--multiple { + border-color: #d2d6de !important; + height: 34px; +} img.navbar-brand-img, .navbar-brand > img { float: left; diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index 65194675b..801cb5470 100644 --- a/public/css/build/overrides.css +++ b/public/css/build/overrides.css @@ -456,6 +456,13 @@ body { width: 8.33333333%; } } +.select2-selection__choice__remove { + color: white !important; +} +.select2-selection--multiple { + border-color: #d2d6de !important; + height: 34px; +} img.navbar-brand-img, .navbar-brand > img { float: left; diff --git a/public/css/dist/all.css b/public/css/dist/all.css index f18cb5845..cf1679900 100644 --- a/public/css/dist/all.css +++ b/public/css/dist/all.css @@ -21795,6 +21795,13 @@ body { width: 8.33333333%; } } +.select2-selection__choice__remove { + color: white !important; +} +.select2-selection--multiple { + border-color: #d2d6de !important; + height: 34px; +} img.navbar-brand-img, .navbar-brand > img { float: left; @@ -23209,6 +23216,13 @@ body { width: 8.33333333%; } } +.select2-selection__choice__remove { + color: white !important; +} +.select2-selection--multiple { + border-color: #d2d6de !important; + height: 34px; +} img.navbar-brand-img, .navbar-brand > img { float: left; diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 3f4ef50a0..5120a3362 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -2,8 +2,8 @@ "/js/build/app.js": "/js/build/app.js?id=da3f7fee4a180ba924f6a3920c94eb71", "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=f0b08873a06bb54daeee176a9459f4a9", "/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=f4397c717b99fce41a633ca6edd5d1f4", - "/css/build/overrides.css": "/css/build/overrides.css?id=45c0cead5a6d7e8ce18bb3be74da66f1", - "/css/build/app.css": "/css/build/app.css?id=be23d679f1a883c2e6bf37fe06b5eca5", + "/css/build/overrides.css": "/css/build/overrides.css?id=062b73f4f3852ba7b6c42148a92e8789", + "/css/build/app.css": "/css/build/app.css?id=940ba9c6f1fc85377dcfe1661eb0bb7a", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=4ea0068716c1bb2434d87a16d51b98c9", "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=7b315b9612b8fde8f9c5b0ddb6bba690", "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=393aaa7b368b0670fc42434c8cca7dc7", @@ -19,7 +19,7 @@ "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374", "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=0640e45bad692dcf62873c6e85904899", "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb", - "/css/dist/all.css": "/css/dist/all.css?id=4cc4a343a5e63c1c708219008137ae6b", + "/css/dist/all.css": "/css/dist/all.css?id=0c3c3423c1c35a8c3f55289e5de2e1ad", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde", diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index 979e9fbee..7916d3f82 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -490,6 +490,15 @@ body { } +.select2-selection__choice__remove { + color: white !important; +} + +.select2-selection--multiple { + border-color: #d2d6de !important; + height: 34px; +} + img.navbar-brand-img, .navbar-brand>img { float: left; From 4f0f0af83b19cfb3e6fef6946136d55de423eb33 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 13 Aug 2024 16:46:26 +0100 Subject: [PATCH 5/5] Make the border radius match the rest of the site Signed-off-by: snipe --- public/css/build/app.css | 3 +++ public/css/build/overrides.css | 3 +++ public/css/dist/all.css | 6 ++++++ public/mix-manifest.json | 6 +++--- resources/assets/less/overrides.less | 4 ++++ 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/public/css/build/app.css b/public/css/build/app.css index 20d3864e0..bcc317f06 100644 --- a/public/css/build/app.css +++ b/public/css/build/app.css @@ -830,6 +830,9 @@ body { border-color: #d2d6de !important; height: 34px; } +.select2-selection__choice { + border-radius: 0px !important; +} img.navbar-brand-img, .navbar-brand > img { float: left; diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index 801cb5470..7b9e7d1b9 100644 --- a/public/css/build/overrides.css +++ b/public/css/build/overrides.css @@ -463,6 +463,9 @@ body { border-color: #d2d6de !important; height: 34px; } +.select2-selection__choice { + border-radius: 0px !important; +} img.navbar-brand-img, .navbar-brand > img { float: left; diff --git a/public/css/dist/all.css b/public/css/dist/all.css index cf1679900..47beba874 100644 --- a/public/css/dist/all.css +++ b/public/css/dist/all.css @@ -21802,6 +21802,9 @@ body { border-color: #d2d6de !important; height: 34px; } +.select2-selection__choice { + border-radius: 0px !important; +} img.navbar-brand-img, .navbar-brand > img { float: left; @@ -23223,6 +23226,9 @@ body { border-color: #d2d6de !important; height: 34px; } +.select2-selection__choice { + border-radius: 0px !important; +} img.navbar-brand-img, .navbar-brand > img { float: left; diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 5120a3362..934c1d82b 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -2,8 +2,8 @@ "/js/build/app.js": "/js/build/app.js?id=da3f7fee4a180ba924f6a3920c94eb71", "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=f0b08873a06bb54daeee176a9459f4a9", "/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=f4397c717b99fce41a633ca6edd5d1f4", - "/css/build/overrides.css": "/css/build/overrides.css?id=062b73f4f3852ba7b6c42148a92e8789", - "/css/build/app.css": "/css/build/app.css?id=940ba9c6f1fc85377dcfe1661eb0bb7a", + "/css/build/overrides.css": "/css/build/overrides.css?id=a759aa24710e294392877c5139fda40e", + "/css/build/app.css": "/css/build/app.css?id=b3b3df70f679f45e15a6bcd28a8e87cc", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=4ea0068716c1bb2434d87a16d51b98c9", "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=7b315b9612b8fde8f9c5b0ddb6bba690", "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=393aaa7b368b0670fc42434c8cca7dc7", @@ -19,7 +19,7 @@ "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374", "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=0640e45bad692dcf62873c6e85904899", "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb", - "/css/dist/all.css": "/css/dist/all.css?id=0c3c3423c1c35a8c3f55289e5de2e1ad", + "/css/dist/all.css": "/css/dist/all.css?id=7b8e04041af3dfe3de25d73107bfda91", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde", diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index 7916d3f82..3717dd477 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -499,6 +499,10 @@ body { height: 34px; } +.select2-selection__choice { + border-radius: 0px !important; +} + img.navbar-brand-img, .navbar-brand>img { float: left;