135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

strip realm from username (B. Marshall)

Browse Source
This commit is contained in:
Oliver Gorwits
2016-10-01 17:50:47 +01:00
parent 4a81e7ca76
commit 38999a162b
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -10,6 +10,7 @@
* systemd deployment guide * systemd deployment guide
* document env var for https reverse proxy (B. Marshall) * document env var for https reverse proxy (B. Marshall)
* [#279] Web sessions use cookies instead of files on disk (M. Johnson) * [#279] Web sessions use cookies instead of files on disk (M. Johnson)
* strip realm from username (B. Marshall)
[BUG FIXES] [BUG FIXES]

8
Netdisco/lib/App/Netdisco/Web/AuthN.pm
View File

@@ -12,13 +12,17 @@ hook 'before' => sub {
if (setting('trust_x_remote_user') if (setting('trust_x_remote_user')
and scalar request->header('X-REMOTE_USER') and scalar request->header('X-REMOTE_USER')
and length scalar request->header('X-REMOTE_USER')) { and length scalar request->header('X-REMOTE_USER')) {
session(logged_in_user => scalar request->header('X-REMOTE_USER'));
(my $user = scalar request->header('X-REMOTE_USER')) =~ s/@[^@]*$//;
session(logged_in_user => $user);
session(logged_in_user_realm => 'users'); session(logged_in_user_realm => 'users');
} }
elsif (setting('trust_remote_user') elsif (setting('trust_remote_user')
and defined $ENV{REMOTE_USER} and defined $ENV{REMOTE_USER}
and length $ENV{REMOTE_USER}) { and length $ENV{REMOTE_USER}) {
session(logged_in_user => $ENV{REMOTE_USER});
(my $user = $ENV{REMOTE_USER}) =~ s/@[^@]*$//;
session(logged_in_user => $user);
session(logged_in_user_realm => 'users'); session(logged_in_user_realm => 'users');
} }
elsif (setting('no_auth')) { elsif (setting('no_auth')) {