From d2b0d060ef85b1dec7f43c8f456df53e70fdc9f5 Mon Sep 17 00:00:00 2001
From: tke <tobias.kessels@certbw.de>
Date: Fri, 11 Nov 2022 15:33:40 +0100
Subject: [PATCH] Upgraded docker-proxyscript to handle multiple services

---
 systemscripts/proxy/update_docker_proxy.sh  | 42 -----------------
 systemscripts/proxy/update_service_proxy.sh | 51 +++++++++++++++++++++
 2 files changed, 51 insertions(+), 42 deletions(-)
 delete mode 100755 systemscripts/proxy/update_docker_proxy.sh
 create mode 100755 systemscripts/proxy/update_service_proxy.sh

diff --git a/systemscripts/proxy/update_docker_proxy.sh b/systemscripts/proxy/update_docker_proxy.sh
deleted file mode 100755
index 62b03d8..0000000
--- a/systemscripts/proxy/update_docker_proxy.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-
-function restart_docker(){
-  sudo systemctl daemon-reload
-  sudo systemctl restart docker
-  #systemctl show docker -p Environment
-}
-
-#remove proxy settings from docker
-if [[ "${1}" == "off" ]]; then
-  echo "TURNING OFF PROXY FOR DOCKER"
-  sudo rm -v /etc/systemd/system/docker.service.d/http-proxy.conf
-  restart_docker
-  exit 0
-fi
-
-#populate proxy_ip and proxy_port variables
-path=$(dirname $(readlink -f "${0}"))
-. "${path}/get_proxy.sh"
-
-
-echo -n "Username: "
-read username
-echo -n "Password: "
-read -s password
-#encpassword=$(perl -MURI::Escape -e 'print uri_escape($ARGV[0]);' "${password}")
-#encpassword=$(echo -n ${password}  | sed -e 's/\@/\\x40/g' -e 's/\!/\\x21/g' -e 's/\$/\\x24/g' -e 's/\*/\\x2a/g' -e 's/\%/\\x25/g' -e 's/\&/\\x26/g' -e 's/\#/\\x30/g')
-encpassword=$(echo -n ${password}  | xxd -p | sed -e 's/\(..\)/%%\1/g' )
-if ! [[ -d "/etc/systemd/system/docker.service.d" ]] ; then
-  sudo mkdir -p /etc/systemd/system/docker.service.d/
-fi
-echo "[Service]" | sudo tee /etc/systemd/system/docker.service.d/http-proxy.conf >/dev/null
-echo 'Environment="HTTP_PROXY=http://'"${username}"':"'"${encpassword}@${proxy_ip}:${proxy_port}/" | sudo tee -a /etc/systemd/system/docker.service.d/http-proxy.conf >/dev/null
-echo 'Environment="HTTPS_PROXY=http://'"${username}"':"'"${encpassword}@${proxy_ip}:${proxy_port}/" | sudo tee -a /etc/systemd/system/docker.service.d/http-proxy.conf >/dev/null
-if [[ -z "$NO_PROXY" ]] ; then
-  echo -n 'Environment="NO_PROXY=localhost,127.0.0.1"' | sudo tee -a /etc/systemd/system/docker.service.d/http-proxy.conf >/dev/null
-else
-  echo 'Environment="'$(env | grep NO_PROXY)'"' | sudo tee -a /etc/systemd/system/docker.service.d/http-proxy.conf >/dev/null
-fi
-
-restart_docker
diff --git a/systemscripts/proxy/update_service_proxy.sh b/systemscripts/proxy/update_service_proxy.sh
new file mode 100755
index 0000000..2a8d4df
--- /dev/null
+++ b/systemscripts/proxy/update_service_proxy.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+services=(docker fwupd snapd)
+
+function restart_services(){
+  echo "Reloading Systemd - Configfiles"
+  sudo systemctl daemon-reload
+  for service in ${services[*]} ; do
+    echo "Restarting Service $service"
+    sudo systemctl restart $service
+  done
+}
+
+#remove proxy settings from docker
+if [[ "${1}" == "off" ]]; then
+  for service in ${services[*]} ; do
+    echo "TURNING OFF PROXY FOR ${service^^}"
+    sudo rm -v "/etc/systemd/system/${service}.service.d/http-proxy.conf"
+  done
+  restart_services
+  exit 0
+fi
+
+#populate proxy_ip and proxy_port variables
+path=$(dirname $(readlink -f "${0}"))
+. "${path}/get_proxy.sh"
+
+
+echo -n "Username: "
+read username
+echo -n "Password: "
+read -s password
+#encpassword=$(perl -MURI::Escape -e 'print uri_escape($ARGV[0]);' "${password}")
+#encpassword=$(echo -n ${password}  | sed -e 's/\@/\\x40/g' -e 's/\!/\\x21/g' -e 's/\$/\\x24/g' -e 's/\*/\\x2a/g' -e 's/\%/\\x25/g' -e 's/\&/\\x26/g' -e 's/\#/\\x30/g')
+encpassword=$(echo -n ${password}  | xxd -p | sed -e 's/\(..\)/%%\1/g' )
+
+for service in ${services[*]} ; do
+  if ! [[ -d "/etc/systemd/system/${service}.service.d" ]] ; then
+    sudo mkdir -p "/etc/systemd/system/${service}.service.d/"
+  fi
+  echo "[Service]" | sudo tee "/etc/systemd/system/${service}.service.d/http-proxy.conf" >/dev/null
+  echo 'Environment="HTTP_PROXY=http://'"${username}"':"'"${encpassword}@${proxy_ip}:${proxy_port}/" | sudo tee -a "/etc/systemd/system/${service}.service.d/http-proxy.conf" >/dev/null
+  echo 'Environment="HTTPS_PROXY=http://'"${username}"':"'"${encpassword}@${proxy_ip}:${proxy_port}/" | sudo tee -a "/etc/systemd/system/${service}.service.d/http-proxy.conf" >/dev/null
+  if [[ -z "$NO_PROXY" ]] ; then
+    echo -n 'Environment="NO_PROXY=localhost,127.0.0.1"' | sudo tee -a "/etc/systemd/system/${service}.service.d/http-proxy.conf" >/dev/null
+  else
+    echo 'Environment="'$(env | grep NO_PROXY)'"' | sudo tee -a "/etc/systemd/system/${service}.service.d/http-proxy.conf" >/dev/null
+  fi
+done
+
+restart_services