From mboxrd@z Thu Jan  1 00:00:00 1970
From: Erik Kapfer <ummeegge@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] sslh: Update to version 1.20
Date: Tue, 23 Apr 2019 09:06:06 +0200
Message-ID: <20190423070606.5642-1-ummeegge@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5092042585029516822=="
List-Id: <development.lists.ipfire.org>

--===============5092042585029516822==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- Added USELIBCAP=3D1 to enable the possibility for transparent option.
- Wrote configuration directives in initscript into variable for better overv=
iew.
- Introduce chroot directive in start parameter.
- Added new user and group sslh (will be deleted if uninstall).
- Changed EXTERNAL_IP_FUNCT to serve data also for configuration block but us=
e it also as check as before.
- Added symlinks in sslh paks since the initscripts LFS do not serves it in o=
ld installation (a reboot does not started sslh again).
- Deleted sslh symlinks in initscripts LFS since they are served via sslh pak=
s and are not needed anymore.

Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
---
 lfs/initscripts               |  3 --
 lfs/sslh                      | 12 ++++----
 src/initscripts/packages/sslh | 65 +++++++++++++++++++++++++++++++++--------=
--
 src/paks/sslh/install.sh      | 13 +++++++++
 src/paks/sslh/uninstall.sh    |  9 ++++++
 5 files changed, 79 insertions(+), 23 deletions(-)

diff --git a/lfs/initscripts b/lfs/initscripts
index 055e106d0..3173a04e4 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -136,9 +136,6 @@ $(TARGET) :
 	ln -sf ../init.d/client175   /etc/rc.d/rc0.d/K34client175
 	ln -sf ../init.d/client175   /etc/rc.d/rc3.d/S66client175
 	ln -sf ../init.d/client175   /etc/rc.d/rc6.d/K34client175
-	ln -sf ../init.d/sslh        /etc/rc.d/rc3.d/S98sslh
-	ln -sf ../init.d/sslh        /etc/rc.d/rc0.d/K02sslh
-	ln -sf ../init.d/sslh        /etc/rc.d/rc6.d/K02sslh
 	ln -sf ../init.d/vdradmin    /etc/rc.d/rc3.d/S99vdradmin
 	ln -sf ../init.d/vdradmin    /etc/rc.d/rc0.d/K01vdradmin
 	ln -sf ../init.d/vdradmin    /etc/rc.d/rc6.d/K01vdradmin
diff --git a/lfs/sslh b/lfs/sslh
index 100cec065..dedd10272 100644
--- a/lfs/sslh
+++ b/lfs/sslh
@@ -1,7 +1,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                 =
    #
+# Copyright (C) 2007-2019  IPFire Team  <info(a)ipfire.org>                 =
    #
 #                                                                           =
  #
 # This program is free software: you can redistribute it and/or modify      =
  #
 # it under the terms of the GNU General Public License as published by      =
  #
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 1.7a
+VER        =3D 1.20
=20
 THISAPP    =3D sslh-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D sslh
-PAK_VER    =3D 5
+PAK_VER    =3D 6
=20
 DEPS       =3D ""
=20
@@ -44,7 +44,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D ee124654412198a5e11fe28acf10634d
+$(DL_FILE)_MD5 =3D 0db26ed2825b1ef6c83959a988279912
=20
 install : $(TARGET)
=20
@@ -77,8 +77,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && make CFLAGS=3D"$(CFLAGS)" $(MAKETUNING) USELIBWRAP=3D
-	cd $(DIR_APP) && install -v -m 755 sslh /usr/sbin
+	cd $(DIR_APP) && make CFLAGS=3D"$(CFLAGS)" $(MAKETUNING) USELIBCAP=3D1 USEL=
IBWRAP=3D
+	cd $(DIR_APP) && install -v -m 755 sslh-fork /usr/sbin/sslh
=20
 	#install initscripts
 	$(call INSTALL_INITSCRIPT,sslh)
diff --git a/src/initscripts/packages/sslh b/src/initscripts/packages/sslh
index 43e58f392..0935b1114 100644
--- a/src/initscripts/packages/sslh
+++ b/src/initscripts/packages/sslh
@@ -3,31 +3,68 @@
=20
 # Based on sysklogd script from LFS-3.1 and earlier.
 # Rewritten by Gerard Beekmans  - gerard(a)linuxfromscratch.org
+#
+# $LastChangedBy: ummeegge - ummeegge(a)ipfire.org $
+# $Date: 2019-04-04 04:35:09 -0500 (Thu, 04 Apr 2019) $
+#
+#############################################################
+#
=20
 . /etc/sysconfig/rc
 . $rc_functions
