Skip to content

Fix session guard bypass, missing stderr redirects, and uninitialized… #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
assisted-by-ai wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix session guard bypass, missing stderr redirects, and uninitialized… #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions usr/libexec/user-sysmaint-split/sysmaint-boot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,12 +387,12 @@ parse_user_sysmaint_split_config() {
}

remove_sysmaint_qubes() {
printf "%s\n" "INFO: Qubes unrestricted mode detected. Removing user-sysmaint-split."
printf "%s\n" "INFO: (kernel parameter 'remove-sysmaint-qubes' is present, ok.)"
printf "%s\n" "INFO: Qubes unrestricted mode detected. Removing user-sysmaint-split." >&2
printf "%s\n" "INFO: (kernel parameter 'remove-sysmaint-qubes' is present, ok.)" >&2
dummy-dependency --yes --purge user-sysmaint-split
if accountctl user is-pass-locked 2>/dev/null; then
printf "%s\n" "INFO: Account 'user' has a locked password. Running /usr/bin/passwordless-root to enable passwordless root escalation."
printf "%s\n" "INFO: (kernel parameter 'remove-sysmaint-qubes' is present, ok.)"
printf "%s\n" "INFO: Account 'user' has a locked password. Running /usr/bin/passwordless-root to enable passwordless root escalation." >&2
printf "%s\n" "INFO: (kernel parameter 'remove-sysmaint-qubes' is present, ok.)" >&2
/usr/bin/passwordless-root
fi
}
Expand Down
2 changes: 2 additions & 0 deletions usr/libexec/user-sysmaint-split/sysmaint-session
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ system_tray_list=(
system_tray_arg_list=(
'--edge top --align right --SetPartialStrut true'
)
selected_system_tray=''
selected_system_tray_args=''

for (( idx = 0; idx < ${#system_tray_list[@]}; idx++ )); do
if [ -e "${system_tray_list[idx]}" ]; then
Expand Down
2 changes: 2 additions & 0 deletions usr/libexec/user-sysmaint-split/sysmaint-session-wayland
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ system_tray_list=(
system_tray_arg_list=(
''
)
selected_system_tray=''
selected_system_tray_args=''

for (( idx = 0; idx < ${#system_tray_list[@]}; idx++ )); do
if [ -e "${system_tray_list[idx]}" ]; then
Expand Down
2 changes: 1 addition & 1 deletion usr/share/user-sysmaint-split/conf/X11_Xsession.d_15_sysmaint_no_desktop
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
## See the file COPYING for copying conditions.

if [ "$(id -un)" = 'sysmaint' ] \
&& ! printf '%s\n' 'sysmaint-session' | grep -- '^sysmaint-session' >/dev/null 2>/dev/null \
&& ! printf '%s\n' "$DESKTOP_SESSION" | grep -- '^sysmaint-session' >/dev/null 2>/dev/null \
&& [ ! -f '/usr/share/qubes/marker-vm' ]; then
TERMINAL_WRAPPER_NO_COMMAND_ECHO='true'
export TERMINAL_WRAPPER_NO_COMMAND_ECHO
Expand Down
10 changes: 1 addition & 9 deletions usr/share/user-sysmaint-split/conf/grub.d_10_10_linux_sysmaint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,7 @@ make_boot_entry='true'
: "${session_detail:="system maintenance tasks"}"

grub_distributor_appendix="$persistence_type Mode | SYSMAINT Session | $session_detail"
if [ -e '/usr/share/kicksecure/marker' ]; then
GRUB_DISTRIBUTOR="$grub_distributor_appendix"
elif [ -e '/usr/share/anon-ws-base-files/workstation' ]; then
GRUB_DISTRIBUTOR="$grub_distributor_appendix"
elif [ -e '/usr/share/anon-gw-base-files/gateway' ]; then
GRUB_DISTRIBUTOR="$grub_distributor_appendix"
else
GRUB_DISTRIBUTOR="$grub_distributor_appendix"
fi
GRUB_DISTRIBUTOR="$grub_distributor_appendix"

GRUB_DISABLE_RECOVERY="true"
GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX boot-role=sysmaint systemd.unit=sysmaint-boot.target"
Expand Down