From 0a30a04784947c37dd9239fdc49b477e40be31d8 Mon Sep 17 00:00:00 2001
From: Jan Pazdziora <jpazdziora@redhat.com>
Date: Wed, 8 Jan 2014 03:16:43 -0500
Subject: Allow /application/login2 to also be treated as login page.

---
 app.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app.cgi')

diff --git a/app.cgi b/app.cgi
index 2cd143a..d97ed8e 100755
--- a/app.cgi
+++ b/app.cgi
@@ -96,7 +96,7 @@ EOS
 }
 
 if (defined $ENV{PATH_INFO}) {
-	if ($ENV{PATH_INFO} eq $LOGIN) {
+	if (substr($ENV{PATH_INFO}, 0, length($LOGIN)) eq $LOGIN) {
 		login();
 		push @nav, qq!<a href="$ENV{SCRIPT_NAME}">Back to application</a>!;
 	} elsif ($ENV{PATH_INFO} eq $LOGOUT) {
-- 
cgit 


From cdaaa88a4c9b516080555aa8b9f9df65ad0b5b90 Mon Sep 17 00:00:00 2001
From: Jan Pazdziora <jpazdziora@redhat.com>
Date: Wed, 8 Jan 2014 03:28:09 -0500
Subject: For REMOTE_USER, process other attributes as well, provided by
 mod_lookup_identity.

---
 app.cgi | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'app.cgi')

diff --git a/app.cgi b/app.cgi
index d97ed8e..badc13a 100755
--- a/app.cgi
+++ b/app.cgi
@@ -62,6 +62,14 @@ sub login {
 	my $error = '';
 	if (defined $ENV{REMOTE_USER}) {
 		$login = $ENV{REMOTE_USER};
+		if (defined $ENV{REMOTE_USER_EMAIL}) {
+			$login .= ": $ENV{REMOTE_USER_EMAIL}";
+		}
+		my $n = join ' ', grep defined $_, map $ENV{$_},
+			'REMOTE_USER_FIRSTNAME', 'REMOTE_USER_LASTNAME';
+		if ($n ne '') {
+			$login = "$n ($login)";
+		}
 	} elsif (defined $login) {
 		my $re = qr/^[-a-zA-Z0-9_.]+$/;
 		if ($login eq '' or not $login =~ $re) {
-- 
cgit