=20
+DAEMON=3D"/usr/sbin/sslh"
+
+# Check for external IP address and provide it to listening option
+EXTERNAL_IP_ADDRESS=3D"$(</var/ipfire/red/local-ipaddress)"
+EXTERNAL_IP_FUNCT() {
+        if [ -z "${EXTERNAL_IP_ADDRESS}" ]; then
+                echo_failure
+                boot_mesg -n "FAILURE:\n\nCould not determine" ${FAILURE}
+                boot_mesg -n " your external IP address."
+                boot_mesg "" ${NORMAL}
+                exit 1
+        fi
+}
+
+# Loopback interface
+LO=3D"127.0.0.1"
+# Used TCP ports
+LISTENPORT=3D"443"
+SSHPORT=3D"222"
+TLSPORT=3D"444"
+OPENVPNPORT=3D"1194"
+
+# Configuration options
+DAEMON_OPTS=3D"
+--user sslh
+--listen ${EXTERNAL_IP_ADDRESS}:${LISTENPORT}
+--ssh ${LO}:${SSHPORT}
+--tls ${LO}:${TLSPORT}
+--openvpn ${LO}:${OPENVPNPORT}
+--pidfile /var/run/sslh.pid
+-C /var/empty
+"
+
+# Check for binary
+if ! [ -x "$(command -v ${DAEMON})" ]; then
+	echo "Error: could not find ${DAEMON}" >&2
+	exit 1
+fi
+
+# Check for external IP
+EXTERNAL_IP_FUNCT
+
 case "$1" in
 	start)
 		boot_mesg "Starting SSLH Deamon..."
-
-		LOCAL_IP_ADDRESS=3D"$(</var/ipfire/red/local-ipaddress)"
-		if [ -z "${LOCAL_IP_ADDRESS}" ]; then
-			echo_failure
-			boot_mesg -n "FAILURE:\n\nCould not determine" ${FAILURE}
-			boot_mesg -n " your external IP address."
-			boot_mesg "" ${NORMAL}
-			exit 1
-		fi
-
-		loadproc /usr/sbin/sslh -u nobody \
-			-p "${LOCAL_IP_ADDRESS}:443" -s localhost:222 -l localhost:444
+		loadproc ${DAEMON} ${DAEMON_OPTS}
 		evaluate_retval
 		;;
=20
 	stop)
 		boot_mesg "Stopping SSLH Deamon..."
-		killproc /usr/sbin/sslh
+		killproc ${DAEMON}
 		evaluate_retval
 		;;
=20
@@ -38,7 +75,7 @@ case "$1" in
 		;;
=20
 	status)
-		statusproc /usr/sbin/sslh
+		statusproc ${DAEMON}
 		;;
=20
 	*)
diff --git a/src/paks/sslh/install.sh b/src/paks/sslh/install.sh
index 626884bdd..df7cafc78 100644
--- a/src/paks/sslh/install.sh
+++ b/src/paks/sslh/install.sh
@@ -23,5 +23,18 @@
 #
 . /opt/pakfire/lib/functions.sh
 extract_files
+
+# Add user and group for sslh if not already done
+if ! grep -q sslh /etc/passwd; then
+    groupadd sslh;
+    useradd -g sslh -M -s /sbin/nologin sslh
+fi
+
 ln -s /etc/init.d/sslh /etc/rc.d/init.d/networking/red.up/50-sslh
+
+# Set symlink for runlevels
+ln -svf ../init.d/sslh /etc/rc.d/rc0.d/K02sslh
+ln -svf ../init.d/sslh /etc/rc.d/rc3.d/S98sslh
+ln -svf ../init.d/sslh /etc/rc.d/rc6.d/K02sslh
+
 start_service --background ${NAME}
diff --git a/src/paks/sslh/uninstall.sh b/src/paks/sslh/uninstall.sh
index dca34ccbd..05bb27945 100644
--- a/src/paks/sslh/uninstall.sh
+++ b/src/paks/sslh/uninstall.sh
@@ -23,5 +23,14 @@
 #
 . /opt/pakfire/lib/functions.sh
 stop_service ${NAME}
+
+# Delete user and group sslh
+if grep -q sslh /etc/passwd; then
+	userdel sslh
+	groupdel sslh
+fi
+
 remove_files
 rm -f /etc/rc.d/init.d/networking/red.up/50-sslh
+# Delete initscript symlinks
+rm -f /etc/rc.d/rc?.d/???sslh
--=20
2.12.2


--===============5092042585029516822==--