From: Lukas Wagner <l.wagner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH proxmox-perl-rs v2 07/15] pve-rs: tfa: clippy: stripping a prefix manually
Date: Fri, 2 Aug 2024 14:25:34 +0200 [thread overview]
Message-ID: <20240802122542.221388-7-l.wagner@proxmox.com> (raw)
In-Reply-To: <20240802122542.221388-1-l.wagner@proxmox.com>
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
pve-rs/src/tfa.rs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pve-rs/src/tfa.rs b/pve-rs/src/tfa.rs
index 1054169..66dca3d 100644
--- a/pve-rs/src/tfa.rs
+++ b/pve-rs/src/tfa.rs
@@ -736,10 +736,10 @@ fn decode_old_oath_entry(
let key = unsafe { std::str::from_utf8_unchecked(key) };
// See PVE::OTP::oath_verify_otp
- let key = if key.starts_with("v2-0x") {
- hex::decode(&key[5..]).map_err(|_| format_err!("bad v2 hex key in oath entry"))?
- } else if key.starts_with("v2-") {
- base32::decode(base32::Alphabet::RFC4648 { padding: true }, &key[3..])
+ let key = if let Some(key) = key.strip_prefix("v2-0x") {
+ hex::decode(key).map_err(|_| format_err!("bad v2 hex key in oath entry"))?
+ } else if let Some(key) = key.strip_prefix("v2-") {
+ base32::decode(base32::Alphabet::RFC4648 { padding: true }, key)
.ok_or_else(|| format_err!("bad v2 base32 key in oath entry"))?
} else if key.len() == 16 {
base32::decode(base32::Alphabet::RFC4648 { padding: true }, key)
--
2.39.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2024-08-02 12:26 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-02 12:25 [pve-devel] [PATCH proxmox-perl-rs v2 01/15] pve-rs: tfa: clippy: unnecessary `pub(self)` Lukas Wagner
2024-08-02 12:25 ` [pve-devel] [PATCH proxmox-perl-rs v2 02/15] pve-rs: tfa: clippy: this function has too many arguments Lukas Wagner
2024-08-02 12:25 ` [pve-devel] [PATCH proxmox-perl-rs v2 03/15] pve-rs: tfa: clippy: question mark operator is useless here Lukas Wagner
2024-08-02 12:25 ` [pve-devel] [PATCH proxmox-perl-rs v2 04/15] pve-rs: tfa: clippy: borrowed expression impls the required traits Lukas Wagner
2024-08-02 12:25 ` [pve-devel] [PATCH proxmox-perl-rs v2 05/15] pve-rs: tfa: clippy: accessing first element with `.get(0)` Lukas Wagner
2024-08-02 12:25 ` [pve-devel] [PATCH proxmox-perl-rs v2 06/15] pve-rs: tfa: clippy: redundant slicing of the whole range Lukas Wagner
2024-08-02 12:25 ` Lukas Wagner [this message]
2024-08-02 12:25 ` [pve-devel] [PATCH proxmox-perl-rs v2 08/15] pmg-rs: tfa: clippy: unnecessary `pub(self)` Lukas Wagner
2024-08-02 12:25 ` [pve-devel] [PATCH proxmox-perl-rs v2 09/15] pmg-rs: tfa: clippy: question mark operator is useless here Lukas Wagner
2024-08-02 12:25 ` [pve-devel] [PATCH proxmox-perl-rs v2 10/15] pmg-rs: tfa: clippy: this function has too many arguments Lukas Wagner
2024-08-02 12:25 ` [pve-devel] [PATCH proxmox-perl-rs v2 11/15] pmg-rs: tfa: clippy: the borrowed expression implements the required traits Lukas Wagner
2024-08-02 12:25 ` [pve-devel] [PATCH proxmox-perl-rs v2 12/15] pmg-rs: tfa: clippy: useless conversion to the same type Lukas Wagner
2024-08-02 12:25 ` [pve-devel] [PATCH proxmox-perl-rs v2 13/15] pmg-rs: acme: clippy: reference is immediately deref'd by the compiler Lukas Wagner
2024-08-02 12:25 ` [pve-devel] [PATCH proxmox-perl-rs v2 14/15] pmg-rs: acme: simplify acount config saving Lukas Wagner
2024-08-02 12:25 ` [pve-devel] [PATCH proxmox-perl-rs v2 15/15] tree-wide: run cargo fmt Lukas Wagner
2024-08-07 11:54 ` [pve-devel] applied-series: [PATCH proxmox-perl-rs v2 01/15] pve-rs: tfa: clippy: unnecessary `pub(self)` Fabian Grünbichler
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=20240802122542.221388-7-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