Skip to content

chore: remove whonix-specific updates-proxy filter from non-whonix templates #565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

chore: remove whonix-specific updates-proxy filter from non-whonix templates #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11f2bbd
chore: remove whonix-specific updates-proxy filter from non-whonix te…
Mar 22, 2025
4bf0555
wip: properly migrate /etc/tinyproxy/updates-blacklist
Mar 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@ install-netvm: install-systemd-networking-dropins install-networkmanager
install -D network/vif-route-qubes $(DESTDIR)/etc/xen/scripts/vif-route-qubes
install -D network/vif-qubes-nat.sh $(DESTDIR)/etc/xen/scripts/vif-qubes-nat.sh
install -m 0644 -D network/tinyproxy-updates.conf $(DESTDIR)/etc/tinyproxy/tinyproxy-updates.conf
install -m 0644 -D network/updates-blacklist $(DESTDIR)/etc/tinyproxy/updates-blacklist

install -m 0400 -D network/qubes-ipv4.nft $(DESTDIR)/etc/qubes/qubes-ipv4.nft
install -m 0400 -D network/qubes-ipv6.nft $(DESTDIR)/etc/qubes/qubes-ipv6.nft
Expand Down
1 change: 0 additions & 1 deletion debian/qubes-core-agent-networking.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ etc/qubes/qubes-antispoof.nft
etc/sysctl.d/81-qubes.conf.optional
etc/sysctl.d/82-qubes-minimal-sys-net.conf.optional
etc/tinyproxy/tinyproxy-updates.conf
etc/tinyproxy/updates-blacklist
etc/udev/rules.d/99-qubes-network.rules
etc/xen/scripts/vif-qubes-nat.sh
etc/xen/scripts/vif-route-qubes
Expand Down
1 change: 1 addition & 0 deletions debian/qubes-core-agent.maintscript
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
rm_conffile /etc/apt/apt.conf.d/00notiy-hook
rm_conffile /etc/tinyproxy/filter-updates
mv_conffile /etc/tinyproxy/updates-blacklist /etc/tinyproxy/updates-blocklist qubes-whonix #TODO: fill in version
rm_conffile /etc/systemd/system/haveged.service
6 changes: 0 additions & 6 deletions network/tinyproxy-updates.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,3 @@ Allow 10.137.0.0/16
ConnectPort 443
# Gentoo uses Rsync for its main repository
ConnectPort 873

# Explicitly block connections to the proxy IP, to return an error in such
# case. This error page contains a magic string which is used in Whonix to
# detect whether proxy is torified or not.
# See https://github.com/qubesos/qubes-issues/issues/1482 for details
Filter "/etc/tinyproxy/updates-blacklist"
2 changes: 0 additions & 2 deletions network/updates-blacklist
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion rpm_spec/core-agent.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,7 +1130,6 @@ rm -f %{name}-%{version}
%config(noreplace) /etc/qubes/qubes-ipv6-disabled.nft
%config(noreplace) /etc/qubes/rpc-config/qubes.UpdatesProxy
%config(noreplace) /etc/tinyproxy/tinyproxy-updates.conf
%config(noreplace) /etc/tinyproxy/updates-blacklist
%config(noreplace) /etc/udev/rules.d/99-qubes-network.rules
%if !0%{?is_opensuse}
/etc/dhclient.d/qubes-setup-dnat-to-ns.sh
Expand Down