From 9efcf913e7c2017f6e54f7505acb69afab39954b Mon Sep 17 00:00:00 2001 From: Jason Mehring Date: Sun, 9 Nov 2014 12:52:35 -0500 Subject: [PATCH 1/9] debian: Modified template install script to read better --- create_template_list.sh | 71 ++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 33 deletions(-) diff --git a/create_template_list.sh b/create_template_list.sh index 2ede209..7d4fb07 100755 --- a/create_template_list.sh +++ b/create_template_list.sh @@ -1,48 +1,53 @@ #!/bin/bash +# vim: set ts=4 sw=4 sts=4 et : # # Creates a small script to copy to dom0 to retrieve the generated template rpm's # -TEMPLATES="./rpm/install-templates.sh" - -write() { - echo "$1" >> "$TEMPLATES" -} - -if [ -x /usr/sbin/xenstore-read ]; then - XENSTORE_READ="/usr/sbin/xenstore-read" -else - XENSTORE_READ="/usr/bin/xenstore-read" -fi - -TEMPLATES="$(readlink -m $TEMPLATES)" -VERSION="-$(cat ./version)" +template_dir="$(readlink -m ./rpm/install-templates.sh)" +files=( $(ls rpm/noarch) ) name=$($XENSTORE_READ name) -path="$(readlink -m .)" -files=$(ls rpm/noarch) -# -# Write to install-templates -# +# ----------------------------------------------------------------------------- +# Write $vars +# ----------------------------------------------------------------------------- +cat << EOF > "${template_dir}" +#!/bin/bash -echo "#!/bin/bash" > "$TEMPLATES" -write "" +# Use the following command in DOM0 to retreive this file: +# qvm-run --pass-io ${name} 'cat ${template_dir}' > install-templates.sh + +files=" +$(printf "%s \n" ${files[@]}) +" + +path="$(readlink -m .)/rpm/noarch" +version="-$(cat ./version)" +EOF + +# ----------------------------------------------------------------------------- +# Write installation function +# ----------------------------------------------------------------------------- +cat << 'EOF' >> "${template_dir}" for file in ${files[@]}; do - write "qvm-run --pass-io development-qubes 'cat ${path}/rpm/noarch/${file}' > ${file}" - write "" - write "sudo yum erase $(echo "$file" | sed -r "s/($VERSION).+$//")" - write "" - write "sudo yum install ${file}" - write "" - write "" + if [ ! -e ${file} ]; then + qvm-run --pass-io development-qubes "cat ${path}/${file}" > ${file} + fi + + sudo yum erase $(echo "${file}" | sed -r "s/(${version}).+$//") && { + sudo yum install ${file} && { + rm -f ${file} + } + } done - -write "# Use the following command in DOM0 to retreive this file:" -write "# qvm-run --pass-io $name 'cat ${TEMPLATES}' > install-templates.sh" - +EOF + +# ----------------------------------------------------------------------------- +# Display instructions +# ----------------------------------------------------------------------------- echo "Use the following command in DOM0 to retreive this file:" -echo "qvm-run --pass-io $name 'cat ${TEMPLATES}' > install-templates.sh" +echo "qvm-run --pass-io ${name} 'cat ${template_dir}' > install-templates.sh" From af189150c9e0f55c054d52b1db695673d8a590d2 Mon Sep 17 00:00:00 2001 From: Jason Mehring Date: Sun, 9 Nov 2014 12:53:07 -0500 Subject: [PATCH 2/9] debian: Whonix systemd overrides --- .../wheezy+whonix-gateway/files/.facl | 19 +++++++++++++------ .../system/qubes-whonix-firewall.service | 6 ++---- .../systemd/system/qubes-whonix-init.service | 13 +++++++++++++ .../system/qubes-whonix-network.service | 3 ++- .../lib/whonix/init/network-proxy-setup.sh | 5 +---- ...l-user-script => qubes-whonix-firewall.sh} | 0 .../lib/whonix/init/qubes-whonix-tor.service | 16 ++++++++++++++++ .../wheezy+whonix-workstation/files/.facl | 18 +++++++++--------- .../system/qubes-whonix-firewall.service | 6 ++---- .../systemd/system/qubes-whonix-init.service | 13 +++++++++++++ .../system/qubes-whonix-network.service | 3 ++- .../lib/whonix/init/network-proxy-setup.sh | 11 +---------- ...l-user-script => qubes-whonix-firewall.sh} | 0 .../wheezy+whonix/04_install_qubes_post.sh | 7 ++++++- 14 files changed, 80 insertions(+), 40 deletions(-) create mode 100644 scripts_debian/wheezy+whonix-gateway/files/lib/systemd/system/qubes-whonix-init.service rename scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/init/{qubes-firewall-user-script => qubes-whonix-firewall.sh} (100%) create mode 100644 scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/init/qubes-whonix-tor.service create mode 100644 scripts_debian/wheezy+whonix-workstation/files/lib/systemd/system/qubes-whonix-init.service rename scripts_debian/wheezy+whonix-workstation/files/usr/lib/whonix/init/{qubes-firewall-user-script => qubes-whonix-firewall.sh} (100%) diff --git a/scripts_debian/wheezy+whonix-gateway/files/.facl b/scripts_debian/wheezy+whonix-gateway/files/.facl index b580d19..f25a44e 100644 --- a/scripts_debian/wheezy+whonix-gateway/files/.facl +++ b/scripts_debian/wheezy+whonix-gateway/files/.facl @@ -40,6 +40,13 @@ user::rw- group::r-- other::r-- +# file: lib/systemd/system/qubes-whonix-init.service +# owner: root +# group: root +user::rw- +group::r-- +other::r-- + # file: etc # owner: root # group: root @@ -166,14 +173,14 @@ user::rwx group::r-x other::r-x -# file: usr/lib/whonix/whonix.sh +# file: usr/lib/whonix/init # owner: root # group: root user::rwx group::r-x other::r-x -# file: usr/lib/whonix/init +# file: usr/lib/whonix/init/qubes-whonix-firewall.sh # owner: root # group: root user::rwx @@ -201,12 +208,12 @@ user::rwx group::r-x other::r-x -# file: usr/lib/whonix/init/qubes-firewall-user-script +# file: usr/lib/whonix/init/qubes-whonix-tor.service # owner: root # group: root -user::rwx -group::r-x -other::r-x +user::rw- +group::r-- +other::r-- # file: usr/lib/whonix/messages.yaml # owner: root diff --git a/scripts_debian/wheezy+whonix-gateway/files/lib/systemd/system/qubes-whonix-firewall.service b/scripts_debian/wheezy+whonix-gateway/files/lib/systemd/system/qubes-whonix-firewall.service index 649fe7a..89a5229 100644 --- a/scripts_debian/wheezy+whonix-gateway/files/lib/systemd/system/qubes-whonix-firewall.service +++ b/scripts_debian/wheezy+whonix-gateway/files/lib/systemd/system/qubes-whonix-firewall.service @@ -4,11 +4,9 @@ After=qubes-whonix-network.service Before=network.target [Service] -Type=oneshot -RemainAfterExit=yes -ExecStartPre=/usr/lib/whonix/init/init.sh -ExecStart=/usr/lib/whonix/init/qubes-firewall-user-script +ExecStart=/usr/lib/whonix/init/qubes-whonix-firewall.sh StandardOutput=syslog [Install] WantedBy=multi-user.target +Alias=qubes-firewall.service diff --git a/scripts_debian/wheezy+whonix-gateway/files/lib/systemd/system/qubes-whonix-init.service b/scripts_debian/wheezy+whonix-gateway/files/lib/systemd/system/qubes-whonix-init.service new file mode 100644 index 0000000..6215c2c --- /dev/null +++ b/scripts_debian/wheezy+whonix-gateway/files/lib/systemd/system/qubes-whonix-init.service @@ -0,0 +1,13 @@ +[Unit] +Description=Qubes Whonix initialization script +After=qubes-whonix-network.service +Before=qubes-whonix-firewall.service + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/lib/whonix/init/init.sh +StandardOutput=syslog + +[Install] +WantedBy=multi-user.target diff --git a/scripts_debian/wheezy+whonix-gateway/files/lib/systemd/system/qubes-whonix-network.service b/scripts_debian/wheezy+whonix-gateway/files/lib/systemd/system/qubes-whonix-network.service index 245e031..4e71280 100644 --- a/scripts_debian/wheezy+whonix-gateway/files/lib/systemd/system/qubes-whonix-network.service +++ b/scripts_debian/wheezy+whonix-gateway/files/lib/systemd/system/qubes-whonix-network.service @@ -2,7 +2,7 @@ Description=Qubes Whonix network proxy setup ConditionPathExists=/var/run/qubes-service/qubes-network Before=network.target -After=qubes-firewall.service +After=iptables.service [Service] Type=oneshot @@ -12,3 +12,4 @@ StandardOutput=syslog [Install] WantedBy=multi-user.target +Alias=qubes-network.service diff --git a/scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/init/network-proxy-setup.sh b/scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/init/network-proxy-setup.sh index 67d078e..4010441 100755 --- a/scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/init/network-proxy-setup.sh +++ b/scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/init/network-proxy-setup.sh @@ -53,9 +53,6 @@ if [ "${WHONIX}" == "gateway" ]; then # we can use to identify that its a tor proxy so updates are secure error_file="/usr/share/tinyproxy/default.html" grep -q "${PROXY_META}" "${error_file}" || { - sudo sed -i "s/<\/head>/${PROXY_META}\n<\/head>/" "${error_file}" + sed -i "s/<\/head>/${PROXY_META}\n<\/head>/" "${error_file}" } fi - -# Copy firewall script so Qubes will reload it when it reloads -cp -pf /usr/lib/whonix/init/qubes-firewall-user-script /rw/config/qubes-firewall-user-script diff --git a/scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/init/qubes-firewall-user-script b/scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/init/qubes-whonix-firewall.sh similarity index 100% rename from scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/init/qubes-firewall-user-script rename to scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/init/qubes-whonix-firewall.sh diff --git a/scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/init/qubes-whonix-tor.service b/scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/init/qubes-whonix-tor.service new file mode 100644 index 0000000..0a83e1b --- /dev/null +++ b/scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/init/qubes-whonix-tor.service @@ -0,0 +1,16 @@ +[Unit] +Description = Anonymizing overlay network for TCP +After = syslog.target network.target nss-lookup.target + +[Service] +Type = simple +ExecStart = /usr/bin/tor --runasdaemon 0 --defaults-torrc /usr/share/tor/tor-service-defaults-torrc -f /etc/tor/torrc --quiet +ExecReload = /bin/kill -HUP ${MAINPID} +ExecStop = /bin/kill -INT ${MAINPID} +TimeoutSec = 60 +Restart = on-failure +LimitNOFILE = 32768 + +[Install] +WantedBy = multi-user.target +Alias=tor.service diff --git a/scripts_debian/wheezy+whonix-workstation/files/.facl b/scripts_debian/wheezy+whonix-workstation/files/.facl index d33107e..41e3aba 100644 --- a/scripts_debian/wheezy+whonix-workstation/files/.facl +++ b/scripts_debian/wheezy+whonix-workstation/files/.facl @@ -40,6 +40,13 @@ user::rw- group::r-- other::r-- +# file: lib/systemd/system/qubes-whonix-init.service +# owner: root +# group: root +user::rw- +group::r-- +other::r-- + # file: etc # owner: root # group: root @@ -145,14 +152,14 @@ user::rwx group::r-x other::r-x -# file: usr/lib/whonix/whonix.sh +# file: usr/lib/whonix/init # owner: root # group: root user::rwx group::r-x other::r-x -# file: usr/lib/whonix/init +# file: usr/lib/whonix/init/qubes-whonix-firewall.sh # owner: root # group: root user::rwx @@ -180,13 +187,6 @@ user::rwx group::r-x other::r-x -# file: usr/lib/whonix/init/qubes-firewall-user-script -# owner: root -# group: root -user::rwx -group::r-x -other::r-x - # file: usr/lib/whonix/messages.yaml # owner: root # group: root diff --git a/scripts_debian/wheezy+whonix-workstation/files/lib/systemd/system/qubes-whonix-firewall.service b/scripts_debian/wheezy+whonix-workstation/files/lib/systemd/system/qubes-whonix-firewall.service index 649fe7a..89a5229 100644 --- a/scripts_debian/wheezy+whonix-workstation/files/lib/systemd/system/qubes-whonix-firewall.service +++ b/scripts_debian/wheezy+whonix-workstation/files/lib/systemd/system/qubes-whonix-firewall.service @@ -4,11 +4,9 @@ After=qubes-whonix-network.service Before=network.target [Service] -Type=oneshot -RemainAfterExit=yes -ExecStartPre=/usr/lib/whonix/init/init.sh -ExecStart=/usr/lib/whonix/init/qubes-firewall-user-script +ExecStart=/usr/lib/whonix/init/qubes-whonix-firewall.sh StandardOutput=syslog [Install] WantedBy=multi-user.target +Alias=qubes-firewall.service diff --git a/scripts_debian/wheezy+whonix-workstation/files/lib/systemd/system/qubes-whonix-init.service b/scripts_debian/wheezy+whonix-workstation/files/lib/systemd/system/qubes-whonix-init.service new file mode 100644 index 0000000..6215c2c --- /dev/null +++ b/scripts_debian/wheezy+whonix-workstation/files/lib/systemd/system/qubes-whonix-init.service @@ -0,0 +1,13 @@ +[Unit] +Description=Qubes Whonix initialization script +After=qubes-whonix-network.service +Before=qubes-whonix-firewall.service + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/lib/whonix/init/init.sh +StandardOutput=syslog + +[Install] +WantedBy=multi-user.target diff --git a/scripts_debian/wheezy+whonix-workstation/files/lib/systemd/system/qubes-whonix-network.service b/scripts_debian/wheezy+whonix-workstation/files/lib/systemd/system/qubes-whonix-network.service index 245e031..4e71280 100644 --- a/scripts_debian/wheezy+whonix-workstation/files/lib/systemd/system/qubes-whonix-network.service +++ b/scripts_debian/wheezy+whonix-workstation/files/lib/systemd/system/qubes-whonix-network.service @@ -2,7 +2,7 @@ Description=Qubes Whonix network proxy setup ConditionPathExists=/var/run/qubes-service/qubes-network Before=network.target -After=qubes-firewall.service +After=iptables.service [Service] Type=oneshot @@ -12,3 +12,4 @@ StandardOutput=syslog [Install] WantedBy=multi-user.target +Alias=qubes-network.service diff --git a/scripts_debian/wheezy+whonix-workstation/files/usr/lib/whonix/init/network-proxy-setup.sh b/scripts_debian/wheezy+whonix-workstation/files/usr/lib/whonix/init/network-proxy-setup.sh index a08322d..4010441 100755 --- a/scripts_debian/wheezy+whonix-workstation/files/usr/lib/whonix/init/network-proxy-setup.sh +++ b/scripts_debian/wheezy+whonix-workstation/files/usr/lib/whonix/init/network-proxy-setup.sh @@ -2,12 +2,6 @@ . /usr/lib/whonix/utility_functions -# Or just enable them :) -#ln -s '/lib/systemd/system/qubes-whonix-network.service' '/etc/systemd/system/multi-user.target.wants/qubes-whonix-network.service' -#ln -s '/lib/systemd/system/qubes-whonix-firewall.service' '/etc/systemd/system/multi-user.target.wants/qubes-whonix-firewall.service' -#ln -s '/lib/systemd/system/qubes-whonix-init.service' '/etc/systemd/system/multi-user.target.wants/qubes-whonix-init.service' - - INTERFACE="eth1" if [ "${WHONIX}" == "gateway" ]; then @@ -59,9 +53,6 @@ if [ "${WHONIX}" == "gateway" ]; then # we can use to identify that its a tor proxy so updates are secure error_file="/usr/share/tinyproxy/default.html" grep -q "${PROXY_META}" "${error_file}" || { - sudo sed -i "s/<\/head>/${PROXY_META}\n<\/head>/" "${error_file}" + sed -i "s/<\/head>/${PROXY_META}\n<\/head>/" "${error_file}" } fi - -# Copy firewall script so Qubes will reload it when it reloads -cp -pf /usr/lib/whonix/init/qubes-firewall-user-script /rw/config/qubes-firewall-user-script diff --git a/scripts_debian/wheezy+whonix-workstation/files/usr/lib/whonix/init/qubes-firewall-user-script b/scripts_debian/wheezy+whonix-workstation/files/usr/lib/whonix/init/qubes-whonix-firewall.sh similarity index 100% rename from scripts_debian/wheezy+whonix-workstation/files/usr/lib/whonix/init/qubes-firewall-user-script rename to scripts_debian/wheezy+whonix-workstation/files/usr/lib/whonix/init/qubes-whonix-firewall.sh diff --git a/scripts_debian/wheezy+whonix/04_install_qubes_post.sh b/scripts_debian/wheezy+whonix/04_install_qubes_post.sh index 7456adf..9f58254 100755 --- a/scripts_debian/wheezy+whonix/04_install_qubes_post.sh +++ b/scripts_debian/wheezy+whonix/04_install_qubes_post.sh @@ -22,8 +22,13 @@ fi # ------------------------------------------------------------------------------ # Enable Qubes-Whonix services # ------------------------------------------------------------------------------ +chroot "${INSTALLDIR}" systemctl disable qubes-whonix-network.service || : chroot "${INSTALLDIR}" systemctl enable qubes-whonix-network.service || : -chroot "${INSTALLDIR}" systemctl enable qubes-whonix-firewall || : + +chroot "${INSTALLDIR}" systemctl disable qubes-whonix-firewall.service || : +chroot "${INSTALLDIR}" systemctl enable qubes-whonix-firewall.service || : + +chroot "${INSTALLDIR}" systemctl enable qubes-whonix-init.service || : # ------------------------------------------------------------------------------ # Restore Whonix apt-get From 55d06dc83dda1e251766aadc6d5b107a231bcf2b Mon Sep 17 00:00:00 2001 From: Jason Mehring Date: Sun, 9 Nov 2014 13:24:08 -0500 Subject: [PATCH 3/9] xenstore-read name was missing from create_template_list.sh --- create_template_list.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/create_template_list.sh b/create_template_list.sh index 7d4fb07..cf8dfed 100755 --- a/create_template_list.sh +++ b/create_template_list.sh @@ -7,7 +7,7 @@ template_dir="$(readlink -m ./rpm/install-templates.sh)" files=( $(ls rpm/noarch) ) -name=$($XENSTORE_READ name) +name=$(xenstore-read name) # ----------------------------------------------------------------------------- # Write $vars From 2838225f441d2c6012472e7c0acdb7725b56c77b Mon Sep 17 00:00:00 2001 From: Jason Mehring Date: Mon, 10 Nov 2014 10:47:27 -0500 Subject: [PATCH 4/9] Made sure color chroot function returned shell exit status and not trigger error within that function --- functions.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/functions.sh b/functions.sh index ccbcb71..52ae51c 100755 --- a/functions.sh +++ b/functions.sh @@ -67,8 +67,7 @@ if [ "${VERBOSE}" -ge 2 -o "${DEBUG}" == "1" ]; then chroot() { local retval true ${blue} - /usr/sbin/chroot "$@" - retval=$? + /usr/sbin/chroot "$@" && { retval=$?; true; } || { retval=$?; true; } true ${reset} return $retval } From 26a594a8e5fba3c3bc2c69ac5fb7cddb0f245e38 Mon Sep 17 00:00:00 2001 From: Jason Mehring Date: Mon, 10 Nov 2014 10:46:24 -0500 Subject: [PATCH 5/9] debian: renamed key files to match same format as those in qubes-builder --- scripts_debian/01_install_core.sh | 2 +- .../keys/jessie-debian-archive-keyring.gpg | Bin 0 -> 13568 bytes .../keys/wheezy-debian-archive-keyring.gpg | Bin 0 -> 3569 bytes scripts_debian/vars.sh | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 scripts_debian/keys/jessie-debian-archive-keyring.gpg create mode 100644 scripts_debian/keys/wheezy-debian-archive-keyring.gpg diff --git a/scripts_debian/01_install_core.sh b/scripts_debian/01_install_core.sh index 6ff9357..0c99295 100755 --- a/scripts_debian/01_install_core.sh +++ b/scripts_debian/01_install_core.sh @@ -26,7 +26,7 @@ buildStep "$0" "pre" if ! [ -f "${INSTALLDIR}/tmp/.prepared_debootstrap" ]; then debug "Installing base ${DEBIANVERSION} system" COMPONENTS="" debootstrap --arch=amd64 --include=ncurses-term \ - --components=main --keyring="${SCRIPTSDIR}/keys/debian-${DEBIANVERSION}-archive-keyring.gpg" \ + --components=main --keyring="${SCRIPTSDIR}/keys/${DEBIANVERSION}-debian-archive-keyring.gpg" \ "${DEBIANVERSION}" "${INSTALLDIR}" "${DEBIAN_MIRROR}" || { error "Debootstrap failed!"; exit 1; } chroot "${INSTALLDIR}" chmod 0666 "/dev/null" touch "${INSTALLDIR}/tmp/.prepared_debootstrap" diff --git a/scripts_debian/keys/jessie-debian-archive-keyring.gpg b/scripts_debian/keys/jessie-debian-archive-keyring.gpg new file mode 100644 index 0000000000000000000000000000000000000000..46d1f0e23f17522e0d4fb358b24d78b8c53add58 GIT binary patch literal 13568 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 brdCAhOIaZ?EP#O}tQ%dkE8h6nXBYWjjwlbW literal 0 HcmV?d00001 diff --git a/scripts_debian/keys/wheezy-debian-archive-keyring.gpg b/scripts_debian/keys/wheezy-debian-archive-keyring.gpg new file mode 100644 index 0000000000000000000000000000000000000000..6db1f3a93c12bc0225f7156a59cc5833753d5328 GIT binary patch literal 3569 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 Date: Tue, 11 Nov 2014 09:00:54 -0500 Subject: [PATCH 6/9] Added verbose indication telmplate files was downloading from AppVM --- create_template_list.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/create_template_list.sh b/create_template_list.sh index cf8dfed..1e9c00f 100755 --- a/create_template_list.sh +++ b/create_template_list.sh @@ -24,6 +24,7 @@ $(printf "%s \n" ${files[@]}) path="$(readlink -m .)/rpm/noarch" version="-$(cat ./version)" +name="${name}" EOF # ----------------------------------------------------------------------------- @@ -33,6 +34,7 @@ cat << 'EOF' >> "${template_dir}" for file in ${files[@]}; do if [ ! -e ${file} ]; then + echo "Copying ${file} from ${name} to ${PWD}/${file}..." qvm-run --pass-io development-qubes "cat ${path}/${file}" > ${file} fi From 6bed22eec54b291c4539bc23533fa5e66c736163 Mon Sep 17 00:00:00 2001 From: Jason Mehring Date: Tue, 11 Nov 2014 09:01:34 -0500 Subject: [PATCH 7/9] debian: Removed keyfiles using old name --- .../keys/debian-jessie-archive-keyring.gpg | Bin 13568 -> 0 bytes .../keys/debian-wheezy-archive-keyring.gpg | Bin 3569 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 scripts_debian/keys/debian-jessie-archive-keyring.gpg delete mode 100644 scripts_debian/keys/debian-wheezy-archive-keyring.gpg diff --git a/scripts_debian/keys/debian-jessie-archive-keyring.gpg b/scripts_debian/keys/debian-jessie-archive-keyring.gpg deleted file mode 100644 index 46d1f0e23f17522e0d4fb358b24d78b8c53add58..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13568 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 brdCAhOIaZ?EP#O}tQ%dkE8h6nXBYWjjwlbW diff --git a/scripts_debian/keys/debian-wheezy-archive-keyring.gpg b/scripts_debian/keys/debian-wheezy-archive-keyring.gpg deleted file mode 100644 index 6db1f3a93c12bc0225f7156a59cc5833753d5328..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3569 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 Date: Tue, 11 Nov 2014 13:39:27 -0500 Subject: [PATCH 8/9] whonix: Changes to allow secure update --- .../lib/whonix/init/qubes-whonix-firewall.sh | 22 ++++++++++--------- .../lib/whonix/init/qubes-whonix-firewall.sh | 22 ++++++++++--------- .../wheezy+whonix/04_install_qubes_post.sh | 5 +++++ 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/init/qubes-whonix-firewall.sh b/scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/init/qubes-whonix-firewall.sh index 6863a9e..50c5cbc 100755 --- a/scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/init/qubes-whonix-firewall.sh +++ b/scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/init/qubes-whonix-firewall.sh @@ -2,16 +2,16 @@ . /usr/lib/whonix/utility_functions +if [ -x /usr/sbin/xenstore-read ]; then + XENSTORE_READ="/usr/sbin/xenstore-read" +else + XENSTORE_READ="/usr/bin/xenstore-read" +fi + +# Make sure IP forwarding is disabled +echo "0" > /proc/sys/net/ipv4/ip_forward + if [ "${WHONIX}" != "template" ]; then - # Make sure IP forwarding is disabled - echo "0" > /proc/sys/net/ipv4/ip_forward - - if [ -x /usr/sbin/xenstore-read ]; then - XENSTORE_READ="/usr/sbin/xenstore-read" - else - XENSTORE_READ="/usr/bin/xenstore-read" - fi - ip=$(${XENSTORE_READ} qubes-netvm-gateway 2> /dev/null) # Start Whonix Firewall @@ -31,10 +31,12 @@ iptables -A INPUT -i vif+ -p tcp -m tcp --dport 8082 -j ACCEPT \\ iptables -A OUTPUT -o vif+ -p tcp -m tcp --sport 8082 -j ACCEPT \\ iptables -t nat -A PREROUTING -j PR-QBS-SERVICES \\ iptables -t nat -A PR-QBS-SERVICES -d 10.137.255.254/32 -i vif+ -p tcp -m tcp --dport 8082 -j REDIRECT \\ +iptables -t nat -A OUTPUT -p udp -m owner --uid-owner tinyproxy -m conntrack --ctstate NEW -j DNAT --to ${ip}:53 \\ +iptables -t nat -A OUTPUT -p tcp -m owner --uid-owner tinyproxy -m conntrack --ctstate NEW -j DNAT --to ${ip}:9040 \\ \\ # Route any traffic FROM netvm TO netvm BACK-TO localhost \\ # Allows localhost access to tor network \\ -iptables -t nat -A OUTPUT -s ${ip} -d ${ip} -j DNAT --to-destination 127.0.0.1 \\ +#iptables -t nat -A OUTPUT -s ${ip} -d ${ip} -j DNAT --to-destination 127.0.0.1 \\ ###################################### EOF fi diff --git a/scripts_debian/wheezy+whonix-workstation/files/usr/lib/whonix/init/qubes-whonix-firewall.sh b/scripts_debian/wheezy+whonix-workstation/files/usr/lib/whonix/init/qubes-whonix-firewall.sh index 6863a9e..50c5cbc 100755 --- a/scripts_debian/wheezy+whonix-workstation/files/usr/lib/whonix/init/qubes-whonix-firewall.sh +++ b/scripts_debian/wheezy+whonix-workstation/files/usr/lib/whonix/init/qubes-whonix-firewall.sh @@ -2,16 +2,16 @@ . /usr/lib/whonix/utility_functions +if [ -x /usr/sbin/xenstore-read ]; then + XENSTORE_READ="/usr/sbin/xenstore-read" +else + XENSTORE_READ="/usr/bin/xenstore-read" +fi + +# Make sure IP forwarding is disabled +echo "0" > /proc/sys/net/ipv4/ip_forward + if [ "${WHONIX}" != "template" ]; then - # Make sure IP forwarding is disabled - echo "0" > /proc/sys/net/ipv4/ip_forward - - if [ -x /usr/sbin/xenstore-read ]; then - XENSTORE_READ="/usr/sbin/xenstore-read" - else - XENSTORE_READ="/usr/bin/xenstore-read" - fi - ip=$(${XENSTORE_READ} qubes-netvm-gateway 2> /dev/null) # Start Whonix Firewall @@ -31,10 +31,12 @@ iptables -A INPUT -i vif+ -p tcp -m tcp --dport 8082 -j ACCEPT \\ iptables -A OUTPUT -o vif+ -p tcp -m tcp --sport 8082 -j ACCEPT \\ iptables -t nat -A PREROUTING -j PR-QBS-SERVICES \\ iptables -t nat -A PR-QBS-SERVICES -d 10.137.255.254/32 -i vif+ -p tcp -m tcp --dport 8082 -j REDIRECT \\ +iptables -t nat -A OUTPUT -p udp -m owner --uid-owner tinyproxy -m conntrack --ctstate NEW -j DNAT --to ${ip}:53 \\ +iptables -t nat -A OUTPUT -p tcp -m owner --uid-owner tinyproxy -m conntrack --ctstate NEW -j DNAT --to ${ip}:9040 \\ \\ # Route any traffic FROM netvm TO netvm BACK-TO localhost \\ # Allows localhost access to tor network \\ -iptables -t nat -A OUTPUT -s ${ip} -d ${ip} -j DNAT --to-destination 127.0.0.1 \\ +#iptables -t nat -A OUTPUT -s ${ip} -d ${ip} -j DNAT --to-destination 127.0.0.1 \\ ###################################### EOF fi diff --git a/scripts_debian/wheezy+whonix/04_install_qubes_post.sh b/scripts_debian/wheezy+whonix/04_install_qubes_post.sh index 9f58254..c6ab0e3 100755 --- a/scripts_debian/wheezy+whonix/04_install_qubes_post.sh +++ b/scripts_debian/wheezy+whonix/04_install_qubes_post.sh @@ -19,6 +19,11 @@ else set -e fi +# ------------------------------------------------------------------------------ +# Make sure IP forwarding is disabled (Qubes enables it by default) +# ------------------------------------------------------------------------------ +echo "0" > /proc/sys/net/ipv4/ip_forward + # ------------------------------------------------------------------------------ # Enable Qubes-Whonix services # ------------------------------------------------------------------------------ From d92d6d1577f012454d7b235cc73e4ce8e3f9b844 Mon Sep 17 00:00:00 2001 From: Jason Mehring Date: Tue, 11 Nov 2014 13:41:42 -0500 Subject: [PATCH 9/9] whonix: Lockdown network if not connected to a tor-newvm --- .../files/usr/lib/whonix/messages.yaml | 3 --- .../files/usr/lib/whonix/qubes-whonixsetup | 15 ++++++++++++++- .../files/usr/lib/whonix/messages.yaml | 3 --- .../files/usr/lib/whonix/qubes-whonixsetup | 15 ++++++++++++++- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/messages.yaml b/scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/messages.yaml index d3be464..075ab09 100644 --- a/scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/messages.yaml +++ b/scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/messages.yaml @@ -7,6 +7,3 @@ update:

