SelfPrivacy/selfprivacy-rest-api
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git synced 2025-03-18 20:39:46 +00:00
Code Issues Projects Releases Wiki Activity

Hotfix: user and ssh key creation when no were defined

Browse source
This commit is contained in:
Inex Code 2021-11-18 20:54:45 +02:00
parent 1432671cbe
commit e00aaf7118
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
selfprivacy_api/resources/services/ssh.py
View file

@ -97,6 +97,8 @@ class WriteSSHKey(Resource):
data = json.load(userdata_file) data = json.load(userdata_file)
if "ssh" not in data: if "ssh" not in data:
data["ssh"] = {} data["ssh"] = {}
if "rootKeys" not in data["ssh"]:
data["ssh"]["rootKeys"] = []
# Return 409 if key already in array # Return 409 if key already in array
for key in data["ssh"]["rootKeys"]: for key in data["ssh"]["rootKeys"]:
if key == public_key: if key == public_key:

5
selfprivacy_api/resources/users.py
View file

@ -104,13 +104,14 @@ class Users(Resource):
try: try:
data = json.load(userdata_file) data = json.load(userdata_file)
if "users" not in data:
data["users"] = []
# Return 400 if user already exists # Return 400 if user already exists
for user in data["users"]: for user in data["users"]:
if user["username"] == args["username"]: if user["username"] == args["username"]:
return {"error": "User already exists"}, 409 return {"error": "User already exists"}, 409
if "users" not in data:
data["users"] = []
data["users"].append( data["users"].append(
{ {
"username": args["username"], "username": args["username"],