You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
53 lines
2.3 KiB
53 lines
2.3 KiB
2 months ago
|
From 6142961fe0e39bdbba0d70f792fc27fb2bc096ba Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ivan Devat <idevat@redhat.com>
|
||
|
|
Date: Thu, 7 Mar 2024 16:51:13 +0100
|
||
|
|
Subject: [PATCH] stop sending http headers to ruby part of pcsd
|
||
|
|
|
||
|
|
---
|
||
|
|
pcs/daemon/ruby_pcsd.py | 23 ++++++++++++++++++++++-
|
||
|
|
1 file changed, 22 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/pcs/daemon/ruby_pcsd.py b/pcs/daemon/ruby_pcsd.py
|
||
|
|
index 4b3b0ea1..e07e17cc 100644
|
||
|
|
--- a/pcs/daemon/ruby_pcsd.py
|
||
|
|
+++ b/pcs/daemon/ruby_pcsd.py
|
||
|
|
@@ -87,13 +87,34 @@ class RubyDaemonRequest(
|
||
|
|
http_request: HTTPServerRequest = None,
|
||
|
|
payload=None,
|
||
|
|
):
|
||
|
|
- headers = http_request.headers if http_request else HTTPHeaders()
|
||
|
|
+ # Headers from request are not propagated to ruby part. Ruby part doesn't
|
||
|
|
+ # work with standard headers in any special way. So, we send only path,
|
||
|
|
+ # method, query, body and special headers for communication between
|
||
|
|
+ # python part and ruby part. Tornado then adds necessary default
|
||
|
|
+ # headers. The motivation here is to prevent processing potentially
|
||
|
|
+ # maliciously crafted headers by rack.
|
||
|
|
+ headers = HTTPHeaders()
|
||
|
|
headers.add("X-Pcsd-Type", request_type)
|
||
|
|
if payload:
|
||
|
|
headers.add(
|
||
|
|
"X-Pcsd-Payload",
|
||
|
|
b64encode(json.dumps(payload).encode()).decode(),
|
||
|
|
)
|
||
|
|
+ if http_request:
|
||
|
|
+ for key, val in http_request.headers.get_all():
|
||
|
|
+ # From webui, POST request can come with either
|
||
|
|
+ # application/x-www-form-urlencoded or application/json content
|
||
|
|
+ # type. When we remove original HTTP headers, content type is
|
||
|
|
+ # added by tornado. But in the case of original application/json,
|
||
|
|
+ # tornado puts application/x-www-form-urlencoded there. To fix
|
||
|
|
+ # this let's keep the original header here in this case.
|
||
|
|
+ #
|
||
|
|
+ # The token, CIB_user and CIB_user_groups are transferred by the
|
||
|
|
+ # "Cookie" header and these information are evaluated in ruby.
|
||
|
|
+ if (
|
||
|
|
+ key.lower() == "content-type" and val == "application/json"
|
||
|
|
+ ) or key.lower() == "cookie":
|
||
|
|
+ headers.add(key, val)
|
||
|
|
return super(RubyDaemonRequest, cls).__new__(
|
||
|
|
cls,
|
||
|
|
request_type,
|
||
|
|
--
|
||
|
|
2.47.0
|
||
|
|
|