SelfPrivacy/selfprivacy-rest-api
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git synced 2025-02-06 16:10:39 +00:00
Code Issues Projects Releases Wiki Activity

fix: reset_and_save_idm_admin_password remove jq from subprocess.check_output

Browse source
This commit is contained in:
dettlaff 2024-11-21 20:45:43 +04:00
parent 7b81c47cee
commit ecbe52e22c
1 changed files with 16 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
selfprivacy_api/repositories/users/kanidm_user_repository.py
View file

@ -3,6 +3,7 @@ from typing import Optional
import os
import subprocess
import requests
import json
from contextlib import contextmanager
from selfprivacy_api.utils import get_domain
@ -81,37 +82,21 @@ class KanidmAdminToken:
@staticmethod
def reset_and_save_idm_admin_password() -> str:
# new_kanidm_admin_password = subprocess.check_output(
# [
# "kanidmd",
# "recover-account",
# "-c",
# "/etc/kanidm/server.toml",
# "idm_admin",
# "-o",
# "json",
# "2>/dev/null",
# "|",
# "grep",
# "'{\"password'",
# "|",
# "jq",
# "-r",
# ".password",
# ]
# ).decode("utf-8")
try:
new_kanidm_admin_password = (
subprocess.check_output(
"kanidmd recover-account -c /etc/kanidm/server.toml idm_admin -o json 2>/dev/null | grep '{\"password' | jq -r .password",
shell=True,
stderr=subprocess.STDOUT,
)
.decode("utf-8")
.strip()
)
except subprocess.CalledProcessError as e:
print(e.output.decode())
output = subprocess.check_output(
[
"kanidmd",
"recover-account",
"-c",
"/etc/kanidm/server.toml",
"idm_admin",
"-o",
"json",
],
stderr=subprocess.DEVNULL,
).decode("utf-8")
data = json.loads(output)
new_kanidm_admin_password = data.get("password", "").strip()
redis.set("kanidm:password", new_kanidm_admin_password)
return new_kanidm_admin_password