From 454cfd772ec83dd8c6ad006d160ff42855b65db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20Rama=C5=A1euski?= <andrej@x2.cz>
Date: Wed, 14 Apr 2021 01:03:21 +0200
Subject: [PATCH] Odstranene linearni mapovani skupin na role
---
lib/CF/Helpers/Auth.pm | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/lib/CF/Helpers/Auth.pm b/lib/CF/Helpers/Auth.pm
index 7417dd7..866ceb2 100644
--- a/lib/CF/Helpers/Auth.pm
+++ b/lib/CF/Helpers/Auth.pm
@@ -81,6 +81,7 @@ sub register ( $class, $self, $conf) {
uuid => $claims->{sub},
username => $claims->{preferred_username},
name => $claims->{name},
+ groups => $claims->{groups},
main_group_name => $c->oauth_main_group_name(),
};
}
@@ -94,19 +95,7 @@ sub register ( $class, $self, $conf) {
@roles = split /\W+/, $c->req->headers('X-Roles');
}
elsif ( my $claims = $c->oauth_claims ) {
-
- if ( $c->cfg->{groups_to_roles_map} ) {
- GROUP:
- foreach my $group ( sort @{ $claims->{groups} } ) {
- if ($c->cfg->{groups_to_roles_map} =~ /$group=(\w+)/x) {
- push @roles, $1;
- }
- }
- }
- else {
- @roles = @{ $claims->{roles} // [] };
- }
-
+ @roles = @{ $claims->{roles} // [] };
}
$c->stash->{user_roles} //= { map { $_ => 1 } @roles };
--
GitLab