5 files changed, 85 insertions, 0 deletions

diff --git a/debian/etc/X11/xinit/xinitrc.d/80-gnunet-user-services b/debian/etc/X11/xinit/xinitrc.d/80-gnunet-user-services
new file mode 100644
index 000000000..aff1dd78c
--- /dev/null
+++ b/debian/etc/X11/xinit/xinitrc.d/80-gnunet-user-services
@@ -0,0 +1,48 @@
+#!/bin/bash
+user=$(whoami)
+gnunet_proxy=$(gnunet-config -c /etc/skel/.config/gnunet.conf -s gns-proxy | grep 'IMMEDIATE_START = YES')
+
+# Enable GNS proxy for new users informed by /etc/skel.
+if [ "$gnunet_proxy" ]; then
+
+        # Calculate user specific port
+        port=$((8000+$(id -u "$user")))
+
+        gnunet-config -c "$HOME/.config/gnunet.conf" \
+                --rewrite \
+                --section=gns-proxy \
+                --option=OPTIONS \
+                --value="-p $port"
+
+        # Firefox
+        defaultprofile=$(ls "$HOME/.mozilla/firefox/*.default")
+        if [ ! "$defaultprofile" ];then
+                timeout 3s firefox --headless # dirty: create profile if not existent
+        fi
+        for ffprofile in "$HOME"/.mozilla/firefox/*.*/; do
+                js=$ffprofile/user.js
+                if [ -f "$js" ]; then
+                        sed -i '/Preferences for using the GNU Name System/d' "$js"
+                        sed -i '/network.proxy.socks/d' "$js"
+                        sed -i '/network.proxy.socks_port/d' "$js"
+                        sed -i '/network.proxy.socks_remote_dns/d' "$js"
+                        sed -i '/network.proxy.type/d' "$js"
+                fi
+                echo "// Preferences for using the GNU Name System" >> "$js"
+                echo "user_pref(\"network.proxy.socks\", \"localhost\");" >> "$js"
+                echo "user_pref(\"network.proxy.socks_port\", $port);" >> "$js"
+                echo "user_pref(\"network.proxy.socks_remote_dns\", true);" >> "$js"
+                echo "user_pref(\"network.proxy.type\", 1);" >> "$js"
+        done
+
+        # Chromium
+        profile="$HOME/.profile"
+        if [ -f "$profile" ]; then
+                sed -i '/CHROMIUM_USER_FLAGS/d' "$profile"
+        fi
+        echo "export CHROMIUM_USER_FLAGS=--proxy-server=socks5://localhost:$port" \
+                >> "$profile"
+fi
+
+# Create/Renew GNS certificate authority (CA) per user.
+gnunet-gns-proxy-setup-ca
diff --git a/debian/etc/gnunet.conf b/debian/etc/gnunet.conf
new file mode 100644
index 000000000..c14ab5918
--- /dev/null
+++ b/debian/etc/gnunet.conf
@@ -0,0 +1,8 @@
+[path]
+GNUNET_HOME = /var/lib/gnunet/
+GNUNET_DATA_HOME = /var/lib/gnunet/data/
+GNUNET_RUNTIME_DIR = /var/run/gnunet/
+
+[arm]
+START_SYSTEM_SERVICES = YES
+START_USER_SERVICES = NO
diff --git a/debian/etc/skel/.config/gnunet.conf b/debian/etc/skel/.config/gnunet.conf
new file mode 100644
index 000000000..c5a982139
--- /dev/null
+++ b/debian/etc/skel/.config/gnunet.conf
@@ -0,0 +1,10 @@
+# Sample configuration for $HOME/.config/gnunet.conf in
+# a multi-user setup. This configuration should be installed
+# in the $HOME directory of each normal user (and in
+# /etc/skel/).
+[arm]
+SYSTEM_ONLY = NO
+USER_ONLY = YES
+
+[gns-proxy]
+IMMEDIATE_START = YES
diff --git a/debian/etc/skel/.config/systemd/gnunet-user-gns-proxy.service b/debian/etc/skel/.config/systemd/gnunet-user-gns-proxy.service
new file mode 100644
index 000000000..475e16fe8
--- /dev/null
+++ b/debian/etc/skel/.config/systemd/gnunet-user-gns-proxy.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=GNUnet user based GNS proxy
+
+[Service]
+Type=oneshot
+ExecStart=/usr/lib/x86_64-linux-gnu/gnunet/libexec/gnunet-gns-proxy -p 9000+%U
+
+[Install]
+WantedBy=default.target
+
diff --git a/debian/etc/skel/.config/systemd/gnunet-userpeer.service b/debian/etc/skel/.config/systemd/gnunet-userpeer.service
new file mode 100644
index 000000000..79dac97ed
--- /dev/null
+++ b/debian/etc/skel/.config/systemd/gnunet-userpeer.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=GNUnet User peer
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/gnunet-arm -s
+
+[Install]
+WantedBy=default.target