Tor netvm required for updates!

Please ensure your template vm has a Whonix gateway as it's VM.

No updates are possible without an active (running) Whonix gateway VM.

-

-

Template will now power off

- diff --git a/scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/qubes-whonixsetup b/scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/qubes-whonixsetup index 814af62..edb6240 100755 --- a/scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/qubes-whonixsetup +++ b/scripts_debian/wheezy+whonix-gateway/files/usr/lib/whonix/qubes-whonixsetup @@ -41,6 +41,19 @@ elif [ "${WHONIX}" == "workstation" ]; then fi elif [ "${WHONIX}" == "template" -a "${PROXY_SECURE}" == "0" ]; then + # Set secure defaults. + iptables -P INPUT DROP + iptables -P FORWARD DROP + iptables -P OUTPUT DROP + + # Flush old rules. + iptables -F + iptables -X + iptables -t nat -F + iptables -t nat -X + iptables -t mangle -F + iptables -t mangle -X + + # Display warning that netvm is not connected to a torvm /usr/lib/whonix/alert update /usr/lib/whonix/messages.yaml - #sudo /sbin/poweroff fi diff --git a/scripts_debian/wheezy+whonix-workstation/files/usr/lib/whonix/messages.yaml b/scripts_debian/wheezy+whonix-workstation/files/usr/lib/whonix/messages.yaml index d3be464..075ab09 100644 --- a/scripts_debian/wheezy+whonix-workstation/files/usr/lib/whonix/messages.yaml +++ b/scripts_debian/wheezy+whonix-workstation/files/usr/lib/whonix/messages.yaml @@ -7,6 +7,3 @@ update:

