Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/163'

Browse Source 
* origin/pr/163:
  init/functions: better not use ipcalc which is not present on minimal distro
  Handle errors for non-present ip gateways
  Better use '-z' and '-n' for readibility
  init/functions: handle non-present /qubes-mac qubesdb and check if iface exists
  configure_network: use classical function parsing
  Handle legacy non-present /qubes-mac qubesdb entry
  Refactor and handle new network qubesdb configuration
This commit is contained in:
Marek Marczykowski-Górecki 2019-06-25 04:27:06 +02:00
commit ba702a0fd6
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
5 changed files with 202 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
init/functions
View File

@ -131,7 +131,7 @@ umount_retry() {
get_mac_from_iface() { get_mac_from_iface() {
local iface="$1" local iface="$1"
local mac local mac
if [ "x$iface" != "x" ]; then if [ "x$iface" != "x" ] && [ -e "/sys/class/net/$iface" ]; then
mac="$(cat "/sys/class/net/$iface/address")" mac="$(cat "/sys/class/net/$iface/address")"
fi fi
echo "$mac" echo "$mac"
@ -149,7 +149,7 @@ get_iface_from_mac() {
get_qubes_managed_iface() { get_qubes_managed_iface() {
local mac local mac
local qubes_iface local qubes_iface
mac="$(qubesdb-read /qubes-mac)" mac="$(qubesdb-read /qubes-mac 2> /dev/null)"
qubes_iface="$(get_iface_from_mac "$mac")" qubes_iface="$(get_iface_from_mac "$mac")"
if [ "x$qubes_iface" != "x" ]; then if [ "x$qubes_iface" != "x" ]; then
echo "$qubes_iface" echo "$qubes_iface"
@ -158,6 +158,21 @@ get_qubes_managed_iface() {
fi fi
} }
# Based on: https://forums.gentoo.org/viewtopic-t-888736-start-0.html
get_prefix_from_subnet() {
local subnet="$1"
local x=${subnet##*255.}
set -- 0^^^128^192^224^240^248^252^254^ $(( (${#1} - ${#x})*2 )) "${x%%.*}"
x=${1%%$3*}
prefix=$(( $2 + (${#x}/4) ))
if [ "x$prefix" != "x" ]; then
echo "$prefix"
else
echo "32"
fi
}
initialize_home() { initialize_home() {
local home_root local home_root
local mode local mode

2
network/network-manager-prepare-conf-dir
View File

@ -24,7 +24,9 @@ sed -r -i -e "s/^#?plugins=.*/plugins=keyfile/" /etc/NetworkManager/NetworkManag
# starting NetworkManager, otherwise it will try default DHCP configuration # starting NetworkManager, otherwise it will try default DHCP configuration
# first and only after a timeout fallback to static one - introducing delay in # first and only after a timeout fallback to static one - introducing delay in
# network connectivity # network connectivity
ACTION="add"
INTERFACE="$(get_qubes_managed_iface)" INTERFACE="$(get_qubes_managed_iface)"
export ACTION
export INTERFACE export INTERFACE
if qubesdb-read /qubes-ip >/dev/null 2>/dev/null && if qubesdb-read /qubes-ip >/dev/null 2>/dev/null &&
[ -e "/sys/class/net/$INTERFACE" ] && [ -e "/sys/class/net/$INTERFACE" ] &&

194
network/setup-ip
View File

@ -1,38 +1,86 @@
#!/bin/sh #!/bin/bash
# Source Qubes library. # Source Qubes library.
# shellcheck disable=SC1091 # shellcheck disable=SC1091
. /usr/lib/qubes/init/functions . /usr/lib/qubes/init/functions
have_qubesdb || exit 0 configure_network() {
local MAC="$1"
local INTERFACE="$2"
local ip="$3"
local ip6="$4"
local netmask="$5"
local netmask6="$6"
local gateway="$7"
local gateway6="$8"
local primary_dns="$9"
local secondary_dns="${10}"
mac="$(/usr/bin/qubesdb-read /qubes-mac 2> /dev/null)" /sbin/ifconfig "$INTERFACE" "$ip" netmask "$netmask"
current_mac="$(get_mac_from_iface "$INTERFACE")" if [ -n "$ip6" ]; then
/sbin/ifconfig "$INTERFACE" add "$ip6/$netmask6"
fi
/sbin/ifconfig "$INTERFACE" up
if [ "$mac" = "$current_mac" ] || [ "x$mac" = "x" ] ; then if [ -n "$gateway" ]; then
ip="$(/usr/bin/qubesdb-read /qubes-ip 2> /dev/null)" /sbin/route add -host "$gateway" dev "$INTERFACE"
ip6="$(/usr/bin/qubesdb-read /qubes-ip6 2> /dev/null)" if [ -n "$gateway6" ] && ! echo "$gateway6" | grep -q "^fe80:"; then
if [ "x$ip" != x ]; then /sbin/route -6 add "$gateway6/$netmask6" dev "$INTERFACE"
#netmask=$(/usr/bin/qubesdb-read /qubes-netmask) fi
gateway=$(/usr/bin/qubesdb-read /qubes-gateway) if ! qsvc disable-default-route ; then
gateway6=$(/usr/bin/qubesdb-read /qubes-gateway6) /sbin/route add default gw "$gateway"
primary_dns=$(/usr/bin/qubesdb-read /qubes-primary-dns 2>/dev/null || echo "$gateway") if [ -n "$gateway6" ]; then
secondary_dns=$(/usr/bin/qubesdb-read /qubes-secondary-dns) /sbin/route -6 add default gw "$gateway6" dev "$INTERFACE"
/sbin/ethtool -K "$INTERFACE" sg off fi
/sbin/ethtool -K "$INTERFACE" tx off fi
# If NetworkManager is enabled, let it configure the network fi
if qsvc network-manager ; then
if [ -z "$primary_dns" ] && [ -n "$gateway" ]; then
primary_dns="$gateway"
fi
if ! is_protected_file /etc/resolv.conf ; then
echo > /etc/resolv.conf
if ! qsvc disable-dns-server ; then
echo "nameserver $primary_dns" > /etc/resolv.conf
echo "nameserver $secondary_dns" >> /etc/resolv.conf
fi
fi
}
configure_network_nm() {
local MAC="$1"
local INTERFACE="$2"
local ip="$3"
local ip6="$4"
local netmask="$5"
local netmask6="$6"
local gateway="$7"
local gateway6="$8"
local primary_dns="$9"
local secondary_dns="${10}"
local prefix
local prefix6
local nm_config
local ip4_nm_config
local ip6_nm_config
local uuid
prefix="$(get_prefix_from_subnet "$netmask")"
prefix6="$netmask6"
uuid="de85f79b-8c3d-405f-a652-${MAC//:/}"
nm_config="/etc/NetworkManager/system-connections/qubes-uplink-$INTERFACE" nm_config="/etc/NetworkManager/system-connections/qubes-uplink-$INTERFACE"
cat > "$nm_config" <<__EOF__ cat > "$nm_config" <<__EOF__
[802-3-ethernet] [802-3-ethernet]
duplex=full duplex=full
[ethernet] [ethernet]
mac-address=$(ip l show dev "$INTERFACE" |grep link|awk '{print $2}') mac-address=$MAC
[connection] [connection]
id=VM uplink $INTERFACE id=VM uplink $INTERFACE
uuid=de85f79b-8c3d-405f-a652-cb4c10b4f9ef uuid=$uuid
type=802-3-ethernet type=802-3-ethernet
__EOF__ __EOF__
ip4_nm_config="" ip4_nm_config=""
@ -43,17 +91,17 @@ dns=${primary_dns};${secondary_dns}"
fi fi
if ! qsvc disable-default-route ; then if ! qsvc disable-default-route ; then
ip4_nm_config="${ip4_nm_config} ip4_nm_config="${ip4_nm_config}
addresses1=$ip;32;$gateway" addresses1=$ip;$prefix;$gateway"
if [ -n "$ip6" ]; then if [ -n "$ip6" ]; then
ip6_nm_config="${ip6_nm_config} ip6_nm_config="${ip6_nm_config}
addresses1=$ip6;128;$gateway6" addresses1=$ip6;$prefix6;$gateway6"
fi fi
else else
ip4_nm_config="${ip4_nm_config} ip4_nm_config="${ip4_nm_config}
addresses1=$ip;32" addresses1=$ip;$prefix"
if [ -n "$ip6" ]; then if [ -n "$ip6" ]; then
ip6_nm_config="${ip6_nm_config} ip6_nm_config="${ip6_nm_config}
addresses1=$ip6;128" addresses1=$ip6;$prefix6"
fi fi
fi fi
if [ -n "$ip4_nm_config" ]; then if [ -n "$ip4_nm_config" ]; then
@ -87,33 +135,9 @@ __EOF__
chmod 600 "$nm_config" chmod 600 "$nm_config"
# reload connection # reload connection
nmcli connection load "$nm_config" || : nmcli connection load "$nm_config" || :
else }
# No NetworkManager enabled, configure the network manually
/sbin/ifconfig "$INTERFACE" "$ip" netmask 255.255.255.255 configure_qubes_ns() {
if [ -n "$ip6" ]; then
/sbin/ifconfig "$INTERFACE" add "$ip6"/128
fi
/sbin/ifconfig "$INTERFACE" up
/sbin/route add -host "$gateway" dev "$INTERFACE"
if [ -n "$gateway6" ] && ! echo "$gateway6" | grep -q "^fe80:"; then
/sbin/route -6 add "$gateway6/128" dev "$INTERFACE"
fi
if ! qsvc disable-default-route ; then
/sbin/route add default gw "$gateway"
if [ -n "$gateway6" ]; then
/sbin/route -6 add default gw "$gateway6" dev "$INTERFACE"
fi
fi
if ! is_protected_file /etc/resolv.conf ; then
echo > /etc/resolv.conf
if ! qsvc disable-dns-server ; then
echo "nameserver $primary_dns" > /etc/resolv.conf
echo "nameserver $secondary_dns" >> /etc/resolv.conf
fi
fi
fi
network=$(qubesdb-read /qubes-netvm-network 2>/dev/null)
if [ "x$network" != "x" ] && ! qsvc disable-dns-server ; then
gateway=$(qubesdb-read /qubes-netvm-gateway) gateway=$(qubesdb-read /qubes-netvm-gateway)
#netmask=$(qubesdb-read /qubes-netvm-netmask) #netmask=$(qubesdb-read /qubes-netvm-netmask)
primary_dns=$(qubesdb-read /qubes-netvm-primary-dns 2>/dev/null || echo "$gateway") primary_dns=$(qubesdb-read /qubes-netvm-primary-dns 2>/dev/null || echo "$gateway")
@ -121,8 +145,9 @@ __EOF__
echo "NS1=$primary_dns" > /var/run/qubes/qubes-ns echo "NS1=$primary_dns" > /var/run/qubes/qubes-ns
echo "NS2=$secondary_dns" >> /var/run/qubes/qubes-ns echo "NS2=$secondary_dns" >> /var/run/qubes/qubes-ns
/usr/lib/qubes/qubes-setup-dnat-to-ns /usr/lib/qubes/qubes-setup-dnat-to-ns
fi }
if [ "x$network" != "x" ]; then
qubes_ip_change_hook() {
if [ -x /rw/config/qubes-ip-change-hook ]; then if [ -x /rw/config/qubes-ip-change-hook ]; then
/rw/config/qubes-ip-change-hook /rw/config/qubes-ip-change-hook
fi fi
@ -130,6 +155,71 @@ __EOF__
if [ -x /rw/config/qubes_ip_change_hook ]; then if [ -x /rw/config/qubes_ip_change_hook ]; then
/rw/config/qubes_ip_change_hook /rw/config/qubes_ip_change_hook
fi fi
}
have_qubesdb || exit 0
if [ -n "$INTERFACE" ]; then
if [ "$ACTION" == "add" ]; then
MAC="$(get_mac_from_iface "$INTERFACE")"
if [ -n "$MAC" ]; then
ip="$(/usr/bin/qubesdb-read "/net-config/$MAC/ip" 2> /dev/null)"
ip6="$(/usr/bin/qubesdb-read "/net-config/$MAC/ip6" 2> /dev/null)"
netmask="$(/usr/bin/qubesdb-read "/net-config/$MAC/netmask" 2> /dev/null)"
netmask6="$(/usr/bin/qubesdb-read "/net-config/$MAC/netmask6" 2> /dev/null)"
gateway="$(/usr/bin/qubesdb-read "/net-config/$MAC/gateway" 2> /dev/null)"
gateway6="$(/usr/bin/qubesdb-read "/net-config/$MAC/gateway6" 2> /dev/null)"
# Handle legacy values
LEGACY_MAC="$(/usr/bin/qubesdb-read /qubes-mac 2> /dev/null)"
if [ "$MAC" == "$LEGACY_MAC" ] || [ -z "$LEGACY_MAC" ]; then
if [ -z "$ip" ]; then
ip="$(/usr/bin/qubesdb-read /qubes-ip 2> /dev/null)"
fi
if [ -z "$ip6" ]; then
ip6="$(/usr/bin/qubesdb-read /qubes-ip6 2> /dev/null)"
fi
if [ -z "$gateway" ]; then
gateway="$(/usr/bin/qubesdb-read /qubes-gateway 2> /dev/null)"
fi
if [ -z "$gateway6" ]; then
gateway6="$(/usr/bin/qubesdb-read /qubes-gateway6 2> /dev/null)"
fi
fi
if [ -z "$netmask" ]; then
netmask="255.255.255.255"
fi
if [ -z "$netmask6" ]; then
netmask6="128"
fi
primary_dns=$(/usr/bin/qubesdb-read /qubes-primary-dns 2>/dev/null)
secondary_dns=$(/usr/bin/qubesdb-read /qubes-secondary-dns 2>/dev/null)
if [ -n "$ip" ]; then
/sbin/ethtool -K "$INTERFACE" sg off
/sbin/ethtool -K "$INTERFACE" tx off
# If NetworkManager is enabled, let it configure the network
if qsvc network-manager ; then
configure_network_nm "$MAC" "$INTERFACE" "$ip" "$ip6" "$netmask" "$netmask6" "$gateway" "$gateway6" "$primary_dns" "$secondary_dns"
else
configure_network "$MAC" "$INTERFACE" "$ip" "$ip6" "$netmask" "$netmask6" "$gateway" "$gateway6" "$primary_dns" "$secondary_dns"
fi
network=$(qubesdb-read /qubes-netvm-network 2>/dev/null)
if [ -n "$network" ]; then
if ! qsvc disable-dns-server; then
configure_qubes_ns
fi
qubes_ip_change_hook
fi fi
fi fi
fi fi
elif [ "$ACTION" == "remove" ]; then
# If exists, we delete NetworkManager configuration file to prevent duplicate entries
nm_config="/etc/NetworkManager/system-connections/qubes-uplink-$INTERFACE"
rm -rf "$nm_config"
fi
fi

2
network/udev-qubes-network.rules
View File

@ -1,5 +1,5 @@
# old udev has ENV{ID_NET_DRIVER} # old udev has ENV{ID_NET_DRIVER}
SUBSYSTEMS=="xen", KERNEL=="eth*", ACTION=="add", ENV{ID_NET_DRIVER}=="vif", RUN+="/usr/lib/qubes/setup-ip" SUBSYSTEMS=="xen", KERNEL=="eth*", ACTION=="add", ENV{ID_NET_DRIVER}=="vif", RUN+="/usr/lib/qubes/setup-ip"
SUBSYSTEMS=="net", KERNEL=="eth*", ACTION=="remove", ENV{ID_NET_DRIVER}=="vif", RUN+="/usr/lib/qubes/setup-ip"
# new udev has DRIVERS # new udev has DRIVERS
SUBSYSTEMS=="xen", KERNEL=="eth*", ACTION=="add", DRIVERS=="vif", RUN+="/usr/lib/qubes/setup-ip" SUBSYSTEMS=="xen", KERNEL=="eth*", ACTION=="add", DRIVERS=="vif", RUN+="/usr/lib/qubes/setup-ip"

2
vm-systemd/misc-post.sh
View File

@ -17,7 +17,7 @@ fi
# qubesdb-read fails # qubesdb-read fails
QUBES_MANAGED_IFACE="$(get_qubes_managed_iface)" QUBES_MANAGED_IFACE="$(get_qubes_managed_iface)"
if [ "x$QUBES_MANAGED_IFACE" != "x" ]; then if [ "x$QUBES_MANAGED_IFACE" != "x" ]; then
INTERFACE="$QUBES_MANAGED_IFACE" /usr/lib/qubes/setup-ip INTERFACE="$QUBES_MANAGED_IFACE" ACTION="add" /usr/lib/qubes/setup-ip
fi fi
if [ -x /rw/config/rc.local ] ; then if [ -x /rw/config/rc.local ] ; then