wg-quick: pass on # comments to {Pre,Post}{Up,Down}

Currently commands in {Pre,Post}{Up,Down} are stripped of everything
starting with the first #, even if the # is escaped or in a string. This
patch leaves comment interpretation to the shell, as it can presumably
already handle the difference between comments and escaped #.

Signed-off-by: Robyn Kosching <robyn@kosching.me>
[Jason: massage commit message, port to other platforms]
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/src/wg-quick/darwin.bash b/src/wg-quick/darwin.bash
index c9381124c9379de92d8f17810b466253cddf2853..ed6aadaccf19fe634783a38aa4722be8782e2231 100755 (executable)
--- a/src/wg-quick/darwin.bash
+++ b/src/wg-quick/darwin.bash
@@ -62,6 +62,7 @@ parse_options() {
                stripped="${line%%\#*}"
                key="${stripped%%=*}"; key="${key##*([[:space:]])}"; key="${key%%*([[:space:]])}"
                value="${stripped#*=}"; value="${value##*([[:space:]])}"; value="${value%%*([[:space:]])}"
+               unstripped_value="${line#*=}"; unstripped_value="${unstripped_value##*([[:space:]])}"; unstripped_value="${unstripped_value%%*([[:space:]])}"
                [[ $key == "["* ]] && interface_section=0
                [[ $key == "[Interface]" ]] && interface_section=1
                if [[ $interface_section -eq 1 ]]; then
@@ -72,10 +73,10 @@ parse_options() {
                                [[ $v =~ (^[0-9.]+$)|(^.*:.*$) ]] && DNS+=( $v ) || DNS_SEARCH+=( $v )
                        done; continue ;;
                        Table) TABLE="$value"; continue ;;
-                       PreUp) PRE_UP+=( "$value" ); continue ;;
-                       PreDown) PRE_DOWN+=( "$value" ); continue ;;
-                       PostUp) POST_UP+=( "$value" ); continue ;;
-                       PostDown) POST_DOWN+=( "$value" ); continue ;;
+                       PreUp) PRE_UP+=( "$unstripped_value" ); continue ;;
+                       PreDown) PRE_DOWN+=( "$unstripped_value" ); continue ;;
+                       PostUp) POST_UP+=( "$unstripped_value" ); continue ;;
+                       PostDown) POST_DOWN+=( "$unstripped_value" ); continue ;;
                        SaveConfig) read_bool SAVE_CONFIG "$value"; continue ;;
                        esac
                fi

diff --git a/src/wg-quick/freebsd.bash b/src/wg-quick/freebsd.bash
index f72daf69c112cb0505fd4e10b8d184ca74b2442d..af5b174546fc59f9a6dbb90c8170e3bc0b25fe7f 100755 (executable)
--- a/src/wg-quick/freebsd.bash
+++ b/src/wg-quick/freebsd.bash
@@ -80,6 +80,7 @@ parse_options() {
                stripped="${line%%\#*}"
                key="${stripped%%=*}"; key="${key##*([[:space:]])}"; key="${key%%*([[:space:]])}"
                value="${stripped#*=}"; value="${value##*([[:space:]])}"; value="${value%%*([[:space:]])}"
+               unstripped_value="${line#*=}"; unstripped_value="${unstripped_value##*([[:space:]])}"; unstripped_value="${unstripped_value%%*([[:space:]])}"
                [[ $key == "["* ]] && interface_section=0
                [[ $key == "[Interface]" ]] && interface_section=1
                if [[ $interface_section -eq 1 ]]; then
@@ -90,10 +91,10 @@ parse_options() {
                                [[ $v =~ (^[0-9.]+$)|(^.*:.*$) ]] && DNS+=( $v ) || DNS_SEARCH+=( $v )
                        done; continue ;;
                        Table) TABLE="$value"; continue ;;
-                       PreUp) PRE_UP+=( "$value" ); continue ;;
-                       PreDown) PRE_DOWN+=( "$value" ); continue ;;
-                       PostUp) POST_UP+=( "$value" ); continue ;;
-                       PostDown) POST_DOWN+=( "$value" ); continue ;;
+                       PreUp) PRE_UP+=( "$unstripped_value" ); continue ;;
+                       PreDown) PRE_DOWN+=( "$unstripped_value" ); continue ;;
+                       PostUp) POST_UP+=( "$unstripped_value" ); continue ;;
+                       PostDown) POST_DOWN+=( "$unstripped_value" ); continue ;;
                        SaveConfig) read_bool SAVE_CONFIG "$value"; continue ;;
                        esac
                fi

