Merge pull request 'Avoid a few cases of chmod-after-creation' (#3438) from tangential/clan-core:it-s_a_race into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3438
This commit is contained in:
Mic92
2025-05-04 07:08:43 +00:00
3 changed files with 17 additions and 11 deletions

View File

@@ -210,14 +210,18 @@ in
data_dir = Path('data')
data_dir.mkdir(mode=0o770, exist_ok=True)
# Create a temporary config file
# with appropriate permissions
tmp_config_path = data_dir / '.config.json'
tmp_config_path.touch(mode=0o660, exist_ok=False)
# Write the config with secrets back
config_path = data_dir / 'config.json'
with open(config_path, 'w') as f:
with open(tmp_config_path, 'w') as f:
f.write(json.dumps(config, indent=4))
# Set file permissions to read and write
# only by the user and group
config_path.chmod(0o660)
# Move config into place
config_path = data_dir / 'config.json'
tmp_config_path.rename(config_path)
# Set file permissions to read
# and write only by the user and group