From 6df657c1d7f8efed42f099744b89f023b1006c2e Mon Sep 17 00:00:00 2001
From: wassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Date: Wed, 11 Jun 2003 16:22:58 +0000
Subject: [PATCH] Trim trailing whitespace from config properties, since this
 seems to cause hard to diagnose errors for some people.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@623 ab3bd59b-922f-494d-bb5f-6f0a3c29deca
---
 .../internet2/middleware/shibboleth/aa/AAServlet.java    |   14 ++++++++++++++
 .../middleware/shibboleth/hs/HandleServlet.java          |   14 ++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/src/edu/internet2/middleware/shibboleth/aa/AAServlet.java b/src/edu/internet2/middleware/shibboleth/aa/AAServlet.java
index 3acf9d6..6e807af 100755
--- a/src/edu/internet2/middleware/shibboleth/aa/AAServlet.java
+++ b/src/edu/internet2/middleware/shibboleth/aa/AAServlet.java
@@ -59,6 +59,7 @@ import java.net.URL;
 import java.security.Principal;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
@@ -204,6 +205,19 @@ public class AAServlet extends HttpServlet {
 				log.error("Encountered a problem cleaning up resources: could not close debug stream.");
 			}
 		}
+		
+		//Be nice and trim "extra" whitespace from config properties
+		Enumeration propNames = properties.propertyNames();
+		while (propNames.hasMoreElements()) {
+			String propName = (String) propNames.nextElement();
+			if (properties.getProperty(propName, "").matches(".+\\s$")) {
+				log.debug(
+					"The configuration property ("
+						+ propName
+						+ ") contains trailing whitespace.  Trimming... ");
+				properties.setProperty(propName, properties.getProperty(propName).trim());
+			}
+		}
 
 		return properties;
 	}
diff --git a/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java b/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java
index 31309ed..00d68c4 100644
--- a/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java
+++ b/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java
@@ -62,6 +62,7 @@ import java.security.cert.CertificateException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
+import java.util.Enumeration;
 import java.util.Properties;
 
 import javax.servlet.RequestDispatcher;
@@ -167,6 +168,19 @@ public class HandleServlet extends HttpServlet {
 				log.error("Encountered a problem cleaning up resources: could not close debug stream.");
 			}
 		}
+		
+		//Be nice and trim "extra" whitespace from config properties
+		Enumeration propNames = properties.propertyNames();
+		while (propNames.hasMoreElements()) {
+			String propName = (String) propNames.nextElement();
+			if (properties.getProperty(propName, "").matches(".+\\s$")) {
+				log.debug(
+					"The configuration property ("
+						+ propName
+						+ ") contains trailing whitespace.  Trimming... ");
+				properties.setProperty(propName, properties.getProperty(propName).trim());
+			}
+		}
 
 		return properties;
 	}
-- 
1.7.10.4