diff --git a/src/wg-quick/linux.bash b/src/wg-quick/linux.bash
index acb015d567a02dccc36fd735465010b24482f90a..f56f6e4a53091d2ddc382379c71792ec93c884b3 100755 (executable)
--- a/src/wg-quick/linux.bash
+++ b/src/wg-quick/linux.bash
@@ -51,6 +51,7 @@ parse_options() {
                stripped="${line%%\#*}"
                key="${stripped%%=*}"; key="${key##*([[:space:]])}"; key="${key%%*([[:space:]])}"
                value="${stripped#*=}"; value="${value##*([[:space:]])}"; value="${value%%*([[:space:]])}"
+               unstripped_value="${line#*=}"; unstripped_value="${unstripped_value##*([[:space:]])}"; unstripped_value="${unstripped_value%%*([[:space:]])}"
                [[ $key == "["* ]] && interface_section=0
                [[ $key == "[Interface]" ]] && interface_section=1
                if [[ $interface_section -eq 1 ]]; then
@@ -61,10 +62,10 @@ parse_options() {
                                [[ $v =~ (^[0-9.]+$)|(^.*:.*$) ]] && DNS+=( $v ) || DNS_SEARCH+=( $v )
                        done; continue ;;
                        Table) TABLE="$value"; continue ;;
-                       PreUp) PRE_UP+=( "$value" ); continue ;;
-                       PreDown) PRE_DOWN+=( "$value" ); continue ;;
-                       PostUp) POST_UP+=( "$value" ); continue ;;
-                       PostDown) POST_DOWN+=( "$value" ); continue ;;
+                       PreUp) PRE_UP+=( "$unstripped_value" ); continue ;;
+                       PreDown) PRE_DOWN+=( "$unstripped_value" ); continue ;;
+                       PostUp) POST_UP+=( "$unstripped_value" ); continue ;;
+                       PostDown) POST_DOWN+=( "$unstripped_value" ); continue ;;
                        SaveConfig) read_bool SAVE_CONFIG "$value"; continue ;;
                        esac
                fi

diff --git a/src/wg-quick/openbsd.bash b/src/wg-quick/openbsd.bash
index b58ecf5cd7fa10c0f715e875ac1263e4e98c8af6..d12f70e1c222aa95c9de21ce2f7214cb6cf51532 100755 (executable)
--- a/src/wg-quick/openbsd.bash
+++ b/src/wg-quick/openbsd.bash
@@ -52,6 +52,7 @@ parse_options() {
                stripped="${line%%\#*}"
                key="${stripped%%=*}"; key="${key##*([[:space:]])}"; key="${key%%*([[:space:]])}"
                value="${stripped#*=}"; value="${value##*([[:space:]])}"; value="${value%%*([[:space:]])}"
+               unstripped_value="${line#*=}"; unstripped_value="${unstripped_value##*([[:space:]])}"; unstripped_value="${unstripped_value%%*([[:space:]])}"
                [[ $key == "["* ]] && interface_section=0
                [[ $key == "[Interface]" ]] && interface_section=1
                if [[ $interface_section -eq 1 ]]; then
@@ -62,10 +63,10 @@ parse_options() {
                                [[ $v =~ (^[0-9.]+$)|(^.*:.*$) ]] && DNS+=( $v ) || DNS_SEARCH+=( $v )
                        done; continue ;;
                        Table) TABLE="$value"; continue ;;
-                       PreUp) PRE_UP+=( "$value" ); continue ;;
-                       PreDown) PRE_DOWN+=( "$value" ); continue ;;
-                       PostUp) POST_UP+=( "$value" ); continue ;;
-                       PostDown) POST_DOWN+=( "$value" ); continue ;;
+                       PreUp) PRE_UP+=( "$unstripped_value" ); continue ;;
+                       PreDown) PRE_DOWN+=( "$unstripped_value" ); continue ;;
+                       PostUp) POST_UP+=( "$unstripped_value" ); continue ;;
+                       PostDown) POST_DOWN+=( "$unstripped_value" ); continue ;;
                        SaveConfig) read_bool SAVE_CONFIG "$value"; continue ;;
                        esac
                fi