X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=src%2FPVE%2FJSONSchema.pm;h=5beebd80139a1aacbb8ce6dfc34b9bfa50417eb2;hp=e392f5898612331464d582bb90a73846dd525821;hb=878fea8ef08496f4efd275e07c77bc55d90424b2;hpb=86425a09da0293652507ac16d6d1a30f62aba88f;ds=sidebyside diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm index e392f58..5beebd8 100644 --- a/src/PVE/JSONSchema.pm +++ b/src/PVE/JSONSchema.pm @@ -101,6 +101,11 @@ sub register_format { $format_list->{$format} = $code; } +sub get_format { + my ($format) = @_; + return $format_list->{$format}; +} + # register some common type for pve register_format('string', sub {}); # allow format => 'string-list' @@ -227,18 +232,62 @@ sub pve_verify_ipv4mask { return $mask; } -register_format('CIDR', \&pve_verify_cidr); -sub pve_verify_cidr { +register_format('CIDRv6', \&pve_verify_cidrv6); +sub pve_verify_cidrv6 { my ($cidr, $noerr) = @_; - if ($cidr =~ m!^(?:$IPV4RE)(?:/(\d+))$! && ($1 > 7) && ($1 < 32)) { + if ($cidr =~ m!^(?:$IPV6RE)(?:/(\d+))$! && ($1 > 7) && ($1 <= 120)) { return $cidr; - } elsif ($cidr =~ m!^(?:$IPV6RE)(?:/(\d+))$! && ($1 > 7) && ($1 <= 120)) { + } + + return undef if $noerr; + die "value does not look like a valid IPv6 CIDR network\n"; +} + +register_format('CIDRv4', \&pve_verify_cidrv4); +sub pve_verify_cidrv4 { + my ($cidr, $noerr) = @_; + + if ($cidr =~ m!^(?:$IPV4RE)(?:/(\d+))$! && ($1 > 7) && ($1 < 32)) { return $cidr; } return undef if $noerr; - die "value does not look like a valid CIDR network\n"; + die "value does not look like a valid IPv4 CIDR network\n"; +} + +register_format('CIDR', \&pve_verify_cidr); +sub pve_verify_cidr { + my ($cidr, $noerr) = @_; + + if (!(pve_verify_cidrv4($cidr, 1) || + pve_verify_cidrv6($cidr, 1))) + { + return undef if $noerr; + die "value does not look like a valid CIDR network\n"; + } + + return $cidr; +} + +register_format('pve-ipv4-config', \&pve_verify_ipv4_config); +sub pve_verify_ipv4_config { + my ($config, $noerr) = @_; + + return $config if $config =~ /^(?:dhcp|manual)$/ || + pve_verify_cidrv4($config, 1); + return undef if $noerr; + die "value does not look like a valid ipv4 network configuration\n"; +} + +register_format('pve-ipv6-config', \&pve_verify_ipv6_config); +sub pve_verify_ipv6_config { + my ($config, $noerr) = @_; + + return $config if $config =~ /^(?:auto|dhcp|manual)$/ || + pve_verify_cidrv6($config, 1); + return undef if $noerr; + die "value does not look like a valid ipv6 network configuration\n"; } register_format('email', \&pve_verify_email); @@ -352,8 +401,9 @@ PVE::JSONSchema::register_standard_option('pve-startup-order', { }); sub check_format { - my ($format, $value) = @_; + my ($format, $value, $path) = @_; + return parse_property_string($format, $value, $path) if ref($format) eq 'HASH'; return if $format eq 'regex'; if ($format =~ m/^(.*)-a?list$/) { @@ -383,10 +433,95 @@ sub check_format { die "undefined format '$format'\n" if !$code; + return parse_property_string($code, $value, $path) if ref($code) eq 'HASH'; &$code($value); } } +sub parse_size { + my ($value) = @_; + + return undef if $value !~ m/^(\d+(\.\d+)?)([KMGT])?$/; + my ($size, $unit) = ($1, $3); + if ($unit) { + if ($unit eq 'K') { + $size = $size * 1024; + } elsif ($unit eq 'M') { + $size = $size * 1024 * 1024; + } elsif ($unit eq 'G') { + $size = $size * 1024 * 1024 * 1024; + } elsif ($unit eq 'T') { + $size = $size * 1024 * 1024 * 1024 * 1024; + } + } + return int($size); +}; + +sub format_size { + my ($size) = @_; + + $size = int($size); + + my $kb = int($size/1024); + return $size if $kb*1024 != $size; + + my $mb = int($kb/1024); + return "${kb}K" if $mb*1024 != $kb; + + my $gb = int($mb/1024); + return "${mb}M" if $gb*1024 != $mb; + + my $tb = int($gb/1024); + return "${gb}G" if $tb*1024 != $gb; + + return "${tb}T"; +}; + +sub parse_property_string { + my ($format, $data, $path) = @_; + + my $default_key; + + my $res = {}; + foreach my $part (split(/,/, $data)) { + next if $part =~ /^\s*$/; + + if ($part =~ /^([^=]+)=(.+)$/) { + my ($k, $v) = ($1, $2); + die "duplicate key in comma-separated list property: $k" if defined($res->{$k}); + my $schema = $format->{$k}; + die "invalid key in comma-separated list property: $k" if !$schema; + if ($schema->{type} && $schema->{type} eq 'boolean') { + $v = 1 if $v =~ m/^(1|on|yes|true)$/i; + $v = 0 if $v =~ m/^(0|off|no|false)$/i; + } + $res->{$k} = $v; + } elsif ($part !~ /=/) { + die "duplicate key in comma-separated list property: $default_key" if $default_key; + foreach my $key (keys %$format) { + if ($format->{$key}->{default_key}) { + $default_key = $key; + if (!$res->{$default_key}) { + $res->{$default_key} = $part; + last; + } + die "duplicate key in comma-separated list property: $default_key"; + } + } + } else { + die "missing key in comma-separated list property"; + } + } + + my $errors = {}; + check_object($path, $format, $res, undef, $errors); + if (scalar(%$errors)) { + raise "format error", errors => $errors; + } + + return $res; +} + sub add_error { my ($errors, $path, $msg) = @_; @@ -639,7 +774,7 @@ sub check_prop { } else { if (my $format = $schema->{format}) { - eval { check_format($format, $value); }; + eval { check_format($format, $value, $path); }; if ($@) { add_error($errors, $path, "invalid format - $@"); return; @@ -826,10 +961,15 @@ my $default_schema_noref = { description => "indicates a required property or a schema that must be validated if this property is present", }, format => { - type => "string", + type => [ "string", "object" ], optional => 1, description => "This indicates what format the data is among some predefined formats which may include:\n\ndate - a string following the ISO format \naddress \nschema - a schema definition object \nperson \npage \nhtml - a string representing HTML", }, + default_key => { + type => "boolean", + optional => 1, + description => "Whether this is the default key in a comma separated list property string.", + }, default => { type => "any", optional => 1, @@ -1245,32 +1385,4 @@ sub dump_config { return $data; } -sub generate_typetext { - my ($schema) = @_; - my $typetext = ''; - my (@optional, @required); - foreach my $key (sort keys %$schema) { - next if !$schema->{$key}->{format_description}; - if ($schema->{$key}->{optional}) { - push @optional, $key; - } else { - push @required, $key; - } - } - my ($pre, $post) = ('', ''); - foreach my $key (@required) { - my $desc = $schema->{$key}->{format_description}; - $typetext .= "$pre$key=<$desc>$post"; - $pre = ', '; - } - $pre = ' [,' if $pre; - foreach my $key (@optional) { - my $desc = $schema->{$key}->{format_description}; - $typetext .= "$pre$key=<$desc>$post"; - $pre = ' [,'; - $post = ']'; - } - return $typetext; -} - 1;