1
- From c068c2b2f6f1fd4ce7557e2f736efc73eb952cda Mon Sep 17 00:00:00 2001
1
+ From 423f85e406eb4cbb92f11c1dc37a744e83add8a1 Mon Sep 17 00:00:00 2001
2
2
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
4
4
Subject: [PATCH] Forward headers from auth proxy to datasource
5
5
6
6
Signed-off-by: Jacob Baungard Hansen <jacobbaungard@redhat.com>
@@ -12,10 +12,10 @@ Signed-off-by: Jacob Baungard Hansen <jacobbaungard@redhat.com>
12
12
create mode 100644 pkg/services/pluginsintegration/clientmiddleware/forward_headers_middleware.go
13
13
14
14
diff --git a/pkg/services/datasources/models.go b/pkg/services/datasources/models.go
15
- index 0af097a9d0..d0c742bab2 100644
15
+ index 3ff27ef9128..8848865c4fd 100644
16
16
--- a/pkg/services/datasources/models.go
17
17
+++ 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 {
19
19
return []string{}
20
20
}
21
21
@@ -36,7 +36,7 @@ index 0af097a9d0..d0c742bab2 100644
36
36
Err string
37
37
diff --git a/pkg/services/pluginsintegration/clientmiddleware/forward_headers_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/forward_headers_middleware.go
38
38
new file mode 100644
39
- index 0000000000..6799e0800c
39
+ index 00000000000..6799e0800cd
40
40
--- /dev/null
41
41
+++ b/pkg/services/pluginsintegration/clientmiddleware/forward_headers_middleware.go
42
42
@@ -0,0 +1,103 @@
@@ -144,17 +144,17 @@ index 0000000000..6799e0800c
144
144
+ return m.next.CheckHealth(ctx, req)
145
145
+ }
146
146
diff --git a/pkg/services/pluginsintegration/pluginsintegration.go b/pkg/services/pluginsintegration/pluginsintegration.go
147
- index 6963438dd8..d350e0a345 100644
147
+ index 1851106b945..a8f4d86c69e 100644
148
148
--- a/pkg/services/pluginsintegration/pluginsintegration.go
149
149
+++ 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
151
151
middlewares = append(middlewares,
152
152
clientmiddleware.NewTracingHeaderMiddleware(),
153
153
clientmiddleware.NewClearAuthHeadersMiddleware(),
154
154
+ clientmiddleware.NewForwardHeadersMiddleware(),
155
155
clientmiddleware.NewOAuthTokenMiddleware(oAuthTokenService),
156
156
clientmiddleware.NewCookiesMiddleware(skipCookiesNames),
157
- clientmiddleware.NewResourceResponseMiddleware( ),
157
+ clientmiddleware.NewCachingMiddlewareWithFeatureManager(cachingService, features ),
158
158
- -
159
- 2.45.2
159
+ 2.48.1
160
160
0 commit comments