From 4270814afcbf33b1dd0e58313489db7dd5e23370 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Pialasse Date: Tue, 31 Dec 2024 02:00:14 -0500 Subject: [PATCH] * Tue Dec 31 2024 Jean-Philippe Pialasse 11.0.0-34.sme - fix css warning xxcolor [SME: 12844] - update CSP style rules [SME: 12840] --- .../conf/httpd.conf/VirtualHosts/27SManagerProxyPass | 9 +++++++-- .../themes/default/templates/partials/_header.html.ep | 8 ++++---- smeserver-manager.spec | 6 +++++- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27SManagerProxyPass b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27SManagerProxyPass index 1fc94db..687a994 100644 --- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27SManagerProxyPass +++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27SManagerProxyPass @@ -43,8 +43,13 @@ $OUT .= " Header set Content-Security-Policy \"script-src 'self' 'unsafe-eval' 'unsafe-hashes' " ." 'sha256-X8Qwlk0M9iDTQZqFVpbVcThRjBqQXpwTOZCLX8I+Frk=' 'sha256-inQ04nmqTZI75Z5g/tAzjahedNugPFfrhxHyoFezFkM=' 'sha256-5IsIX+Vbow7wwy2RjR3+5X06R/0CQZPkw3OHj/228cM=' 'sha256-tfVskwioRaNsV75h89itf7FujMgIrodfs1Ea4UAJNpE=' 'sha256-P51OyslUh5bGkoWk9qY+o4Su4HuwNFoQcFCeNxF7Ms8=' ; " ." style-src 'self' 'unsafe-hashes' " - ." 'sha256-msdEhWmYTu7vqzGaQHDfvy6lzlDsbKkouwvN2R6Co9E=' 'sha256-a1tyxi1vRpW2Q9+0hM+nBA250/jWJlJdeR43c5r90PI=' 'sha256-iYwYhiMcsGmXCUzLEpEzZNz5dINrlkqf1sLbLhEcqGM=' 'sha256-bOTFT8zacR4Rfja/WIKXgAQQXVaPyG3oBlvAhU4ga8g=' 'sha256-2iGOQeZyvW9G2X+8IhZDG+GPRpXQTxUg/2QxdI+dyEg=' 'sha256-CP93jJ1Y8nMwUoDzFbo1srdgsbADPasAc0Wjig1ahpY=' 'sha256-2iGOQeZyvW9G2X+8IhZDG+GPRpXQTxUg/2QxdI+dyEg=' ;" - ." \"\n"; + #'sha256-EhT63KK1JBrsUM27H+5RMNifDFpVB+GXcTtavKXwCK8=' #h2l1 + #'sha256-msdEhWmYTu7vqzGaQHDfvy6lzlDsbKkouwvN2R6Co9E=' #busy-indicator + #'sha256-iYwYhiMcsGmXCUzLEpEzZNz5dINrlkqf1sLbLhEcqGM=' _footer.html.ep style="position:relative;" + #'sha256-bOTFT8zacR4Rfja/WIKXgAQQXVaPyG3oBlvAhU4ga8g=' _usr_list style="min-width:35em" + #'sha256-CP93jJ1Y8nMwUoDzFbo1srdgsbADPasAc0Wjig1ahpY=' groups style="min-width:15em" + ." 'sha256-msdEhWmYTu7vqzGaQHDfvy6lzlDsbKkouwvN2R6Co9E=' 'sha256-iYwYhiMcsGmXCUzLEpEzZNz5dINrlkqf1sLbLhEcqGM=' 'sha256-bOTFT8zacR4Rfja/WIKXgAQQXVaPyG3oBlvAhU4ga8g=' 'sha256-CP93jJ1Y8nMwUoDzFbo1srdgsbADPasAc0Wjig1ahpY=' 'sha256-EhT63KK1JBrsUM27H+5RMNifDFpVB+GXcTtavKXwCK8=' ;" + ." \"\n"; $OUT .= " \n"; # prevent caching of manager files in browser $OUT .= " \n"; diff --git a/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep index 0036717..8e93272 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep @@ -68,7 +68,7 @@ .login-button { background-color: #98d36e; /* Button background color */ font-weight: bold; /* Bold text */ - xxcolor: #ffffff; /* Button text color */ + color: #ffffff; /* Button text color */ padding: 8px 12px; /* Adjust padding for button height */ border: none; /* Remove default border */ border-radius: 4px; /* Rounded corners */ @@ -100,11 +100,11 @@
- +
% if ( not defined $c->session->{username} ) { @@ -125,4 +125,4 @@
- \ No newline at end of file + diff --git a/smeserver-manager.spec b/smeserver-manager.spec index a29f718..b7784c0 100644 --- a/smeserver-manager.spec +++ b/smeserver-manager.spec @@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2 %define name smeserver-manager Name: %{name} %define version 11.0.0 -%define release 33 +%define release 34 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -115,6 +115,10 @@ true %defattr(-,root,root) %changelog +* Tue Dec 31 2024 Jean-Philippe Pialasse 11.0.0-34.sme +- fix css warning xxcolor [SME: 12844] +- update CSP style rules [SME: 12840] + * Mon Dec 30 2024 Jean-Philippe Pialasse 11.0.0-33.sme - host locally flag-icon.min.css 3.5.0 [SME: 12845] - remove onclick to comply with strict CSP [SME: 12846]