diff --git a/SOURCES/0001-Added-support-GOST-and-PAM-GOST-profiles-for-crypto-.patch b/SOURCES/0001-Added-support-GOST-and-PAM-GOST-profiles-for-crypto-.patch new file mode 100644 index 0000000..2b97acf --- /dev/null +++ b/SOURCES/0001-Added-support-GOST-and-PAM-GOST-profiles-for-crypto-.patch @@ -0,0 +1,71 @@ +From 383c67ef13d6a7060b3ed249804f0948e667510f Mon Sep 17 00:00:00 2001 +From: tigro +Date: Tue, 2 Apr 2024 16:50:30 +0300 +Subject: [PATCH] Added support GOST and PAM-GOST profiles for crypto-policies + in the UI interface + +--- + pkg/systemd/overview-cards/cryptoPolicies.jsx | 7 +++++ + po/ru.po | 28 +++++++++++++++++++ + 2 files changed, 35 insertions(+) + +diff --git a/pkg/systemd/overview-cards/cryptoPolicies.jsx b/pkg/systemd/overview-cards/cryptoPolicies.jsx +index 4da83868b..acbfaef3f 100644 +--- a/pkg/systemd/overview-cards/cryptoPolicies.jsx ++++ b/pkg/systemd/overview-cards/cryptoPolicies.jsx +@@ -121,6 +121,13 @@ const CryptoPolicyDialog = ({ + ), + "FIPS:OSPP": _("FIPS with further Common Criteria restrictions."), + FUTURE: _("Protects from anticipated near-term future attacks at the expense of interoperability."), ++ "DEFAULT:GOST": _("DEFAULT with GOST algorithms enabled."), ++ "DEFAULT:PAM-GOST": _("DEFAULT with GOST password hashing based on minimal auth profile."), ++ "DEFAULT:GOST:PAM-GOST": _("DEFAULT with GOST and GOST password hashing based on minimal auth profile."), ++ "DEFAULT:GOST:SSSD-PAM-GOST": _("DEFAULT with GOST and GOST password hashing based on sssd auth profile."), ++ "DEFAULT:PATCH-PAM-GOST": _("DEFAULT with GOST password hashing based on patch for custom configs."), ++ "GOST-ONLY": _("GOST algorithms allowed only."), ++ "GOST-ONLY-PAM": _("GOST algorithms allowed only with GOST pass hashing."), + }; + + const policies = Object.keys(cryptopolicies) +diff --git a/po/ru.po b/po/ru.po +index df7e755b5..2ceb4d063 100644 +--- a/po/ru.po ++++ b/po/ru.po +@@ -2438,6 +2438,34 @@ msgstr "Настраиваемые зоны" + msgid "DEFAULT with SHA-1 signature verification allowed." + msgstr "" + ++#: pkg/systemd/overview-cards/cryptoPolicies.jsx:124 ++msgid "DEFAULT with GOST algorithms enabled." ++msgstr "Профиль по умолчанию, с добавлением поддержки ГОСТ алгоритмов" ++ ++#: pkg/systemd/overview-cards/cryptoPolicies.jsx:125 ++msgid "DEFAULT with GOST password hashing based on minimal auth profile." ++msgstr "Профиль по умолчанию, с добавлением поддержки хэшей паролей по ГОСТ 34.11-2012 на базе профиля авторизации minimal" ++ ++#: pkg/systemd/overview-cards/cryptoPolicies.jsx:126 ++msgid "DEFAULT with GOST and GOST password hashing based on minimal auth profile." ++msgstr "Профиль по умолчанию, с добавлением поддержки ГОСТ и хэшей паролей по ГОСТ 34.11-2012 на базе профиля авторизации minimal" ++ ++#: pkg/systemd/overview-cards/cryptoPolicies.jsx:127 ++msgid "DEFAULT with GOST and GOST password hashing based on sssd auth profile." ++msgstr "Профиль по умолчанию, с добавлением поддержки ГОСТ и хэшей паролей по ГОСТ 34.11-2012 на базе профиля авторизации sssd" ++ ++#: pkg/systemd/overview-cards/cryptoPolicies.jsx:128 ++msgid "DEFAULT with GOST password hashing based on patch for custom configs." ++msgstr "Профиль по умолчанию, с добавлением хэшей паролей по ГОСТ 34.11-2012 модификацией файлов авторизации. Для пользовательских конфигураций" ++ ++#: pkg/systemd/overview-cards/cryptoPolicies.jsx:129 ++msgid "GOST algorithms allowed only." ++msgstr "Профиль ГОСТ с запретом всего остального" ++ ++#: pkg/systemd/overview-cards/cryptoPolicies.jsx:130 ++msgid "GOST algorithms allowed only with GOST pass hashing." ++msgstr "Профиль ГОСТ(+хэш паролей по ГОСТ 34.11-2012) с запретом всего остального" ++ + #: pkg/networkmanager/ip-settings.jsx:237 + msgid "DNS" + msgstr "DNS" +-- +2.44.0 + diff --git a/SOURCES/0001-Adds-MSVSphere-branding-directory.patch b/SOURCES/0001-Adds-MSVSphere-branding-directory.patch new file mode 100644 index 0000000..4652c07 --- /dev/null +++ b/SOURCES/0001-Adds-MSVSphere-branding-directory.patch @@ -0,0 +1,87 @@ +From fc676ccfa2932d62c09d6e47300147ab69aec6c0 Mon Sep 17 00:00:00 2001 +From: Eugene Zamriy +Date: Mon, 20 Nov 2023 21:15:12 +0300 +Subject: [PATCH 1/6] Adds MSVSphere branding directory + +--- + Makefile.am | 1 + + src/branding/msvsphere/Makefile.am | 11 +++++++++ + src/branding/msvsphere/branding.css | 36 +++++++++++++++++++++++++++++ + 3 files changed, 48 insertions(+) + create mode 100644 src/branding/msvsphere/Makefile.am + create mode 100644 src/branding/msvsphere/branding.css + +diff --git a/Makefile.am b/Makefile.am +index 7901fcc0d..5f2696062 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -174,6 +174,7 @@ include src/branding/debian/Makefile.am + include src/branding/default/Makefile.am + include src/branding/fedora/Makefile.am + include src/branding/kubernetes/Makefile.am ++include src/branding/msvsphere/Makefile.am + include src/branding/opensuse/Makefile.am + include src/branding/registry/Makefile.am + include src/branding/rhel/Makefile.am +diff --git a/src/branding/msvsphere/Makefile.am b/src/branding/msvsphere/Makefile.am +new file mode 100644 +index 000000000..7425bdd0f +--- /dev/null ++++ b/src/branding/msvsphere/Makefile.am +@@ -0,0 +1,11 @@ ++msvspherebrandingdir = $(datadir)/cockpit/branding/msvsphere ++ ++dist_msvspherebranding_DATA = \ ++ src/branding/msvsphere/branding.css \ ++ $(NULL) ++ ++# Opportunistically use sphere-logos ... yes they're called 'fedora' ++install-data-hook:: ++ ln -sTfr $(DESTDIR)/usr/share/pixmaps/system-logo-white.png $(DESTDIR)$(msvspherebrandingdir)/logo.png ++ ln -sTfr $(DESTDIR)/usr/share/pixmaps/fedora-logo-sprite.png $(DESTDIR)$(msvspherebrandingdir)/apple-touch-icon.png ++ ln -sTfr $(DESTDIR)/etc/favicon.png $(DESTDIR)$(msvspherebrandingdir)/favicon.ico +diff --git a/src/branding/msvsphere/branding.css b/src/branding/msvsphere/branding.css +new file mode 100644 +index 000000000..2b87b42bc +--- /dev/null ++++ b/src/branding/msvsphere/branding.css +@@ -0,0 +1,36 @@ ++/* MSVSphere Branding */ ++ ++:root { ++ --ct-color-host-accent: #cc0000 !important; ++} ++ ++body.login-pf { ++ background: url("bg-plain.jpg") no-repeat 50% 0; ++ background-size: cover; ++ background-color: #101010; ++} ++ ++#badge { ++ width: 225px; ++ height: 80px; ++ background-image: url("logo.png"); ++ background-size: contain; ++ background-repeat: no-repeat; ++} ++ ++#brand { ++ font-size: 18pt; ++ text-transform: uppercase; ++} ++ ++#brand:before { ++ content: "${NAME}"; ++} ++ ++#index-brand { ++ font-weight: bold; ++} ++ ++#index-brand:before { ++ content: "${NAME}"; ++} +-- +2.43.0 + diff --git a/SOURCES/0002-Show-MSVSPHERE_PRETTY_NAME-instead-of-NAME-on-login-.patch b/SOURCES/0002-Show-MSVSPHERE_PRETTY_NAME-instead-of-NAME-on-login-.patch new file mode 100644 index 0000000..a896613 --- /dev/null +++ b/SOURCES/0002-Show-MSVSPHERE_PRETTY_NAME-instead-of-NAME-on-login-.patch @@ -0,0 +1,46 @@ +From 2e1149a465911f292a94a21d012198a009b1403f Mon Sep 17 00:00:00 2001 +From: Eugene Zamriy +Date: Mon, 20 Nov 2023 21:25:21 +0300 +Subject: [PATCH 2/6] Show MSVSPHERE_PRETTY_NAME instead of NAME on login page + +--- + src/branding/msvsphere/branding.css | 4 ++-- + src/ws/cockpithandlers.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/branding/msvsphere/branding.css b/src/branding/msvsphere/branding.css +index 2b87b42bc..67faf6d4b 100644 +--- a/src/branding/msvsphere/branding.css ++++ b/src/branding/msvsphere/branding.css +@@ -24,7 +24,7 @@ body.login-pf { + } + + #brand:before { +- content: "${NAME}"; ++ content: "${MSVSPHERE_PRETTY_NAME}"; + } + + #index-brand { +@@ -32,5 +32,5 @@ body.login-pf { + } + + #index-brand:before { +- content: "${NAME}"; ++ content: "${MSVSPHERE_PRETTY_NAME}"; + } +diff --git a/src/ws/cockpithandlers.c b/src/ws/cockpithandlers.c +index c866e1c15..b1b914ffa 100644 +--- a/src/ws/cockpithandlers.c ++++ b/src/ws/cockpithandlers.c +@@ -287,7 +287,7 @@ build_environment (GHashTable *os_release) + * the corresponding information is not a leak. + */ + static const gchar *release_fields[] = { +- "NAME", "ID", "PRETTY_NAME", "VARIANT", "VARIANT_ID", "CPE_NAME", "ID_LIKE", "DOCUMENTATION_URL" ++ "NAME", "ID", "PRETTY_NAME", "VARIANT", "VARIANT_ID", "CPE_NAME", "ID_LIKE", "DOCUMENTATION_URL", "MSVSPHERE_PRETTY_NAME" + }; + + static const gchar *prefix = "\n