packages/powerdns-admin: fix oidc userinfo bug
This commit is contained in:
parent
a6d0b92a54
commit
dfd5e3306b
4 changed files with 17 additions and 0 deletions
|
@ -6,6 +6,7 @@
|
||||||
in {
|
in {
|
||||||
|
|
||||||
inherit (patched)
|
inherit (patched)
|
||||||
|
powerdns-admin
|
||||||
prometheus-jitsi-exporter
|
prometheus-jitsi-exporter
|
||||||
sssd
|
sssd
|
||||||
tempo
|
tempo
|
||||||
|
|
|
@ -80,6 +80,8 @@ super: rec {
|
||||||
jre = jre17_standard;
|
jre = jre17_standard;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
powerdns-admin = patch super.powerdns-admin "patches/base/powerdns-admin";
|
||||||
|
|
||||||
prometheus-jitsi-exporter = patch super.prometheus-jitsi-exporter "patches/base/prometheus-jitsi-exporter";
|
prometheus-jitsi-exporter = patch super.prometheus-jitsi-exporter "patches/base/prometheus-jitsi-exporter";
|
||||||
|
|
||||||
tempo = (super.tempo.override { buildGoModule = super.buildGo119Module; }).overrideAttrs (_: {
|
tempo = (super.tempo.override { buildGoModule = super.buildGo119Module; }).overrideAttrs (_: {
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
hci = [ "x86_64-linux" ];
|
hci = [ "x86_64-linux" ];
|
||||||
hydra = [ "x86_64-linux" ];
|
hydra = [ "x86_64-linux" ];
|
||||||
keycloak = [ "x86_64-linux" ];
|
keycloak = [ "x86_64-linux" ];
|
||||||
|
powerdns-admin = [ "x86_64-linux" ];
|
||||||
prometheus-jitsi-exporter = [ "aarch64-linux" ];
|
prometheus-jitsi-exporter = [ "aarch64-linux" ];
|
||||||
searxng = [ "x86_64-linux" ];
|
searxng = [ "x86_64-linux" ];
|
||||||
tempo = [ "x86_64-linux" ];
|
tempo = [ "x86_64-linux" ];
|
||||||
|
|
13
patches/base/powerdns-admin/fix-userinfo.patch
Normal file
13
patches/base/powerdns-admin/fix-userinfo.patch
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/powerdnsadmin/routes/index.py b/powerdnsadmin/routes/index.py
|
||||||
|
index 3a6f55c..417e05f 100644
|
||||||
|
--- a/powerdnsadmin/routes/index.py
|
||||||
|
+++ b/powerdnsadmin/routes/index.py
|
||||||
|
@@ -392,7 +392,7 @@ def login():
|
||||||
|
return authenticate_user(user, 'Azure OAuth')
|
||||||
|
|
||||||
|
if 'oidc_token' in session:
|
||||||
|
- user_data = json.loads(oidc.get('userinfo').text)
|
||||||
|
+ user_data = oidc.userinfo()
|
||||||
|
oidc_username = user_data[Setting().get('oidc_oauth_username')]
|
||||||
|
oidc_first_name = user_data[Setting().get('oidc_oauth_firstname')]
|
||||||
|
oidc_last_name = user_data[Setting().get('oidc_oauth_last_name')]
|
Loading…
Reference in a new issue