Signed-off-by: Wolfgang Bumiller <w.bumil...@proxmox.com>
---
src/PVE/JSONSchema.pm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm
index db38d44..3712872 100644
--- a/src/PVE/JSONSchema.pm
+++ b/src/PVE/JSONSchema.pm
@@ -530,6 +530,30 @@
PVE::JSONSchema::register_standard_option('pve-startup-order', {
typetext => '[[order=]\d+] [,up=\d+] [,down=\d+] ',
});
+register_format('pve-tfa-secret', \&pve_verify_tfa_secret);
+sub pve_verify_tfa_secret {
+ my ($key, $noerr) = @_;
+
+ # The old format used 16 base32 chars or 40 hex digits. Since they have a
common subset it's
+ # hard to distinguish them without the our previous length constraints, so
add a 'v2' of the
+ # format to support arbitrary lengths properly:
+ if ($key =~ /^v2-0x[0-9a-fA-F]{16,128}$/ || # hex
+ $key =~ /^v2-[A-Z2-7=]{16,128}$/ || # base32
+ $key =~ /^(?:[A-Z2-7=]{16}|[A-Fa-f0-9]{40})$/) # and the old pattern
copy&pasted
+ {
+ return $key;
+ }
+
+ return undef if $noerr;
+
+ die "unable to decode TFA secret\n";
+}
+
+register_standard_option('pve-tfa-secret', {
+ description => "A TFA secret, base32 encoded or hexadecimal.",
+ type => 'string', format => 'pve-tfa-secret',
+});
+
sub check_format {
my ($format, $value, $path) = @_;
--
2.20.1
_______________________________________________
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
