fix: seed GNOME Keyring default pointer on fresh installs, resets, and migrations

Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/c3f5b4ac-12ed-4ff9-ac7c-f07be1f178d9

Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-04-30 13:14:10 +00:00
committed by GitHub
parent 02e662454c
commit f87e9982b0
2 changed files with 46 additions and 0 deletions
+35
View File
@@ -2060,6 +2060,29 @@ async def api_migration_password_acknowledge():
except Exception as exc:
logger.warning("chpasswd exception during migration acknowledge: %s", exc)
# Wipe the old keyring (encrypted with the pre-migration password) and
# seed the default pointer so PAM creates a fresh keyring on next login.
keyring_dir = "/home/free/.local/share/keyrings"
try:
if os.path.isdir(keyring_dir):
for entry in os.listdir(keyring_dir):
entry_path = os.path.join(keyring_dir, entry)
try:
if os.path.isfile(entry_path) or os.path.islink(entry_path):
os.unlink(entry_path)
elif os.path.isdir(entry_path):
shutil.rmtree(entry_path, ignore_errors=True)
except Exception:
pass
os.makedirs(keyring_dir, exist_ok=True)
default_file = os.path.join(keyring_dir, "default")
with open(default_file, "w") as f:
f.write("login\n")
free_pw = pwd.getpwnam("free")
os.chown(default_file, free_pw.pw_uid, free_pw.pw_gid)
except Exception as exc:
logger.warning("Keyring wipe exception during migration acknowledge: %s", exc)
# Clear the pending marker
try:
os.remove(MIGRATION_NEWPASS_FILE)
@@ -3907,6 +3930,18 @@ async def api_security_reset():
except Exception as exc:
errors.append(f"keyring wipe: {exc}")
# Recreate the default pointer so pam_gnome_keyring knows which keyring to
# unlock on the next GDM login without prompting the user.
try:
os.makedirs(keyring_dir, exist_ok=True)
default_file = os.path.join(keyring_dir, "default")
with open(default_file, "w") as f:
f.write("login\n")
free_pw = pwd.getpwnam("free")
os.chown(default_file, free_pw.pw_uid, free_pw.pw_gid)
except Exception as exc:
errors.append(f"keyring default recreation: {exc}")
# The user performed a full security reset — the banner's purpose is served.
try:
os.makedirs(os.path.dirname(SECURITY_BANNER_DISMISSED_FLAG), exist_ok=True)