From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id C676260916 for ; Thu, 15 Oct 2020 17:49:28 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B27FF14411 for ; Thu, 15 Oct 2020 17:49:28 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 6B40C143F7 for ; Thu, 15 Oct 2020 17:49:25 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3340745D7F for ; Thu, 15 Oct 2020 17:49:25 +0200 (CEST) From: Thomas Lamprecht To: pbs-devel@lists.proxmox.com Date: Thu, 15 Oct 2020 17:49:17 +0200 Message-Id: <20201015154919.19776-3-t.lamprecht@proxmox.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201015154919.19776-1-t.lamprecht@proxmox.com> References: <20201015154919.19776-1-t.lamprecht@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.134 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [rest.rs] Subject: [pbs-devel] [PATCH backup 2/4] server: rest: also log the query part of URL X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Oct 2020 15:49:28 -0000 As it is part of the request and we do so in our other products Signed-off-by: Thomas Lamprecht --- src/server/rest.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/rest.rs b/src/server/rest.rs index 55a42ac5..7305643c 100644 --- a/src/server/rest.rs +++ b/src/server/rest.rs @@ -111,7 +111,7 @@ pub struct ApiService { fn log_response( peer: &std::net::SocketAddr, method: hyper::Method, - path: &str, + path_query: &str, resp: &Response, ) { @@ -119,7 +119,7 @@ fn log_response( // we also log URL-to-long requests, so avoid message bigger than PIPE_BUF (4k on Linux) // to profit from atomicty guarantees for O_APPEND opened logfiles - let path = &path[..MAX_URI_QUERY_LENGTH.min(path.len())]; + let path = &path_query[..MAX_URI_QUERY_LENGTH.min(path_query.len())]; let status = resp.status(); @@ -156,7 +156,7 @@ impl tower_service::Service> for ApiService { } fn call(&mut self, req: Request) -> Self::Future { - let path = req.uri().path().to_owned(); + let path = req.uri().path_and_query().unwrap().as_str().to_owned(); let method = req.method().clone(); let config = Arc::clone(&self.api_config); -- 2.27.0