From cf575b43cdd157f7c3eb4a4e3ca4da5317194275 Mon Sep 17 00:00:00 2001
From: Robin Eklund <robi-ekl@dsv.su.se>
Date: Tue, 26 Jul 2011 11:05:40 +0200
Subject: [PATCH] More scanning for attributes

---
 .../AdminServerEnvironmentSettingsPage.java      | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminServerEnvironmentSettingsPage.java b/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminServerEnvironmentSettingsPage.java
index 77675f098f..546f039745 100644
--- a/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminServerEnvironmentSettingsPage.java
+++ b/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminServerEnvironmentSettingsPage.java
@@ -63,11 +63,19 @@ public class AdminServerEnvironmentSettingsPage extends AbstractAdminSettingsPag
 				"Shib-Authentication-Instant","Shib-Authentication-Method","Shib-AuthnContext-Class",
 				"Shib-AuthnContext-Decl","Shib-Identity-Provider","mail","cn","eppn","gidNumber","givenName","sn","uid","memberOf"};
 		for(final String attr : attrs){
-			if(request.getAttribute(attr) != null)
-				list.add(new KeyValuePair<String>("[M-ATTR] "+attr,request.getAttribute(attr).toString()));
-			if(request.getHeader(attr) != null)
-				list.add(new KeyValuePair<String>("[M-HEAD] "+attr,request.getHeader(attr)));
+			addPrefixedManualAttribute(request,list,"",attr);
+			addPrefixedManualAttribute(request,list,"AJP_",attr);
+			addPrefixedManualAttribute(request,list,"AJP-",attr);
 		}
 	}
+	private void addPrefixedManualAttribute(final HttpServletRequest request, final List<KeyValuePair<String>> list, final String prefix, final String attr){
+		final String scanAttr = prefix+attr;
+		if(request.getAttribute(scanAttr) != null)
+			list.add(new KeyValuePair<String>("[M-ATTR] "+scanAttr,request.getAttribute(scanAttr).toString()));
+		if(request.getHeader(scanAttr) != null)
+			list.add(new KeyValuePair<String>("[M-HEAD] "+scanAttr,request.getHeader(scanAttr)));
+		if(System.getenv(scanAttr) != null)
+			list.add(new KeyValuePair<String>("[M-ENV] "+scanAttr,System.getenv(scanAttr)));
+	}
 }