merge with latest dev version

3 files changed, 222 insertions, 0 deletions

diff --git a/core/modules/idleaction/data/etc/cron.d/openslx-idleaction b/core/modules/idleaction/data/etc/cron.d/openslx-idleaction
new file mode 100644
index 00000000..3dd07ccb
--- /dev/null
+++ b/core/modules/idleaction/data/etc/cron.d/openslx-idleaction
@@ -0,0 +1,7 @@
+# Trigger scripts that checks idle status of machine and triggers actions
+
+SHELL=/bin/ash
+PATH=/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin
+
+*/5 *    * * *   root	/opt/openslx/scripts/idleaction-cron_script
+
diff --git a/core/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script b/core/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script
new file mode 100755
index 00000000..b7617940
--- /dev/null
+++ b/core/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script
@@ -0,0 +1,138 @@
+#!/bin/ash
+
+. /opt/openslx/config || exit 1
+
+# If existent, no session is open. Will contain timestamp of last activity.
+# If not existent, at least one user is logged in
+CRONFILE="/etc/cron.d/idleaction-shutdown_schedule"
+IDLEHINT="/dev/shm/idlehint"
+NOW=$(date +%s)
+
+#
+# 1) Check for idle timeout
+#
+if [ -n "${SLX_LOGOUT_TIMEOUT}" ] && [ "${SLX_LOGOUT_TIMEOUT}" -gt 0 ]; then
+	# Logout timeout is set, see which users we should kick
+	IS_IDLE=yes
+	# get all sessions
+	SESSIONS=$(loginctl | awk '{print $1}')
+	if [ -n "$SESSIONS" ]; then
+		TMP="/dev/shm/idlecheck.tmp"
+		# Iterate over sessions
+		for ses in $SESSIONS; do
+			# Get information
+			loginctl show-session "$ses" > "$TMP"
+			NAME=$(grep '^Name=' "$TMP" | cut -c 6-)
+			[ -z "$NAME" ] && continue # No name - should not happen
+			export DISPLAY=$(grep '^Display=' "$TMP" | cut -c 9-)
+			# X11
+			if [ -n "$DISPLAY" ]; then
+				# Seems to be x11
+				IDLE=
+				export XAUTHORITY=$(ps a | grep " $DISPLAY " | grep -o -- '-auth.*$' | grep -m1 -v grep | awk '{print $2}')
+				[ -n "$XAUTHORITY" ] && [ -f "$XAUTHORITY" ] && IDLE=$(xprintidle)
+				# Now that we have DISPLAY and XAUTHORITY set, xprintidle should work
+				if [ -z "$IDLE" ]; then
+					# Try user's xauth
+					USRHOME=$(/usr/bin/getent passwd "$NAME" | awk -F ':' '{print $6}')
+					export XAUTHORITY="$USRHOME/.Xauthority"
+					[ -f "$XAUTHORITY" ] && IDLE=$(xprintidle)
+				fi
+				if [ -n "$IDLE" ]; then
+					IDLE=$(( $IDLE / 1000 ))
+					if [ -z "$IDLE" ] || [ "$IDLE" -lt "$SLX_LOGOUT_TIMEOUT" ]; then
+						IS_IDLE=no
+					else
+						loginctl terminate-session "$ses"
+					fi
+				else # xprintidle did not work
+					IS_IDLE=no
+				fi
+				continue # Done with this session, skip normal tty/ssh checks
+			fi
+			# end X11
+			# other sessions
+			IDLE=$(grep '^IdleSinceHint=' "$TMP" | cut -c 15-)
+			if [ "${#IDLE}" -lt 7 ]; then # wah wah waaaah
+				IS_IDLE=no
+				continue
+			fi
+			# divide by 1000000 by chopping of last 6 chars - number might be too large for $(( ))
+			IDLE=$(echo "$IDLE" | cut -c "-$(( ${#IDLE} - 6 ))")
+			[ "$IDLE" -gt "$NOW" ] && IDLE="$NOW"
+			IDLE=$(( $NOW - $IDLE ))
+			if [ "$IDLE" -lt "$SLX_LOGOUT_TIMEOUT" ]; then
+				IS_IDLE=no
+			else
+				loginctl terminate-session "$ses"
+			fi
+			# end other sessions
+		done
+		rm -f -- "$TMP"
+	fi
+	if [ "$IS_IDLE" = "yes" ]; then
+		[ ! -e "$IDLEHINT" ] && echo "$NOW" > "$IDLEHINT"
+	else
+		rm -f -- "$IDLEHINT"
+	fi
+else
+	# No logout timeout is set, take shortcut for shutdown timeout (if set)
+	if [ -n "$SLX_SHUTDOWN_TIMEOUT" ]; then
+		SESSIONS=$(loginctl | wc -l)
+		if [ "$SESSIONS" = "0" ]; then
+			[ ! -e "$IDLEHINT" ] && echo "$NOW" > "$IDLEHINT"
+		else
+			rm -f -- "$IDLEHINT"
+		fi
+	fi
+fi
+
+#
+# 2) Check for no-session-shutdown timeout
+#
+if [ -n "${SLX_SHUTDOWN_TIMEOUT}" ] && [ "${SLX_SHUTDOWN_TIMEOUT}" -gt 0 ] && [ -e "$IDLEHINT" ]; then
+	IDLE=$(cat "$IDLEHINT")
+	[ "$IDLE" -gt "$NOW" ] && IDLE="$NOW"
+	IDLE=$(( $NOW - $IDLE ))
+	if [ "$IDLE" -gt "$SLX_SHUTDOWN_TIMEOUT" ]; then
+		poweroff
+	fi
+fi
+
+#
+# 3) Check for hard scheduled shutdown
+#
+# A cron file is created dynamically here so there's everything
+# in one module and you don't need to repack config.tgz
+
+invalid_time ()
+{
+	slxlog "idleaction-schedule" "Invalid shutdown time: '$time'. Expected HH:MM format."
+	return 0
+}
+
+if [ -n "$SLX_SHUTDOWN_SCHEDULE" -o -n "$SLX_REBOOT_SCHEDULE" ] && [ ! -e "$CRONFILE" ]; then
+	echo "# OpenSLX: Trigger poweroff at certain time of day" > "$CRONFILE"
+	echo "SHELL=/bin/ash" >> "$CRONFILE"
+	echo "PATH=/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin" >> "$CRONFILE"
+	echo "" >> "$CRONFILE"
+	for time in $SLX_SHUTDOWN_SCHEDULE; do
+		HOUR=${time%%:*}
+		MINUTE=${time##*:}
+		[ -z "$HOUR$MINUTE" ] && invalid_time && continue
+		[ "$HOUR" -lt 0 -o "$HOUR" -gt 23 ] && invalid_time && continue
+		[ "$MINUTE" -lt 0 -o "$MINUTE" -gt 59 ] && invalid_time && continue
+		echo "$MINUTE $HOUR	* * *	root	/opt/openslx/scripts/idleaction-scheduled_action poweroff" >> "$CRONFILE"
+	done
+	# do it again for SLX_REBOOT_SCHEDULE
+	for time in $SLX_REBOOT_SCHEDULE; do
+		HOUR=${time%%:*}
+		MINUTE=${time##*:}
+		[ -z "$HOUR$MINUTE" ] && invalid_time && continue
+		[ "$HOUR" -lt 0 -o "$HOUR" -gt 23 ] && invalid_time && continue
+		[ "$MINUTE" -lt 0 -o "$MINUTE" -gt 59 ] && invalid_time && continue
+		echo "$MINUTE $HOUR	* * *	root	/opt/openslx/scripts/idleaction-scheduled_action reboot" >> "$CRONFILE"
+	done
+	touch "/etc/cron.d" # Aufs bug where it won't update dir mtime when creating the file within
+fi
+
diff --git a/core/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_action b/core/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_action
new file mode 100755
index 00000000..6ef6969c
--- /dev/null
+++ b/core/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_action
@@ -0,0 +1,77 @@
+#!/bin/ash
+
+if [ "$(whoami)" != "root" ]; then
+	echo "Only root can call this"
+	exit 1
+fi
+
+if [ $# -ne 1 ]; then
+	echo "$0 <reboot|poweroff>"
+	exit 1
+fi
+
+MODE=$1
+
+if [ "$MODE" != "reboot" ] && [ "$MODE" != "poweroff" ]; then
+	slxlog "idleaction-failed-call" "Invalid call to idleaction-scheduled_action. Mode '$MODE' unknown."
+	exit 1
+fi
+
+NUM=$(who | wc -l)
+[ "$NUM" = "0" ] && $MODE # Easy way out - machine is idle
+
+# Someone logged in
+for MINUTES in 5 X X X X X X X 3 X X X 2 X X X 1 X X X; do
+	NUM=$(who | wc -l)
+	[ "$NUM" = "0" ] && break
+	if [ "$MINUTES" != "X" ]; then
+		USERS=0
+		if [ "$MODE" = "reboot" ]; then
+			MESSAGE="Das System wird in $MINUTES Minute(n) neugestartet, bitte beenden Sie Ihre Sitzung.
+The system will reboot in $MINUTES minute(s). Please save your work and end the session."
+		else
+			MESSAGE="Dieser Rechner wird in $MINUTES Minute(n) abgeschaltet, bitte beenden Sie Ihre Sitzung.
+The system will power off in $MINUTES minute(s). Please save your work and end the session."
+		fi
+		for d in $(who | awk '{print $2}' | sort -u); do
+			if [ "${d:0:1}" = ":" ]; then
+				# X11
+				export DISPLAY=$d
+				export XAUTHORITY=$(ps a | grep " $DISPLAY " | grep -o -- '-auth.*$' | grep -m1 -v grep | awk '{print $2}')
+				# TODO: Don't look... We need to pick a proper util for this
+				/opt/openslx/cups/printergui --error "$MESSAGE" &
+				unset DISPLAY XAUTHORITY
+				USERS=$(( $USERS + 1 ))
+			elif [ "${d:0:3}" = "tty" ]; then
+				# Regular tty
+				cat > "/dev/$d" <<-EOF
+				*
+				***************************
+				$MESSAGE
+				***************************
+				*
+				EOF
+				USERS=$(( $USERS + 1 ))
+			elif [ "${d:0:3}" = "pts" ]; then
+				# pts - xterm or ssh session
+				cat > "/dev/pts/${d:3}" <<-EOF
+				*
+				***************************
+				$MESSAGE
+				***************************
+				*
+				EOF
+				USERS=$(( $USERS + 1 ))
+			fi
+		done
+		FILE=$(mktemp)
+		who > "$FILE"
+		slxlog "idleaction-busy" "Postponed $MODE ($MINUTES minutes max.) - $USERS user(s) still active"
+		sleep 1
+		rm -- "$FILE"
+	fi
+	sleep 15
+done
+
+$MODE
+