[Archive-access-cvs] SF.net SVN: archive-access:[3152] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java

[<bra...@us...>]

Revision: 3152
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3152&view=rev
Author:   bradtofel
Date:     2010-06-05 01:23:08 +0000 (Sat, 05 Jun 2010)

Log Message:
-----------
allowed configuration of the Interstitial jsp page.
changed behavior of the interstitial page to only fire if a Referer header is sent, but not from our allowed host
now static files which end in "-wrap.jsp" get the UI wrapper applied to them.

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java	2010-06-05 01:20:16 UTC (rev 3151)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java	2010-06-05 01:23:08 UTC (rev 3152)
@@ -83,7 +83,7 @@
 public class AccessPoint extends AbstractRequestHandler 
 implements ShutdownListener {
 	/** webapp relative location of Interstitial.jsp */
-	public final static String INTERSTITIAL_JSP = "jsp/Interstitial.jsp";
+	public final static String INTERSTITIAL_JSP = "jsp/Interstitial-wrap.jsp";
 	/** argument for Interstitial.jsp target URL */
 	public final static String INTERSTITIAL_TARGET = "target";
 	/** argument for Interstitial.jsp seconds to delay */
@@ -106,6 +106,7 @@
 	private String replayPrefix = null;
 	
 	private String wrapperJsp = "/WEB-INF/template/UI-wrapper.jsp";
+	private String interstitialJsp = INTERSTITIAL_JSP;
 
 	private String refererAuth = null;
 
@@ -133,13 +134,13 @@
 			return false;
 		}
 //		String contextRelativePath = httpRequest.getServletPath();
-		String translated = "/" + translateRequestPath(httpRequest);
+		String translatedNoQuery = "/" + translateRequestPath(httpRequest);
 //		String absPath = getServletContext().getRealPath(contextRelativePath);
-		String absPath = getServletContext().getRealPath(translated);
+		String absPath = getServletContext().getRealPath(translatedNoQuery);
 		File test = new File(absPath);
 		if(test.exists()) {
 			
-			String translated2 = "/" + translateRequestPathQuery(httpRequest);
+			String translatedQ = "/" + translateRequestPathQuery(httpRequest);
 	
 			WaybackRequest wbRequest = new WaybackRequest();
 //			wbRequest.setContextPrefix(getUrlRoot());
@@ -147,7 +148,12 @@
 			wbRequest.fixup(httpRequest);
 			UIResults uiResults = new UIResults(wbRequest,uriConverter);
 			try {
-				uiResults.forward(httpRequest, httpResponse, translated2);
+				if(translatedNoQuery.endsWith("-wrap.jsp")) {
+					uiResults.forwardWrapped(httpRequest, httpResponse, 
+							translatedQ, wrapperJsp);
+				} else {
+					uiResults.forward(httpRequest, httpResponse, translatedQ);
+				}
 				return true;
 			} catch(IOException e) {
 				// TODO: figure out if we got IO because of a missing dispatcher
@@ -273,16 +279,16 @@
 
 	private void checkInterstitialRedirect(HttpServletRequest httpRequest) 
 	throws BetterRequestException {
-		if(refererAuth != null) {
+		if((refererAuth != null) && (refererAuth.length() > 0)) {
 			String referer = httpRequest.getHeader("Referer");
-			if((referer == null) || (!referer.contains(refererAuth))) {
+			if((referer != null) && (referer.length() > 0) && (!referer.contains(refererAuth))) {
 				StringBuffer sb = httpRequest.getRequestURL();
 				if(httpRequest.getQueryString() != null) {
 					sb.append("?").append(httpRequest.getQueryString());
 				}
 				StringBuilder u = new StringBuilder();
 				u.append(getQueryPrefix());
-				u.append(INTERSTITIAL_JSP);
+				u.append(interstitialJsp);
 				u.append("?");
 				u.append(INTERSTITIAL_SECONDS).append("=").append(5);
 				u.append("&");
@@ -562,6 +568,20 @@
 	}
 
 	/**
+	 * @param interstitialJsp the interstitialJsp to set
+	 */
+	public void setInterstitialJsp(String interstitialJsp) {
+		this.interstitialJsp = interstitialJsp;
+	}
+
+	/**
+	 * @return the interstitialJsp
+	 */
+	public String getInterstitialJsp() {
+		return interstitialJsp;
+	}
+
+	/**
 	 * @param urlRoot explicit URL prefix to use when creating ANY self 
 	 * referencing URLs
 	 * @deprecated use setQueryPrefix, setReplayPrefix, setStaticPrefix


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.