bmcweb: Remove patch 'Revert-Rearrange-forward_unauthorized'

9 files changed, 7 insertions, 77 deletions

diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0004-IBS-Add-redfish2phosphor-logs.patch b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0003-IBS-Add-redfish2phosphor-logs.patch
index 4dec7e09e8..4dec7e09e8 100644
--- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0004-IBS-Add-redfish2phosphor-logs.patch
+++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0003-IBS-Add-redfish2phosphor-logs.patch
diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0003-Revert-Rearrange-forward_unauthorized.patch b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0003-Revert-Rearrange-forward_unauthorized.patch
deleted file mode 100644
index df924cf7c0..0000000000
--- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0003-Revert-Rearrange-forward_unauthorized.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 3ee7ad700beebc5abe9bed064ce9c0e9358e6040 Mon Sep 17 00:00:00 2001
-From: Nikita Kosenkov <NKosenkov@IBS.RU>
-Date: Tue, 6 Sep 2022 14:36:21 +0300
-Subject: [PATCH] Revert 'Rearrange forward_unauthorized'
-
-This reverts commit 347d1a195e1f0a9765bc8ae7be39f6eb6577d487.
----
- include/forward_unauthorized.hpp | 42 +++++++++++++++++---------------
- 1 file changed, 22 insertions(+), 20 deletions(-)
-
-diff --git a/include/forward_unauthorized.hpp b/include/forward_unauthorized.hpp
-index a48b7753..327a9419 100644
---- a/include/forward_unauthorized.hpp
-+++ b/include/forward_unauthorized.hpp
-@@ -22,29 +22,31 @@ inline void sendUnauthorized(std::string_view url,
-             res.result(boost::beast::http::status::temporary_redirect);
-             res.addHeader(boost::beast::http::field::location,
-                           "/#/login?next=" + http_helpers::urlEncode(url));
--            return;
-         }
--        // If we don't have a webui installed, just return an unauthorized
--        // body
--        res.result(boost::beast::http::status::unauthorized);
--        res.body() = "Unauthorized";
--        return;
--    }
--
--    res.result(boost::beast::http::status::unauthorized);
--
--    // XHR requests from a browser will set the X-Requested-With header when
--    // doing their requests, even though they might not be requesting html.
--    if (!xRequestedWith.empty())
--    {
--        return;
-+        else
-+        {
-+            // If we don't have a webui installed, just return a lame
-+            // unauthorized body
-+            res.result(boost::beast::http::status::unauthorized);
-+            res.body() = "Unauthorized";
-+        }
-     }
--    // if basic auth is disabled, don't propose it.
--    if (!persistent_data::SessionStore::getInstance()
--             .getAuthMethodsConfig()
--             .basic)
-+    else
-     {
--        return;
-+        res.result(boost::beast::http::status::unauthorized);
-+
-+        // XHR requests from a browser will set the X-Requested-With header when
-+        // doing their requests, even though they might not be requesting html.
-+        if (!xRequestedWith.empty())
-+        {
-+            // Only propose basic auth as an option if it's enabled.
-+            if (persistent_data::SessionStore::getInstance()
-+                    .getAuthMethodsConfig()
-+                    .basic)
-+            {
-+                res.addHeader("WWW-Authenticate", "Basic");
-+            }
-+        }
-     }
-     res.addHeader(boost::beast::http::field::www_authenticate, "Basic");
- }
--- 
-2.35.1
-
diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0005-Add-Sensor-Warning-Threshold-Edit.patch b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0004-Add-Sensor-Warning-Threshold-Edit.patch
index 3ebae7817d..3ebae7817d 100644
--- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0005-Add-Sensor-Warning-Threshold-Edit.patch
+++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0004-Add-Sensor-Warning-Threshold-Edit.patch
diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0006-IBS-bmcweb-evt-registry-add-BMCTimeUpdatedViaNTP.patch b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0005-IBS-bmcweb-evt-registry-add-BMCTimeUpdatedViaNTP.patch
index e1ce9ff163..e1ce9ff163 100644
--- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0006-IBS-bmcweb-evt-registry-add-BMCTimeUpdatedViaNTP.patch
+++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0005-IBS-bmcweb-evt-registry-add-BMCTimeUpdatedViaNTP.patch
diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0007-Add-critical-thresholds-to-redfish.patch b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0006-Add-critical-thresholds-to-redfish.patch
index 56f6e40644..56f6e40644 100644
--- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0007-Add-critical-thresholds-to-redfish.patch
+++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0006-Add-critical-thresholds-to-redfish.patch
diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0008-Add-additional-logs-about-time-sync.patch b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0007-Add-additional-logs-about-time-sync.patch
index e0bdbeefb8..e0bdbeefb8 100644
--- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0008-Add-additional-logs-about-time-sync.patch
+++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0007-Add-additional-logs-about-time-sync.patch
diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0009-Added-additional-log-about-NTP-sync-status.patch b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0008-Added-additional-log-about-NTP-sync-status.patch
index b7d242735b..b7d242735b 100644
--- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0009-Added-additional-log-about-NTP-sync-status.patch
+++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0008-Added-additional-log-about-NTP-sync-status.patch
diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0010-Added-check-user-priv-before-creating-KVM-and-SOL.patch b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0009-Added-check-user-priv-before-creating-KVM-and-SOL.patch
index ef29193670..ef29193670 100644
--- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0010-Added-check-user-priv-before-creating-KVM-and-SOL.patch
+++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0009-Added-check-user-priv-before-creating-KVM-and-SOL.patch
diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
index a17c3a6729..b0cb53db12 100644
--- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
+++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
@@ -5,14 +5,13 @@ SRCREV = "3e7ab70817a6e49684c7c01ec0f2d67630f36559"
 SRC_URI += "\
     file://0001-Enable-vm-nbdproxy-option.patch \
     file://0002-Add-http-ftp-nfs-protocols.patch \
-    file://0003-Revert-Rearrange-forward_unauthorized.patch \
-    file://0004-IBS-Add-redfish2phosphor-logs.patch \
-    file://0006-IBS-bmcweb-evt-registry-add-BMCTimeUpdatedViaNTP.patch \
-    file://0008-Add-additional-logs-about-time-sync.patch \
-    file://0009-Added-additional-log-about-NTP-sync-status.patch \
-    file://0010-Added-check-user-priv-before-creating-KVM-and-SOL.patch \
-    file://0005-Add-Sensor-Warning-Threshold-Edit.patch \
-    file://0007-Add-critical-thresholds-to-redfish.patch \
+    file://0003-IBS-Add-redfish2phosphor-logs.patch \
+    file://0004-Add-Sensor-Warning-Threshold-Edit.patch \
+    file://0005-IBS-bmcweb-evt-registry-add-BMCTimeUpdatedViaNTP.patch \
+    file://0006-Add-critical-thresholds-to-redfish.patch \
+    file://0007-Add-additional-logs-about-time-sync.patch \
+    file://0008-Added-additional-log-about-NTP-sync-status.patch \
+    file://0009-Added-check-user-priv-before-creating-KVM-and-SOL.patch \
    "
 
 EXTRA_OEMESON += "\