Author: ssolsagl
Date: 2007-04-27 08:40:30 +0200 (Fri, 27 Apr 2007)
New Revision: 4903
Modified:
trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/VelocityDebugServlet.java
Log:
fetch ipAddr properly
Modified:
trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/VelocityDebugServlet.java
===================================================================
---
trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/VelocityDebugServlet.java
2007-04-27 06:30:18 UTC (rev 4902)
+++
trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/VelocityDebugServlet.java
2007-04-27 06:40:30 UTC (rev 4903)
@@ -49,10 +49,10 @@
Element html = doc.createElement(HTML);
Element body = doc.createElement(BODY);
- if(isLocalhost(request)) {
+ if(!isLocalhost(request)) {
LOG.warn("velocitydebug when running localhost only.");
body.appendChild(doc.createTextNode("Localhost only."));
- internalWriteDocument(doc, response.getWriter()));
+ internalWriteDocument(doc, response.getWriter());
return;
}
// TODO Auto-generated method stub
@@ -66,23 +66,20 @@
}
System.setProperty(VELOCITY_DEBUG, debugStatus);
-
-
-
body.appendChild(doc.createTextNode(ON_OFF + " " +
debugStatus));
-
html.appendChild(body);
doc.appendChild(html);
-
internalWriteDocument(doc, response.getWriter());
-
}
/*
* Assure that debug is only used when running localhost
*/
private boolean isLocalhost(HttpServletRequest request) {
- String ipAddr = (String)request.getAttribute("REMOTE_ADDR") +
"";
+ String ipAddr = (String)request.getAttribute("REMOTE_ADDR");
+ if(ipAddr == null) {
+ ipAddr = request.getRemoteAddr() + "";
+ }
return ipAddr.startsWith("127.") || ipAddr.startsWith("10.") ||
ipAddr.startsWith("0:0:0:0:0:0:0:1%0");
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
