zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Browser detection filter.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-06-21 20:16:13 -03:00
parent f49448d22f
commit a5bf5b8d57
8 changed files with 72 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wise-webapp/src/main/java/com/wisemapping/filter/BrowserSupportInterceptor.java
View File

@@ -18,6 +18,7 @@
package com.wisemapping.filter;
import org.jetbrains.annotations.NotNull;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
import javax.servlet.http.HttpServletRequest;
@@ -26,17 +27,17 @@ import javax.servlet.http.HttpSession;
import com.wisemapping.exceptions.UnsupportedBrowserException;
import java.util.List;
import java.util.Set;
public class BrowserSupportInterceptor extends HandlerInterceptorAdapter {
private List<String> exclude;
private Set<String> exclude;
public static final String USER_AGENT = "wisemapping.userAgent";
public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object object) throws Exception {
public boolean preHandle(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response, Object object) throws Exception {
final String servletPath = httpServletRequest.getServletPath();
if (exclude != null && !exclude.contains(servletPath)) {
final HttpSession session = httpServletRequest.getSession(false);
final String requestUri = request.getRequestURI();
if (exclude != null && !exclude.contains(requestUri)) {
final HttpSession session = request.getSession(false);
// Try to loaded from the request ...
UserAgent userAgent = null;
@@ -46,7 +47,7 @@ public class BrowserSupportInterceptor extends HandlerInterceptorAdapter {
// I could not loaded. I will create a new one...
if (userAgent == null) {
userAgent = UserAgent.create(httpServletRequest);
userAgent = UserAgent.create(request);
if (session != null) {
session.setAttribute(USER_AGENT, userAgent);
}
@@ -61,11 +62,7 @@ public class BrowserSupportInterceptor extends HandlerInterceptorAdapter {
}
public List<String> getExclude() {
return exclude;
}
public void setExclude(List<String> exclude) {
public void setExclude(Set<String> exclude) {
this.exclude = exclude;
}
}

22
wise-webapp/src/main/java/com/wisemapping/filter/UserAgent.java
View File

@@ -114,7 +114,7 @@ public class UserAgent implements Serializable {
this.os = parseOS(productDetails);
if (userAgentHeader.indexOf("MSIE") != -1) {
if (userAgentHeader.contains("MSIE")) {
// Explorer Browser : http://msdn2.microsoft.com/en-us/library/ms537503.aspx
// Format: Mozilla/MozVer (compatible; MSIE IEVer[; Provider]; Platform[; Extension]*) [Addition]
// SampleTest: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0; Google Wireless Transcoder;)
@@ -128,14 +128,14 @@ public class UserAgent implements Serializable {
// Explorer Parse ...
this.product = Product.EXPLORER;
this.hasGCFInstalled = productDetails.indexOf("chromeframe") != -1;
} else if (userAgentHeader.indexOf("iCab") != -1 || userAgentHeader.indexOf("Safari") != -1) {
this.hasGCFInstalled = productDetails.contains("chromeframe");
} else if (userAgentHeader.contains("iCab") || userAgentHeader.contains("Safari")) {
// Safari:
//Formats: Mozilla/5.0 (Windows; U; Windows NT 5.1; en) AppleWebKit/522.13.1 (KHTML, like Gecko) Version/3.0.2 Safari/522.13.1
//Chrome:
//Formats: "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_4; en-US) AppleWebKit/534.7 (KHTML, like Gecko) Chrome/7.0.517.44 Safari/534.7"
String versionStr = "";
if (userAgentHeader.indexOf("Chrome") != -1) {
if (userAgentHeader.contains("Chrome")) {
this.product = Product.CHROME;
versionStr = userAgentHeader.substring(userAgentHeader.indexOf("Chrome") + 7, userAgentHeader.lastIndexOf(" "));
} else {
@@ -145,11 +145,11 @@ public class UserAgent implements Serializable {
parseVersion(versionStr);
} else if (userAgentHeader.indexOf("Konqueror") != -1) {
} else if (userAgentHeader.contains("Konqueror")) {
this.product = Product.KONQUEOR;
} else if (userAgentHeader.indexOf("KMeleon") != -1) {
} else if (userAgentHeader.contains("KMeleon")) {
this.product = Product.KMELEON;
} else if (userAgentHeader.indexOf("Gecko") != -1) {
} else if (userAgentHeader.contains("Gecko")) {
// Firefox/Mozilla/Camino:
// Mozilla/MozVer (Platform; Security; SubPlatform; Language; rv:Revision[; Extension]*) Gecko/GeckVer [Product/ProdVer]
// SampleTest: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.5) Gecko/20050302 Firefox/0.9.6
@@ -195,7 +195,7 @@ public class UserAgent implements Serializable {
}
} else if (userAgentHeader.indexOf("Opera") != -1) {
} else if (userAgentHeader.contains("Opera")) {
// Opera:
// Samples: Opera/9.0 (Windows NT 5.1; U; en)
// Opera/8.5 (Macintosh; PPC Mac OS X; U; en)
@@ -212,14 +212,14 @@ public class UserAgent implements Serializable {
}
parseVersion(productVersion);
} else if (userAgentHeader.indexOf("4.7") != -1) {
} else if (userAgentHeader.contains("4.7")) {
this.product = Product.NETSCAPE;
} else if (userAgentHeader.indexOf("Lynx") != -1) {
} else if (userAgentHeader.contains("Lynx")) {
this.product = Product.LYNX;
} else {
// It's a robot ..
for (String botAgent : botAgents) {
if (userAgentHeader.indexOf(botAgent) != -1) {
if (userAgentHeader.contains(botAgent)) {
// set a key in the session, so the next time we don't have to manually
// detect the robot again
this.product = Product.ROBOT;