Git-Mirrors/qusal
1
0
Fork 0
mirror of https://github.com/ben-grande/qusal.git synced 2024-10-01 02:35:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: shell syntax typos

Browse Source
This commit is contained in:
Ben Grande 2024-07-15 10:08:19 +02:00
parent 04d1aaf63e
commit cf432651b3
No known key found for this signature in database
GPG Key ID: 00C64E14F51F9E56
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
salt/dom0/files/bin/qvm-port-forward
View File

@ -76,7 +76,7 @@ get_rule_handle(){
qube="${1}" qube="${1}"
chain="${2}" chain="${2}"
rule="${3}" rule="${3}"
run_qube "${qube}" -- \ run_qube "${qube}" \
"nft --handle --stateless list chain ip qubes ${chain} | "nft --handle --stateless list chain ip qubes ${chain} |
tr -d '\"' | grep '^\s\+${rule} # handle ' | awk '{print \$NF}' | tr -d '\"' | grep '^\s\+${rule} # handle ' | awk '{print \$NF}' |
tr '\n' ' '" 2>/dev/null tr '\n' ' '" 2>/dev/null
@ -111,8 +111,8 @@ forward() {
unset dev unset dev
## TODO: Handle multiple interfaces in upstream. ## TODO: Handle multiple interfaces in upstream.
untrusted_dev="$(run_qube "${from_qube}" ip -4 route \ untrusted_dev="$(run_qube "${from_qube}" ip -4 route | \
| awk '/^default via /{print $5}' | head -1)" awk '/^default via /{print $5}' | head -1)"
validate_dev "${from_qube}" "${untrusted_dev}" validate_dev "${from_qube}" "${untrusted_dev}"
dev="${untrusted_dev}" dev="${untrusted_dev}"
@ -139,7 +139,8 @@ forward() {
forward_rule="${forward_rule} dport ${port} ct state" forward_rule="${forward_rule} dport ${port} ct state"
forward_rule="${forward_rule} established,related,new counter accept" forward_rule="${forward_rule} established,related,new counter accept"
dnat_policy="type nat hook prerouting priority filter +1; policy accept;" dnat_policy="type nat hook prerouting priority filter +1; policy accept;"
full_rule="nft 'add chain ip qubes ${dnat_chain} { ${dnat_policy} dnat_policy="{ ${dnat_policy} }"
full_rule="nft 'add chain ip qubes ${dnat_chain} ${dnat_policy}
add rule ip qubes ${dnat_chain} ${dnat_rule} add rule ip qubes ${dnat_chain} ${dnat_rule}
add rule ip qubes ${forward_chain} ${forward_rule}'" add rule ip qubes ${forward_chain} ${forward_rule}'"
@ -239,8 +240,8 @@ get_lan(){
unset dev unset dev
## TODO: Handle multiple interfaces in upstream. ## TODO: Handle multiple interfaces in upstream.
untrusted_dev="$(run_qube "${qube}" ip -4 route \ untrusted_dev="$(run_qube "${qube}" ip -4 route | \
| awk '/^default via /{print $5}' | head -1)" awk '/^default via /{print $5}' | head -1)"
validate_dev "${qube}" "${untrusted_dev}" validate_dev "${qube}" "${untrusted_dev}"
dev="${untrusted_dev}" dev="${untrusted_dev}"
@ -337,7 +338,7 @@ check_opt(){
exit 1 exit 1
fi fi
if ! qvm-check "${target_qube}" >/dev/null 2>&1; then if ! qvm-check -- "${target_qube}" >/dev/null 2>&1; then
echo "error: qube '${target_qube}' not found." >&2 echo "error: qube '${target_qube}' not found." >&2
exit 1 exit 1
fi fi

2
scripts/setup.sh
View File

@ -7,7 +7,7 @@
set -eu set -eu
# shellcheck disable=3028 # shellcheck disable=3028
hostname="$(hostname)}" hostname="$(hostname)"
test "${hostname}" = "dom0" || { echo "Must be run from dom0" >&2; exit 1; } test "${hostname}" = "dom0" || { echo "Must be run from dom0" >&2; exit 1; }
uid="$(id -u)" uid="$(id -u)"
test "${uid}" = "0" || exec sudo "${0}" test "${uid}" = "0" || exec sudo "${0}"