azkaban-developers

detect browser based on browser engine

9/2/2015 8:45:58 PM

Hien Luu

Commit: 01c6060

Tree: 7ed4289

Parents: 52a92b1

Changes

azkaban-common/src/main/java/azkaban/utils/StringUtils.java 2(+1 -1)

azkaban-common/src/test/java/azkaban/utils/StringUtilsTest.java 4(+2 -2)

azkaban-webserver/src/main/java/azkaban/webapp/servlet/LoginAbstractAzkabanServlet.java 4(+0 -4)

Details

azkaban-common/src/main/java/azkaban/utils/StringUtils.java 2(+1 -1)

diff --git a/azkaban-common/src/main/java/azkaban/utils/StringUtils.java b/azkaban-common/src/main/java/azkaban/utils/StringUtils.java
index 6e1c5d8..924afd2 100644
--- a/azkaban-common/src/main/java/azkaban/utils/StringUtils.java
+++ b/azkaban-common/src/main/java/azkaban/utils/StringUtils.java
@@ -91,7 +91,7 @@ public class StringUtils {
   }
 
   private static final Pattern BROWSWER_PATTERN = Pattern
-      .compile(".*Chrome.*|.*Firefox.*|.*Safari.*");
+      .compile(".*Gecko.*|.*AppleWebKit.*|.*Trident.*|.*Chrome.*");
 
   public static boolean isFromBrowser(String userAgent) {
     if (userAgent == null) {

azkaban-common/src/test/java/azkaban/utils/StringUtilsTest.java 4(+2 -2)

diff --git a/azkaban-common/src/test/java/azkaban/utils/StringUtilsTest.java b/azkaban-common/src/test/java/azkaban/utils/StringUtilsTest.java
index 2c8397b..71c3d21 100644
--- a/azkaban-common/src/test/java/azkaban/utils/StringUtilsTest.java
+++ b/azkaban-common/src/test/java/azkaban/utils/StringUtilsTest.java
@@ -19,8 +19,8 @@ public class StringUtilsTest {
   private static final String[] browserVariants = { chromeOnMac, fireFoxOnMac,
       safariOnMac, chromeOnLinux, fireFoxOnLinux };
 
-  private static final String[] BROWSER_NAMES =
-      { "Chrome", "Firefox", "Safari" };
+  private static final String[] BROWSER_NAMES = { "AppleWebKit", "Gecko",
+      "Chrome" };
 
   @Test
   public void isBrowser() throws Exception {

azkaban-webserver/src/main/java/azkaban/webapp/servlet/LoginAbstractAzkabanServlet.java 4(+0 -4)

diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/LoginAbstractAzkabanServlet.java b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/LoginAbstractAzkabanServlet.java
index 5eee1d4..1d9f315 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/LoginAbstractAzkabanServlet.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/LoginAbstractAzkabanServlet.java
@@ -25,7 +25,6 @@ import java.io.Writer;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
-import java.util.regex.Pattern;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
@@ -60,9 +59,6 @@ public abstract class LoginAbstractAzkabanServlet extends
   private static final String SESSION_ID_NAME = "azkaban.browser.session.id";
   private static final int DEFAULT_UPLOAD_DISK_SPOOL_SIZE = 20 * 1024 * 1024;
 
-  private static final Pattern BROWSWER_PATTERN = Pattern
-      .compile("[*Chrome*|*Firefox*|*Safari*]");
-
   private static HashMap<String, String> contextType =
       new HashMap<String, String>();
   static {