Fix incorrect password log path in _seed_builtin_admin
The warning message referenced 'data/auth.log' but the actual file is /var/log/vacuum-wall/auth.log. Also add error logging when the write fails, instead of silently swallowing the OSError.
This commit is contained in:
@@ -307,12 +307,8 @@ def _seed_builtin_admin(db: Database) -> None:
|
|||||||
for subsystem in ALL_SUBSYSTEMS:
|
for subsystem in ALL_SUBSYSTEMS:
|
||||||
tx.run(Q_UPSERT_PERMISSION, (BUILTIN_ADMIN_USERNAME, subsystem, "rw"))
|
tx.run(Q_UPSERT_PERMISSION, (BUILTIN_ADMIN_USERNAME, subsystem, "rw"))
|
||||||
|
|
||||||
logger.warning(
|
|
||||||
"Builtin admin user created. THIS IS A FALLBACK — bootstrap_auth.py "
|
|
||||||
"should have run during install. Admin password: %s... (check data/auth.log)",
|
|
||||||
random_password[:6],
|
|
||||||
)
|
|
||||||
auth_log = Path("/var/log/vacuum-wall/auth.log")
|
auth_log = Path("/var/log/vacuum-wall/auth.log")
|
||||||
|
auth_log_written = False
|
||||||
try:
|
try:
|
||||||
auth_log.write_text(
|
auth_log.write_text(
|
||||||
f"Builtin admin password: {random_password}\n", encoding="utf-8"
|
f"Builtin admin password: {random_password}\n", encoding="utf-8"
|
||||||
@@ -320,8 +316,17 @@ def _seed_builtin_admin(db: Database) -> None:
|
|||||||
import os as _os
|
import os as _os
|
||||||
|
|
||||||
_os.chmod(str(auth_log), 0o600)
|
_os.chmod(str(auth_log), 0o600)
|
||||||
|
auth_log_written = True
|
||||||
except OSError:
|
except OSError:
|
||||||
pass
|
logger.error("Could not write admin password to %s", auth_log)
|
||||||
|
logger.warning(
|
||||||
|
"Builtin admin user created. THIS IS A FALLBACK — bootstrap_auth.py "
|
||||||
|
"should have run during install. Admin password: %s... (%s)",
|
||||||
|
random_password[:6],
|
||||||
|
"see /var/log/vacuum-wall/auth.log for the full password"
|
||||||
|
if auth_log_written
|
||||||
|
else "full password NOT written — check the error above",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def reset_db_for_test() -> None:
|
def reset_db_for_test() -> None:
|
||||||
|
|||||||
Reference in New Issue
Block a user