X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=src%2FPVE%2FINotify.pm;h=2bb87bb2dd71e79057dcaa2da391316686e7bc23;hp=e224f78e71349e340c19d03a4bdde62bee676ed7;hb=9ca89b8722fb9656b5deaca037f0612aab3170e4;hpb=f48815f8b60163381a99c42be0f8e554a53d2677 diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm index e224f78..2bb87bb 100644 --- a/src/PVE/INotify.pm +++ b/src/PVE/INotify.pm @@ -1,28 +1,29 @@ package PVE::INotify; # todo: maybe we do not need update_file() ? - use strict; use warnings; -use POSIX; -use IO::File; -use IO::Dir; -use File::stat; -use File::Basename; +use Clone qw(clone); +use Digest::SHA; +use Encode qw(encode decode); use Fcntl qw(:DEFAULT :flock); -use PVE::SafeSyslog; +use File::Basename; +use File::stat; +use IO::Dir; +use IO::File; +use JSON; +use Linux::Inotify2; +use POSIX; + use PVE::Exception qw(raise_param_exc); +use PVE::JSONSchema; use PVE::Network; -use PVE::Tools; use PVE::ProcFSTools; -use PVE::JSONSchema; -use Clone qw(clone); -use Linux::Inotify2; +use PVE::SafeSyslog; +use PVE::Tools; + use base 'Exporter'; -use JSON; -use Digest::SHA; -use Encode qw(encode decode); our @EXPORT_OK = qw(read_file write_file register_file); @@ -312,7 +313,7 @@ sub parse_ccache_options { # noclone flag for large read-only data chunks like aplinfo $ccinfo->{$opt} = $v; } elsif ($opt eq 'always_call_parser') { - # when set, we call parser even when the file does not exists. + # when set, we call parser even when the file does not exist. # this allows the parser to return some default $ccinfo->{$opt} = $v; } else { @@ -872,6 +873,7 @@ sub __read_etc_network_interfaces { my $options = $config->{options} = []; my $options_alternatives = { + 'ovs_mtu' => 'mtu', 'bond-slaves' => 'slaves', 'bond_slaves' => 'slaves', 'bond-xmit-hash-policy' => 'bond_xmit_hash_policy', @@ -901,6 +903,7 @@ sub __read_etc_network_interfaces { SECTION: while (defined ($line = <$fh>)) { chomp ($line); next if $line =~ m/^\s*#/; + next if $line =~ m/^\s*(allow-hotplug)\s+(.*)$/; if ($line =~ m/^\s*(auto|allow-ovs)\s+(.*)$/) { my @aa = split (/\s+/, $2); @@ -920,7 +923,8 @@ sub __read_etc_network_interfaces { push @{$d->{families}}, $family; while (defined ($line = <$fh>)) { - chomp $line; + $line =~ s/\s+$//; # drop trailing whitespaces + if ($line =~ m/^\s*#(.*?)\s*$/) { $f->{comments} = '' if !$f->{comments}; my $comment = decode('UTF-8', $1); @@ -955,8 +959,11 @@ sub __read_etc_network_interfaces { 'bridge-multicast-flood' => 1, 'bond_miimon' => 1, 'bond_xmit_hash_policy' => 1, + 'bond-primary' => 1, 'uplink-id' => 1, 'vlan-protocol' => 1, + 'vlan-raw-device' => 1, + 'vlan-id' => 1, 'vxlan-id' => 1, 'vxlan-svcnodeip' => 1, 'vxlan-physdev' => 1, @@ -1028,6 +1035,7 @@ sub __read_etc_network_interfaces { foreach my $iface (keys %$ifaces) { my $d = $ifaces->{$iface}; + $d->{type} = 'unknown'; if ($iface =~ m/^bond\d+$/) { if (!$d->{ovs_type}) { $d->{type} = 'bond'; @@ -1047,8 +1055,6 @@ sub __read_etc_network_interfaces { } my $tag = &$extract_ovs_option($d, 'tag'); $d->{ovs_tag} = $tag if defined($tag); - } else { - $d->{type} = 'unknown'; } } elsif ($iface =~ m/^vmbr\d+$/) { if (!$d->{ovs_type}) { @@ -1062,8 +1068,6 @@ sub __read_etc_network_interfaces { } } elsif ($d->{ovs_type} eq 'OVSBridge') { $d->{type} = $d->{ovs_type}; - } else { - $d->{type} = 'unknown'; } } elsif ($iface =~ m/^(\S+):\d+$/) { $d->{type} = 'alias'; @@ -1073,12 +1077,14 @@ sub __read_etc_network_interfaces { $ifaces->{$1}->{exists} = 0; $d->{exists} = 0; } - } elsif ($iface =~ m/^(\S+)\.\d+$/) { + } elsif ($iface =~ m/^(\S+)\.\d+$/ || $d->{'vlan-raw-device'}) { $d->{type} = 'vlan'; - if (defined ($ifaces->{$1})) { - $d->{exists} = $ifaces->{$1}->{exists}; + + my $raw_iface = $d->{'vlan-raw-device'} ? $d->{'vlan-raw-device'} : $1; + if (defined ($ifaces->{$raw_iface})) { + $d->{exists} = $ifaces->{$raw_iface}->{exists}; } else { - $ifaces->{$1}->{exists} = 0; + $ifaces->{$raw_iface}->{exists} = 0; $d->{exists} = 0; } } elsif ($iface =~ m/^$PVE::Network::PHYSICAL_NIC_RE$/) { @@ -1088,47 +1094,49 @@ sub __read_etc_network_interfaces { $d->{type} = $d->{ovs_type}; my $tag = &$extract_ovs_option($d, 'tag'); $d->{ovs_tag} = $tag if defined($tag); - } else { - $d->{type} = 'unknown'; } } elsif ($iface =~ m/^lo$/) { $d->{type} = 'loopback'; } else { if ($d->{'vxlan-id'}) { $d->{type} = 'vxlan'; - } elsif (!$d->{ovs_type}) { - $d->{type} = 'unknown'; - } elsif ($d->{ovs_type} eq 'OVSIntPort') { - $d->{type} = $d->{ovs_type}; - my $tag = &$extract_ovs_option($d, 'tag'); - $d->{ovs_tag} = $tag if defined($tag); + } elsif (defined($d->{ovs_type})) { + if ($d->{ovs_type} eq 'OVSIntPort') { + $d->{type} = $d->{ovs_type}; + my $tag = &$extract_ovs_option($d, 'tag'); + $d->{ovs_tag} = $tag if defined($tag); + } } } # map address and netmask to cidr - if ($d->{address}) { - if ($d->{netmask} && $d->{netmask} =~ m/^\d+$/) { # e.g. netmask 20 - $d->{cidr} = $d->{address} . "/" . $d->{netmask}; - } elsif ($d->{netmask} && - (my $cidr = PVE::JSONSchema::get_netmask_bits($d->{netmask}))) { # e.g. netmask 255.255.255.0 - $d->{cidr} = $d->{address} . "/" . $cidr; - } elsif ($d->{address} =~ m!^(.*)/(\d+)$!) { - $d->{cidr} = $d->{address}; - $d->{address} = $1; - $d->{netmask} = $2; + if (my $addr = $d->{address}) { + if (_address_is_cidr($addr)) { + $d->{cidr} = $addr; + my ($baseaddr, $mask) = _cidr_split($addr); + $d->{address} = $baseaddr; + $d->{netmask} = $mask; + } elsif (my $cidr = _get_cidr($d->{address}, $d->{netmask})) { + $d->{cidr} = $cidr; + (undef, $d->{netmask}) = _cidr_split($cidr); } else { - $d->{cidr} = $d->{address}; + # no mask, else we'd got a cidr above + $d->{cidr} = $addr ."/32"; } } # map address6 and netmask6 to cidr6 - if ($d->{address6}) { - $d->{cidr6} = $d->{address6}; - if ($d->{netmask6}) { - $d->{cidr6} .= "/" . $d->{netmask6}; - } elsif ($d->{address6} =~ m!^(.*)/(\d+)$!) { - $d->{address6} = $1; - $d->{netmask6} = $2; + if (my $addr6 = $d->{address6}) { + if (_address_is_cidr($addr6)) { + $d->{cidr6} = $addr6; + my ($baseaddr, $mask) = _cidr_split($addr6); + $d->{address6} = $baseaddr; + $d->{netmask6} = $mask; + } elsif (my $cidr6 = _get_cidr($d->{address6}, $d->{netmask6})) { + $d->{cidr6} = $cidr6; + } else { + # no mask, else we'd got a cidr above + $d->{cidr6} = $addr6 ."/128"; } } @@ -1167,6 +1175,31 @@ sub __read_etc_network_interfaces { return $config; } +sub _address_is_cidr { + my ($addr) = @_; + return $addr =~ /\/\d+$/ ? 1 : 0; +} + +sub _cidr_split { + my ($cidr) = @_; + $cidr =~ /^(.+)\/(\d+)$/; + return ($1, $2); # (address, mask) +} + +sub _get_cidr { + my ($addr, $mask) = @_; + + return $addr if _address_is_cidr($addr); + return undef if !$mask; + + if ($mask =~ m/^\d+$/) { # cidr notation + return $addr . "/" . $mask; + } elsif (my $cidrmask = PVE::JSONSchema::get_netmask_bits($mask)) { + return $addr . "/" . $cidrmask; + } + return undef; +} + sub __interface_to_string { my ($iface, $d, $family, $first_block, $ifupdown2) = @_; @@ -1177,10 +1210,21 @@ sub __interface_to_string { my $raw = ''; $raw .= "iface $iface $family " . $d->{"method$suffix"} . "\n"; - $raw .= "\taddress " . $d->{"address$suffix"} . "\n" if $d->{"address$suffix"}; - $raw .= "\tnetmask " . $d->{"netmask$suffix"} . "\n" if $d->{"netmask$suffix"}; - $raw .= "\tgateway " . $d->{"gateway$suffix"} . "\n" if $d->{"gateway$suffix"}; - $raw .= "\tbroadcast " . $d->{"broadcast$suffix"} . "\n" if $d->{"broadcast$suffix"}; + + if (my $addr = $d->{"address$suffix"}) { + + if ($addr !~ /\/\d+$/ && $d->{"netmask$suffix"}) { + if ($d->{"netmask$suffix"} =~ m/^\d+$/) { + $addr .= "/" . $d->{"netmask$suffix"}; + } elsif (my $mask = PVE::JSONSchema::get_netmask_bits($d->{"netmask$suffix"})) { + $addr .= "/" . $mask; + } + } + + $raw .= "\taddress " . $addr . "\n"; + } + + $raw .= "\tgateway " . $d->{"gateway$suffix"} . "\n" if $d->{"gateway$suffix"}; my $done = { type => 1, priority => 1, method => 1, active => 1, exists => 1, comments => 1, autostart => 1, options => 1, @@ -1192,8 +1236,8 @@ sub __interface_to_string { # not printing out options } elsif ($d->{type} eq 'bridge') { - $d->{bridge_ports} =~ s/[;,\s]+/ /g; my $ports = $d->{bridge_ports} || 'none'; + $ports =~ s/[;,\s]+/ /g; $raw .= "\tbridge-ports $ports\n"; $done->{bridge_ports} = 1; @@ -1213,6 +1257,9 @@ sub __interface_to_string { $done->{bridge_vlan_aware} = 1; $done->{bridge_vids} = 1; + $raw .= "\tmtu $d->{mtu}\n" if $d->{mtu}; + $done->{mtu} = 1; + } elsif ($d->{type} eq 'bond') { $d->{slaves} =~ s/[;,\s]+/ /g; @@ -1233,6 +1280,15 @@ sub __interface_to_string { $raw .= "\tbond-xmit-hash-policy $d->{'bond_xmit_hash_policy'}\n"; } $done->{'bond_xmit_hash_policy'} = 1; + + if ($d->{'bond_mode'} && $d->{'bond_mode'} eq 'active-backup' && $d->{'bond-primary'}) { + $raw .= "\tbond-primary $d->{'bond-primary'}\n"; + } + $done->{'bond-primary'} = 1; + + $raw .= "\tmtu $d->{mtu}\n" if $d->{mtu}; + $done->{mtu} = 1; + } elsif ($d->{type} eq 'vlan') { die "$iface: wrong vlan-protocol $d->{'vlan-protocol'}\n" if $d->{'vlan-protocol'} && $d->{'vlan-protocol'} ne '802.1ad' && $d->{'vlan-protocol'} ne '802.1q'; @@ -1250,14 +1306,21 @@ sub __interface_to_string { } $done->{'vxlan-remoteip'} = 1; } + + $raw .= "\tmtu $d->{mtu}\n" if $d->{mtu}; + $done->{mtu} = 1; + } elsif ($d->{type} eq 'OVSBridge') { $raw .= "\tovs_type $d->{type}\n"; $done->{ovs_type} = 1; $raw .= "\tovs_ports $d->{ovs_ports}\n" if $d->{ovs_ports}; - $done->{ovs_ports} = 1; + + $raw .= "\tovs_mtu $d->{mtu}\n" if $d->{mtu}; + $done->{mtu} = 1; + } elsif ($d->{type} eq 'OVSPort' || $d->{type} eq 'OVSIntPort' || $d->{type} eq 'OVSBond') { @@ -1295,10 +1358,18 @@ sub __interface_to_string { $done->{ovs_type} = 1; if (my $bridge = $d->{ovs_bridge}) { - $raw = "allow-$bridge $iface\n$raw"; + if ($ifupdown2) { + $raw = "auto $iface\n$raw"; + } else { + $raw = "allow-$bridge $iface\n$raw"; + } + $raw .= "\tovs_bridge $bridge\n"; $done->{ovs_bridge} = 1; } + + $raw .= "\tovs_mtu $d->{mtu}\n" if $d->{mtu}; + $done->{mtu} = 1; } if ($first_block) { @@ -1328,7 +1399,7 @@ sub __interface_to_string { sub write_etc_network_interfaces { my ($filename, $fh, $config) = @_; - my $ifupdown2 = -e '/usr/share/ifupdown2'; + my $ifupdown2 = -e '/usr/share/ifupdown2/ifupdown2'; my $raw = __write_etc_network_interfaces($config, $ifupdown2); PVE::Tools::safe_print($filename, $fh, encode('UTF-8', $raw)); } @@ -1343,8 +1414,9 @@ sub __write_etc_network_interfaces { foreach my $iface (keys %$ifaces) { my $d = $ifaces->{$iface}; - delete $d->{cidr}; - delete $d->{cidr6}; + my ($cidr, $cidr6) = (delete $d->{cidr}, delete $d->{cidr6}); + $d->{address} //= $cidr; + $d->{address6} //= $cidr6; my $ports = ''; foreach my $k (qw(bridge_ports ovs_ports slaves ovs_bonds)) { @@ -1366,10 +1438,12 @@ sub __write_etc_network_interfaces { my $brname = $used_ports->{$iface}; if (!$brname || !$ifaces->{$brname}) { if ($iface =~ /^$PVE::Network::PHYSICAL_NIC_RE/) { - $ifaces->{$iface} = { type => 'eth', - exists => 1, - method => 'manual', - families => ['inet'] }; + $ifaces->{$iface} = { + type => 'eth', + exists => 1, + method => 'manual', + families => ['inet'], + }; } else { delete $ifaces->{$iface}; } @@ -1413,6 +1487,7 @@ sub __write_etc_network_interfaces { if ($d->{type} eq 'OVSBond' && $d->{ovs_bonds}) { foreach my $p (split (/\s+/, $d->{ovs_bonds})) { my $n = $ifaces->{$p}; + $n->{autostart} = 1; die "OVS bond '$iface' - unable to find slave '$p'\n" if !$n; die "OVS bond '$iface' - wrong interface type on slave '$p' " . @@ -1425,17 +1500,21 @@ sub __write_etc_network_interfaces { # check bond foreach my $iface (keys %$ifaces) { my $d = $ifaces->{$iface}; - if ($d->{type} eq 'bond' && $d->{slaves}) { - foreach my $p (split (/\s+/, $d->{slaves})) { - my $n = $ifaces->{$p}; + next if !($d->{type} eq 'bond' && $d->{slaves}); - die "bond '$iface' - unable to find slave '$p'\n" - if !$n; - die "bond '$iface' - wrong interface type on slave '$p' " . - "('$n->{type}' != 'eth')\n" if $n->{type} ne 'eth'; - &$check_mtu($ifaces, $iface, $p); - } + my $bond_primary_is_slave = undef; + foreach my $p (split (/\s+/, $d->{slaves})) { + my $n = $ifaces->{$p}; + $n->{autostart} = 1; + + die "bond '$iface' - unable to find slave '$p'\n" if !$n; + die "bond '$iface' - wrong interface type on slave '$p' ('$n->{type}' != 'eth or bond')\n" + if ($n->{type} ne 'eth' && $n->{type} ne 'bond'); + + $check_mtu->($ifaces, $iface, $p); + $bond_primary_is_slave = 1 if $d->{'bond-primary'} && $d->{'bond-primary'} eq $p; } + die "bond '$iface' - bond-primary interface is not a slave" if $d->{'bond-primary'} && !$bond_primary_is_slave; } # check vxlan @@ -1466,16 +1545,37 @@ sub __write_etc_network_interfaces { # check vlan foreach my $iface (keys %$ifaces) { my $d = $ifaces->{$iface}; - if ($d->{type} eq 'vlan' && $iface =~ m/^(\S+)\.\d+$/) { - my $p = $1; + if ($d->{type} eq 'vlan') { + + my $p = undef; + my $vlanid = undef; + + if ($iface =~ m/^(\S+)\.(\d+)$/) { + $p = $1; + $vlanid = $2; + delete $d->{'vlan-raw-device'} if $d->{'vlan-raw-device'}; + delete $d->{'vlan-id'} if $d->{'vlan-id'}; + + } else { + die "missing vlan-raw-device option" if !$d->{'vlan-raw-device'}; + $p = $d->{'vlan-raw-device'}; + + if ($iface =~ m/^vlan(\d+)$/) { + $vlanid = $1; + delete $d->{'vlan-id'} if $d->{'vlan-id'}; + } else { + die "custom vlan interface name need ifupdown2" if !$ifupdown2; + die "missing vlan-id option" if !$d->{'vlan-id'}; + $vlanid = $d->{'vlan-id'}; + } + } my $n = $ifaces->{$p}; + die "vlan '$iface' - vlan-id $vlanid should be <= 4094\n" if $vlanid > 4094; die "vlan '$iface' - unable to find parent '$p'\n" if !$n; - if ($n->{type} eq 'bridge' && !$n->{bridge_vlan_aware}) { - die "vlan '$iface' - bridge vlan aware is not enabled on parent '$p'\n"; - } elsif ($n->{type} ne 'eth' && $n->{type} ne 'bridge' && $n->{type} ne 'bond' && $n->{type} ne 'vlan') { + if ($n->{type} ne 'eth' && $n->{type} ne 'bridge' && $n->{type} ne 'bond' && $n->{type} ne 'vlan') { die "vlan '$iface' - wrong interface type on parent '$p' " . "('$n->{type}' != 'eth|bond|bridge|vlan' )\n"; } @@ -1503,15 +1603,26 @@ sub __write_etc_network_interfaces { # check bridgeport option my $bridgeports = {}; my $bridges = {}; - foreach my $iface (keys %$ifaces) { - my $d = $ifaces->{$iface}; + my $ifaces_copy = { %$ifaces }; + foreach my $iface (keys %$ifaces_copy) { + my $d = $ifaces_copy->{$iface}; if ($d->{type} eq 'bridge') { - foreach my $p (split (/\s+/, $d->{bridge_ports})) { - $p =~ s/\.\d+$//; - my $n = $ifaces->{$p}; - die "bridge '$iface' - unable to find bridge port '$p'\n" - if !$n; - &$check_mtu($ifaces, $iface, $p); + foreach my $p (split (/\s+/, $d->{bridge_ports} // '')) { + if($p =~ m/(\S+)\.(\d+)$/) { + my $vlanparent = $1; + if (!defined($ifaces_copy->{$p})) { + $ifaces_copy->{$p}->{type} = 'vlan'; + $ifaces_copy->{$p}->{method} = 'manual'; + $ifaces_copy->{$p}->{method6} = 'manual'; + $ifaces_copy->{$p}->{mtu} = $ifaces_copy->{$vlanparent}->{mtu} if defined($ifaces_copy->{$1}->{mtu}); + } + } + my $n = $ifaces_copy->{$p}; + die "bridge '$iface' - unable to find bridge port '$p'\n" if !$n; + die "iface $p - ip address can't be set on interface if bridged in $iface\n" + if ($n->{method} && $n->{method} eq 'static' && $n->{address} ne '0.0.0.0') || + ($n->{method6} && $n->{method6} eq 'static' && $n->{address6} ne '::'); + &$check_mtu($ifaces_copy, $p, $iface); $bridgeports->{$p} = $iface; } $bridges->{$iface} = $d; @@ -1551,11 +1662,13 @@ NETWORKDOC loopback => 100000, eth => 200000, OVSPort => 200000, - OVSIntPort => 200000, - bond => 300000, - bridge => 400000, - OVSBridge => 400000, - vxlan => 500000, + OVSIntPort => 300000, + OVSBond => 400000, + bond => 400000, + bridge => 500000, + OVSBridge => 500000, + vlan => 600000, + vxlan => 600000, }; my $lookup_type_prio = sub { @@ -1563,12 +1676,10 @@ NETWORKDOC my ($rootiface, @rest) = split(/[.:]/, $iface); my $childlevel = scalar(@rest); - my $n = $ifaces->{$rootiface}; - - my $pri = $if_type_hash->{$n->{type}} + $childlevel - if $n->{type} && $n->{type} ne 'unknown'; + my $type = $ifaces->{$rootiface}->{type}; + return if !$type || $type eq 'unknown'; - return $pri; + return $if_type_hash->{$type} + $childlevel }; foreach my $iface (sort { @@ -1600,7 +1711,7 @@ NETWORKDOC $printed->{$iface} = 1; if ($d->{autostart}) { - if ($d->{type} eq 'OVSBridge') { + if ($d->{type} eq 'OVSBridge' && !$ifupdown2) { # cannot use 'auto' for OVS, would add race with systemd ifup@.service $raw .= "allow-ovs $iface\n"; } else { @@ -1669,8 +1780,11 @@ my $format_apt_auth_data = sub { my $raw = ''; - foreach my $machine (sort keys %$data) { + # sort longer entries first, so machine definitions with higher granularity are preferred + for my $machine (sort { length($b) <=> length($a) || $a cmp $b} keys %$data) { my $d = $data->{$machine}; + next if !defined($d); # allow "deleting" set entries + $raw .= "machine $machine\n"; $raw .= " login $d->{login}\n" if $d->{login}; $raw .= " password $d->{password}\n" if $d->{password}; @@ -1683,7 +1797,7 @@ my $format_apt_auth_data = sub { sub write_apt_auth { my ($filename, $fh, $data) = @_; - my $raw = &$format_apt_auth_data($data); + my $raw = $format_apt_auth_data->($data); die "write failed: $!" unless print $fh "$raw\n"; @@ -1699,11 +1813,16 @@ sub update_apt_auth { $orig->{$machine} = $data->{$machine}; } - return &$format_apt_auth_data($orig); + return $format_apt_auth_data->($orig); } -register_file('apt-auth', "/etc/apt/auth.conf", - \&read_apt_auth, \&write_apt_auth, - \&update_apt_auth, perm => 0640); +register_file( + 'apt-auth', + "/etc/apt/auth.conf", + \&read_apt_auth, + \&write_apt_auth, + \&update_apt_auth, + perm => 0640, +); 1;