parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Improve store file handling for CLI 

Don't try to chmod every time, instead only chmod when first creating
the file. Also allow loading the default permission from an envvar
rather than hardcoding it.
This commit is contained in:
Joshua Boniface 2020-08-27 13:14:55 -04:00
parent 4fbec63bf4
commit 7bf91b1003
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client-cli/pvc.py
View File

@ -117,10 +117,14 @@ def get_store(store_path):
def update_store(store_path, store_data): def update_store(store_path, store_data):
store_file = '{}/pvc-cli.json'.format(store_path) store_file = '{}/pvc-cli.json'.format(store_path)
with open(store_file, 'w') as fh: if not os.path.exists(store_file):
fh.write(json.dumps(store_data, sort_keys=True, indent=4)) with open(store_file, 'w') as fh:
# Ensure file has 0600 permissions due to API key storage fh.write(json.dumps(store_data, sort_keys=True, indent=4))
os.chmod(store_file, 0o600) # Ensure file has sensible permissions due to API key storage, but only when created!
os.chmod(store_file, int(os.environ.get('PVC_CLIENT_DB_PERMS', 600), 8))
else:
with open(store_file, 'w') as fh:
fh.write(json.dumps(store_data, sort_keys=True, indent=4))
pvc_client_dir = os.environ.get('PVC_CLIENT_DIR', None) pvc_client_dir = os.environ.get('PVC_CLIENT_DIR', None)
home_dir = os.environ.get('HOME', None) home_dir = os.environ.get('HOME', None)