Tor netvm required for updates!

Please ensure your template vm has a Whonix gateway as it's VM.

No updates are possible without an active (running) Whonix gateway VM.

-

-

Template will now power off

- diff --git a/scripts_debian/wheezy+whonix-workstation/files/usr/lib/whonix/qubes-whonixsetup b/scripts_debian/wheezy+whonix-workstation/files/usr/lib/whonix/qubes-whonixsetup index 814af62..edb6240 100755 --- a/scripts_debian/wheezy+whonix-workstation/files/usr/lib/whonix/qubes-whonixsetup +++ b/scripts_debian/wheezy+whonix-workstation/files/usr/lib/whonix/qubes-whonixsetup @@ -41,6 +41,19 @@ elif [ "${WHONIX}" == "workstation" ]; then fi elif [ "${WHONIX}" == "template" -a "${PROXY_SECURE}" == "0" ]; then + # Set secure defaults. + iptables -P INPUT DROP + iptables -P FORWARD DROP + iptables -P OUTPUT DROP + + # Flush old rules. + iptables -F + iptables -X + iptables -t nat -F + iptables -t nat -X + iptables -t mangle -F + iptables -t mangle -X + + # Display warning that netvm is not connected to a torvm /usr/lib/whonix/alert update /usr/lib/whonix/messages.yaml - #sudo /sbin/poweroff fi