public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Lukas Wagner <l.wagner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH proxmox 1/2] notify: webhook: gotify: set Content-Length header
Date: Fri, 21 Mar 2025 10:56:59 +0100	[thread overview]
Message-ID: <20250321095700.106077-1-l.wagner@proxmox.com> (raw)

To quote from RFC 9110 [1]:

  A user agent SHOULD send Content-Length in a request when
  the method defines a meaning for enclosed content and it
  is not sending Transfer-Encoding. For example, a user agent
  normally sends Content-Length in a POST request even when
  the value is 0 (indicating empty content).
  A user agent SHOULD NOT send a Content-Length header field
  when the request message does not contain content and the
  method semantics do not anticipate such data.

It seemed like our HTTP client lib did not set the header
automatically, which is why we should do it manually.

While most services seemed to have worked fine without setting
the header, some Microsoft services seem to require it
to accept the webhook request [2].

[1] https://datatracker.ietf.org/doc/html/rfc9110#name-content-length
[2] https://forum.proxmox.com/threads/158827

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
 proxmox-notify/src/endpoints/gotify.rs  |  4 ++++
 proxmox-notify/src/endpoints/webhook.rs | 19 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/proxmox-notify/src/endpoints/gotify.rs b/proxmox-notify/src/endpoints/gotify.rs
index 3e977131..e154daab 100644
--- a/proxmox-notify/src/endpoints/gotify.rs
+++ b/proxmox-notify/src/endpoints/gotify.rs
@@ -136,6 +136,10 @@ impl Endpoint for GotifyEndpoint {
                 format!("Bearer {}", self.private_config.token),
             ),
             ("X-Gotify-Key".into(), self.private_config.token.clone()),
+            (
+                http::header::CONTENT_LENGTH.to_string(),
+                body.len().to_string(),
+            ),
         ]);
 
         let proxy_config = context()
diff --git a/proxmox-notify/src/endpoints/webhook.rs b/proxmox-notify/src/endpoints/webhook.rs
index 34dbac54..604777c7 100644
--- a/proxmox-notify/src/endpoints/webhook.rs
+++ b/proxmox-notify/src/endpoints/webhook.rs
@@ -35,7 +35,7 @@ pub(crate) const WEBHOOK_TYPENAME: &str = "webhook";
 const HTTP_TIMEOUT: Duration = Duration::from_secs(10);
 
 #[api]
-#[derive(Serialize, Deserialize, Clone, Copy, Default)]
+#[derive(Serialize, Deserialize, Clone, Copy, Default, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 /// HTTP Method to use.
 pub enum HttpMethod {
@@ -347,6 +347,23 @@ impl WebhookEndpoint {
             builder = builder.header(header.name.clone(), value);
         }
 
+        // From https://datatracker.ietf.org/doc/html/rfc9110#name-content-length :
+        //
+        // A user agent SHOULD send Content-Length in a request when the method
+        // defines a meaning for enclosed content and it is not sending
+        // Transfer-Encoding. For example, a user agent normally sends
+        // Content-Length in a POST request even when the value is 0 (indicating
+        // empty content). A user agent SHOULD NOT send a Content-Length header
+        // field when the request message does not contain content and the
+        // method semantics do not anticipate such data.
+        //
+        // -> send the header always, unless we do a get with no body (which is the expected case
+        // for GET)
+        let content_length = body.as_bytes().len();
+        if !(self.config.method == HttpMethod::Get && content_length == 0) {
+            builder = builder.header(http::header::CONTENT_LENGTH, content_length);
+        }
+
         let request = builder
             .body(body)
             .map_err(|err| self.mask_secret_in_error(err))
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel


             reply	other threads:[~2025-03-21  9:58 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-21  9:56 Lukas Wagner [this message]
2025-03-21  9:57 ` [pve-devel] [PATCH proxmox 2/2] notify: gotify: use constant from http crate for 'Authorization' header Lukas Wagner
2025-03-25 18:41 ` [pve-devel] applied: [PATCH proxmox 1/2] notify: webhook: gotify: set Content-Length header Thomas Lamprecht
2025-03-26  9:54   ` Lukas Wagner
2025-03-26 10:11     ` Thomas Lamprecht
2025-03-26 10:20       ` Lukas Wagner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250321095700.106077-1-l.wagner@proxmox.com \
    --to=l.wagner@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal