diff options
| author | Simon Rettberg | 2024-05-03 17:09:42 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2024-05-03 17:09:42 +0200 |
| commit | 0b5da07577fd168692022e6b9311fb221ab38cb7 (patch) | |
| tree | 79d046d9012405e4c2fa2304c005fc76090eca88 | |
| parent | [hardware-stats] Minor cleanup (diff) | |
| download | mltk-0b5da07577fd168692022e6b9311fb221ab38cb7.tar.gz mltk-0b5da07577fd168692022e6b9311fb221ab38cb7.tar.xz mltk-0b5da07577fd168692022e6b9311fb221ab38cb7.zip | |
[lightdm-greeter-bwlp/vmchooser2] Handle cow token
3 files changed, 25 insertions, 0 deletions
diff --git a/core/modules/lightdm-greeter-bwlp/data/etc/tmpfiles.d/cow-token.conf b/core/modules/lightdm-greeter-bwlp/data/etc/tmpfiles.d/cow-token.conf new file mode 100644 index 00000000..c6a0a98c --- /dev/null +++ b/core/modules/lightdm-greeter-bwlp/data/etc/tmpfiles.d/cow-token.conf @@ -0,0 +1 @@ +d /run/openslx/lightdm 0700 lightdm lightdm diff --git a/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser b/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser index a0048f39..d0555bfe 100755 --- a/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser +++ b/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser @@ -93,5 +93,9 @@ if [ -n "$SLX_SCREEN_SAVER_TIMEOUT" ]; then EXTRA+=( "--allow-screensaver-disable" ) fi +if [ -s "/run/user/$(id -u)/cow-token" ]; then + EXTRA+=( "--cow-token" "/run/user/$(id -u)/cow-token" ) +fi + exec vmchooser.real "$@" --url "$URL" --fullscreen --tab "$TAB" --start-uuid "$SLX_EXAM_START" "${EXTRA[@]}" diff --git a/core/modules/vmchooser2/data/opt/openslx/pam/hooks/session-open.d/50-move-admintoken.sh b/core/modules/vmchooser2/data/opt/openslx/pam/hooks/session-open.d/50-move-admintoken.sh new file mode 100755 index 00000000..578b1046 --- /dev/null +++ b/core/modules/vmchooser2/data/opt/openslx/pam/hooks/session-open.d/50-move-admintoken.sh @@ -0,0 +1,20 @@ +#!/bin/ash +# ^ actually sourced + +if [ "$PAM_SERVICE" != "su" ] && [ "$PAM_SERVICE" != "sudo" ]; then + md5=$( printf "%s" "$PAM_USER" | md5sum ) + file="/run/openslx/lightdm/${md5:0:32}" + if [ -s "$file" ]; then + getent="$( getent passwd "$PAM_USER" )" + USER_UID="$( printf "%s" "$getent" | awk -F: '{print $3; exit}' )" + udir="/run/user/$USER_UID" + if ! [ -d "$udir" ]; then + USER_GID="$( printf "%s" "$getent" | awk -F: '{print $4; exit}' )" + mkdir -p "$udir" + chmod 0700 "$udir" + chown "${USER_UID}:${USER_GID}" "$udir" + fi + mv -f "$file" "$udir/cow-token" + chown "$USER_UID" "$udir/cow-token" + fi +fi |