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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id CB1E36081F for ; Thu, 8 Oct 2020 15:37:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BD151F8E7 for ; Thu, 8 Oct 2020 15:37:25 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 9EEB5F8DA for ; Thu, 8 Oct 2020 15:37:24 +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 4351645C48 for ; Thu, 8 Oct 2020 15:37:24 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Thu, 8 Oct 2020 15:37:18 +0200 Message-Id: <20201008133720.2894310-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.035 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. [userid.rs, self.data] Subject: [pbs-devel] [PATCH proxmox-backup 1/3] Userid: simplify comparison with str 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, 08 Oct 2020 13:37:25 -0000 Signed-off-by: Fabian Grünbichler --- src/api2/types/userid.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/api2/types/userid.rs b/src/api2/types/userid.rs index 3001b1d9..f0a61031 100644 --- a/src/api2/types/userid.rs +++ b/src/api2/types/userid.rs @@ -397,10 +397,7 @@ impl TryFrom for Userid { impl PartialEq for Userid { fn eq(&self, rhs: &str) -> bool { - rhs.len() > self.name_len + 2 // make sure range access below is allowed - && rhs.starts_with(self.name().as_str()) - && rhs.as_bytes()[self.name_len] == b'@' - && &rhs[(self.name_len + 1)..] == self.realm().as_str() + self.data == *rhs } } -- 2.20.1