Skip to content

Commit 08ecda3

Browse files
committedMar 7, 2025
Fix stolostron specific patch for 11.5.2
Signed-off-by: Jacob Baungard Hansen <jacobbaungard@redhat.com>
1 parent c01a520 commit 08ecda3

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed
 

‎stolostron-patches/0001-Forward-headers-from-auth-proxy-to-datasource.patch

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From c068c2b2f6f1fd4ce7557e2f736efc73eb952cda Mon Sep 17 00:00:00 2001
1+
From 423f85e406eb4cbb92f11c1dc37a744e83add8a1 Mon Sep 17 00:00:00 2001
22
From: Jacob Baungard Hansen <jacobbaungard@redhat.com>
3-
Date: Thu, 25 Jul 2024 13:02:04 +0200
3+
Date: Fri, 7 Mar 2025 15:22:10 +0100
44
Subject: [PATCH] Forward headers from auth proxy to datasource
55

66
Signed-off-by: Jacob Baungard Hansen <jacobbaungard@redhat.com>
@@ -12,10 +12,10 @@ Signed-off-by: Jacob Baungard Hansen <jacobbaungard@redhat.com>
1212
create mode 100644 pkg/services/pluginsintegration/clientmiddleware/forward_headers_middleware.go
1313

1414
diff --git a/pkg/services/datasources/models.go b/pkg/services/datasources/models.go
15-
index 0af097a9d0..d0c742bab2 100644
15+
index 3ff27ef9128..8848865c4fd 100644
1616
--- a/pkg/services/datasources/models.go
1717
+++ b/pkg/services/datasources/models.go
18-
@@ -138,6 +138,18 @@ func (ds DataSource) AllowedCookies() []string {
18+
@@ -135,6 +135,18 @@ func (ds DataSource) AllowedCookies() []string {
1919
return []string{}
2020
}
2121

@@ -36,7 +36,7 @@ index 0af097a9d0..d0c742bab2 100644
3636
Err string
3737
diff --git a/pkg/services/pluginsintegration/clientmiddleware/forward_headers_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/forward_headers_middleware.go
3838
new file mode 100644
39-
index 0000000000..6799e0800c
39+
index 00000000000..6799e0800cd
4040
--- /dev/null
4141
+++ b/pkg/services/pluginsintegration/clientmiddleware/forward_headers_middleware.go
4242
@@ -0,0 +1,103 @@
@@ -144,17 +144,17 @@ index 0000000000..6799e0800c
144144
+ return m.next.CheckHealth(ctx, req)
145145
+}
146146
diff --git a/pkg/services/pluginsintegration/pluginsintegration.go b/pkg/services/pluginsintegration/pluginsintegration.go
147-
index 6963438dd8..d350e0a345 100644
147+
index 1851106b945..a8f4d86c69e 100644
148148
--- a/pkg/services/pluginsintegration/pluginsintegration.go
149149
+++ b/pkg/services/pluginsintegration/pluginsintegration.go
150-
@@ -178,6 +178,7 @@ func CreateMiddlewares(cfg *setting.Cfg, oAuthTokenService oauthtoken.OAuthToken
150+
@@ -185,6 +185,7 @@ func CreateMiddlewares(cfg *setting.Cfg, oAuthTokenService oauthtoken.OAuthToken
151151
middlewares = append(middlewares,
152152
clientmiddleware.NewTracingHeaderMiddleware(),
153153
clientmiddleware.NewClearAuthHeadersMiddleware(),
154154
+ clientmiddleware.NewForwardHeadersMiddleware(),
155155
clientmiddleware.NewOAuthTokenMiddleware(oAuthTokenService),
156156
clientmiddleware.NewCookiesMiddleware(skipCookiesNames),
157-
clientmiddleware.NewResourceResponseMiddleware(),
157+
clientmiddleware.NewCachingMiddlewareWithFeatureManager(cachingService, features),
158158
--
159-
2.45.2
159+
2.48.1
160160

0 commit comments

Comments
 (0)