Skip to content

Commit 1b5b0dd

Browse files
committed
Set proper log file perms on sudo qubes-vm-update
Set the log file(s) group to `qubes`. Also fixing a minor typo fixes: QubesOS/qubes-issues#10371
1 parent 845aa9f commit 1b5b0dd

4 files changed

Lines changed: 12 additions & 3 deletions

File tree

vmupdate/agent/entrypoint.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from source import plugins
77
from source.args import AgentArgs
88
from source.utils import get_os_data
9-
from source.log_congfig import init_logs
9+
from source.log_config import init_logs
1010
from source.common.exit_codes import EXIT
1111

1212

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import os
2323
import logging
24+
import grp
2425
from pathlib import Path
2526

2627
LOGPATH = '/var/log/qubes/qubes-update'
@@ -63,4 +64,12 @@ def init_logs(
6364
log_level = "DEBUG"
6465
log.setLevel(log_level)
6566

67+
try:
68+
gid = grp.getgrnam("qubes").gr_gid
69+
os.chown(log_path, -1, gid)
70+
os.chmod(log_path, 0o664)
71+
except (PermissionError, KeyError):
72+
# do it on the best effort basis
73+
pass
74+
6675
return log, log_handler, log_level, log_path, log_formatter

vmupdate/qube_connection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
import qubesadmin
3131
from vmupdate.agent.source.args import AgentArgs
32-
from vmupdate.agent.source.log_congfig import LOGPATH, LOG_FILE
32+
from vmupdate.agent.source.log_config import LOGPATH, LOG_FILE
3333
from vmupdate.agent.source.status import StatusInfo, FinalStatus
3434
from vmupdate.agent.source.common.process_result import ProcessResult
3535

vmupdate/update_manager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
from .agent.source.status import StatusInfo, FinalStatus, Status
3636
from .qube_connection import QubeConnection
37-
from vmupdate.agent.source.log_congfig import init_logs
37+
from vmupdate.agent.source.log_config import init_logs
3838
from vmupdate.agent.source.common.process_result import ProcessResult
3939
from vmupdate.agent.source.common.exit_codes import EXIT
4040

0 commit comments

Comments
 (0)