From 561d35ddc0860dff2e91a35a452966d8ee8fa9f1 Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 5 Jul 2011 15:36:09 +0000
Subject: [PATCH] Change SesameController to FriendController

---
 webapp/config/web.xml                           |  8 ++++----
 ...ameController.java => FriendController.java} | 17 ++++++++++-------
 2 files changed, 14 insertions(+), 11 deletions(-)
 rename webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/{SesameController.java => FriendController.java} (87%)

diff --git a/webapp/config/web.xml b/webapp/config/web.xml
index 7c9769e80..f31538b32 100644
--- a/webapp/config/web.xml
+++ b/webapp/config/web.xml
@@ -1089,12 +1089,12 @@
   </servlet-mapping>
 
   <servlet>
-    <servlet-name>sesame</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.authenticate.SesameController</servlet-class>
+    <servlet-name>friend</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.authenticate.FriendController</servlet-class>
   </servlet>
   <servlet-mapping>
-    <servlet-name>sesame</servlet-name>
-    <url-pattern>/admin/sesame</url-pattern>
+    <servlet-name>friend</servlet-name>
+    <url-pattern>/admin/friend</url-pattern>
   </servlet-mapping>
 
   <servlet>
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/SesameController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FriendController.java
similarity index 87%
rename from webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/SesameController.java
rename to webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FriendController.java
index a663188f8..a6ebf2818 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/SesameController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FriendController.java
@@ -28,14 +28,14 @@ import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
 /**
  * Back door to log in as the root user.
  * 
- * If the classpath contains a file called sesame.xml, which contains a magic
+ * If the classpath contains a file called friend.xml, which contains a magic
  * line (see below) with today's date, or some date less than a week ago, then
  * you are logged in as root.
  * 
  * If anything else, return a 404.
  */
-public class SesameController extends HttpServlet {
-	private static final Log log = LogFactory.getLog(SesameController.class);
+public class FriendController extends HttpServlet {
+	private static final Log log = LogFactory.getLog(FriendController.class);
 
 	private static final long MILLIS_IN_A_WEEK = 7L * 24L * 60L * 60L * 1000L;
 
@@ -73,7 +73,7 @@ public class SesameController extends HttpServlet {
 
 	private InputStream openTheFile() throws Exception {
 		InputStream stream = this.getClass().getClassLoader()
-				.getResourceAsStream("/sesame.xml");
+				.getResourceAsStream("/friend.xml");
 		if (stream == null) {
 			throw new Exception("can't find the file.");
 		}
@@ -93,7 +93,8 @@ public class SesameController extends HttpServlet {
 
 	private boolean checkDateString(String string) throws Exception {
 		long date = parseDateFromFile(string);
-		return compareAgainstDateRange(date);
+		compareAgainstDateRange(date);
+		return true;
 	}
 
 	private long parseDateFromFile(String string) throws Exception {
@@ -107,10 +108,12 @@ public class SesameController extends HttpServlet {
 		return new SimpleDateFormat("yyyy-MM-dd").parse(m.group()).getTime();
 	}
 
-	private boolean compareAgainstDateRange(long date) {
+	private void compareAgainstDateRange(long date) throws Exception {
 		long now = new Date().getTime();
 		long then = now - MILLIS_IN_A_WEEK;
-		return (date < now) && (date > then);
+		if ((date > now) || (date < then)) {
+			throw new Exception("date out of range.");
+		}
 	}
 
 	private void writeWarningToTheLog(HttpServletRequest req) {