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 78D036A496 for ; Tue, 16 Feb 2021 18:07:32 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 475CC18E08 for ; Tue, 16 Feb 2021 18:07:32 +0100 (CET) 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 CB13618DE3 for ; Tue, 16 Feb 2021 18:07:30 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 965324622F for ; Tue, 16 Feb 2021 18:07:30 +0100 (CET) From: Stefan Reiter To: pbs-devel@lists.proxmox.com Date: Tue, 16 Feb 2021 18:07:01 +0100 Message-Id: <20210216170710.31767-14-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210216170710.31767-1-s.reiter@proxmox.com> References: <20210216170710.31767-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.029 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 proxmox-backup 13/22] rest: implement tower service for UnixStream 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: Tue, 16 Feb 2021 17:07:32 -0000 This allows anything that can be represented as a UnixStream to be used as transport for an API server (e.g. virtio sockets). A tower service expects an IP address as it's peer, which we can't reliably provide for unix socket based transports, so just fake one. Signed-off-by: Stefan Reiter --- src/server/rest.rs | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/server/rest.rs b/src/server/rest.rs index fc59be9a..9bf494fd 100644 --- a/src/server/rest.rs +++ b/src/server/rest.rs @@ -107,6 +107,26 @@ impl tower_service::Service<&tokio::net::TcpStream> for RestServer { } } +impl tower_service::Service<&tokio::net::UnixStream> for RestServer { + type Response = ApiService; + type Error = Error; + type Future = Pin> + Send>>; + + fn poll_ready(&mut self, _cx: &mut Context) -> Poll> { + Poll::Ready(Ok(())) + } + + fn call(&mut self, _ctx: &tokio::net::UnixStream) -> Self::Future { + // TODO: Find a way to actually represent the vsock peer in the ApiService struct - for now + // it doesn't really matter, so just use a fake IP address + let fake_peer = "0.0.0.0:807".parse().unwrap(); + future::ok(ApiService { + peer: fake_peer, + api_config: self.api_config.clone() + }).boxed() + } +} + pub struct ApiService { pub peer: std::net::SocketAddr, pub api_config: Arc, -- 2.20.1