master as of 22/12/22

.github/workflows/docker-build-m1.yml

@@ -30,14 +30,17 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: 'us-east-1'
           AWS_DEFAULT_OUTPUT: json
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
       - name: Login to Docker Hub
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
 
       - name: Building 
         run: |

.github/workflows/docker-build.yml

@@ -30,14 +30,18 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: 'us-east-1'
           AWS_DEFAULT_OUTPUT: json
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
       - name: Login to Docker Hub
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
 
       - name: Building 
         run: |

SECURITY.md

@@ -2,7 +2,7 @@
 
 We extend our sincere gratitude to anyone who reports vulnerabilities to Testsigma Community. These reports are comprehensively investigated by community volunteers as well as Testsigma Team.
 
-To report a security issue, please email us at [[email protected]](mailto:[email protected]) with a detailed overview and necessary information attached. At this juncture, we don't have a bug bounty program. We are a small team trying to solve a big problem. We urge you to report any vulnerabilities responsibly so that we can continue building a secure application for the entire community.
+To report a security issue, please email us at [[email protected]](mailto:[email protected]) with a detailed overview and necessary information attached. For more details, visit the [Vulnerability Disclosure Program](https://testsigma.com/vulnerability-reporting-program). We urge you to report any vulnerabilities responsibly so that we can continue building a secure application for the entire community.
 
 ### When Should I Report a Vulnerability?
 

agent-launcher/dependency-reduced-pom.xml

@@ -57,7 +57,7 @@
     </plugins>
   </build>
   <properties>
-    <lombok.version>1.18.10</lombok.version>
+    <lombok.version>1.18.22</lombok.version>
     <systemtray.version>3.17</systemtray.version>
     <maven.compiler.plugin>3.8.1</maven.compiler.plugin>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

agent-launcher/pom.xml

@@ -13,7 +13,7 @@
     <maven.compiler.plugin>3.8.1</maven.compiler.plugin>
     <commons.lang.version>3.4</commons.lang.version>
     <systemtray.version>3.17</systemtray.version>
-    <lombok.version>1.18.10</lombok.version>
+    <lombok.version>1.18.22</lombok.version>
     <httpcomponents.version>4.5.13</httpcomponents.version>
   </properties>
 

agent/pom.xml

@@ -20,7 +20,9 @@
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
     <maven.compiler.plugin>3.8.1</maven.compiler.plugin>
-    <lombok.version>1.18.20</lombok.version>
+    <selenium.version>4.8.2</selenium.version>
+    <guava.version>31.1-jre</guava.version>
+    <lombok.version>1.18.22</lombok.version>
     <mapstruct.version>1.4.2.Final</mapstruct.version>
     <aws.version>1.11.46</aws.version>
     <android.tools.version>25.3.0</android.tools.version>
@@ -139,6 +141,12 @@
       <groupId>com.android.tools.ddms</groupId>
       <artifactId>ddmlib</artifactId>
       <version>${android.tools.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>

agent/src/main/java/com/testsigma/agent/TestsigmaAgent.java

@@ -24,6 +24,7 @@
 @Log4j2
 public class TestsigmaAgent {
   public static void main(String[] args) {
+    System.setProperty("webdriver.http.factory", "jdk-http-client");
     String wrapperPort = System.getProperty("agent.wrapper.port");
     if (StringUtils.isNotBlank(wrapperPort)) {
       WrapperConnector.getInstance().disconnectHook();

agent/src/main/java/com/testsigma/agent/browsers/LinuxBrowsers.java

@@ -7,9 +7,7 @@
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -55,9 +53,9 @@ public static ArrayList<String> getCommandOutput(String[] command) {
 
   }
 
-  public ArrayList<AgentBrowser> getBrowserList() {
+  public Set<AgentBrowser> getBrowserList() {
 
-    ArrayList<AgentBrowser> browserList = new ArrayList<>();
+    Set<AgentBrowser> browserList = new HashSet<>();
     for (OsBrowserType browserType : browsersMap.keySet()) {
       String browserName = browsersMap.get(browserType);
       ArrayList<String> arrayList = getCommandOutput(new String[]{"which", browserName});

agent/src/main/java/com/testsigma/agent/browsers/MacBrowsers.java

@@ -14,6 +14,8 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 @Log4j2
@@ -33,8 +35,8 @@ public MacBrowsers() {
     this.browsersMap = OsBrowserMap.getInstance().getBrowserMap();
   }
 
-  public ArrayList<AgentBrowser> getBrowserList() {
-    ArrayList<AgentBrowser> browserList = new ArrayList<>();
+  public Set<AgentBrowser> getBrowserList() {
+    Set<AgentBrowser> browserList = new HashSet<>();
 
     try {
       if (runApplicationListCommand()) {

agent/src/main/java/com/testsigma/agent/browsers/WindowsBrowsers.java

@@ -14,9 +14,7 @@
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -83,9 +81,9 @@ private static String getBrowserVersionFromExe(String browserExecutablePath) {
     return browserVersion;
   }
 
-  public ArrayList<AgentBrowser> getBrowserList() throws Exception {
+  public Set<AgentBrowser> getBrowserList() throws Exception {
 
-    ArrayList<AgentBrowser> browserList = new ArrayList<>();
+    Set<AgentBrowser> browserList = new HashSet<>();
     int arch = System.getProperty("os.arch").contains("64") ? 64 : 32;
 
     String nodeValue = (arch == 32) ? "" : "WOW6432Node";
@@ -197,7 +195,7 @@ private String getEdgeVersion() {
     String version = NOT_FOUND;
     String edgeRegKey = searchRegistryByPattern(
       "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\",
-      ".*(Microsoft Edge.*)");
+      ".*(Microsoft Edge$)");
 
     if (StringUtils.isNotBlank(edgeRegKey)) {
       version = searchRegistryByPattern(
@@ -208,7 +206,7 @@ private String getEdgeVersion() {
     if (StringUtils.isBlank(version) || NOT_FOUND.equals(version)) {
       edgeRegKey = searchRegistryByPattern(
         "HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\",
-        ".*(Microsoft Edge.*)");
+        ".*(Microsoft Edge$)");
 
       if (StringUtils.isNotBlank(edgeRegKey)) {
         version = searchRegistryByPattern(
@@ -220,9 +218,14 @@ private String getEdgeVersion() {
 
     if (StringUtils.isBlank(version) || NOT_FOUND.equals(version)) {
       String registryKey = "HKEY_CLASSES_ROOT\\Local Settings\\Software\\Microsoft\\Windows\\CurrentVersion\\AppModel\\PackageRepository\\Packages";
-      String regexPattern = ".*Microsoft.MicrosoftEdge_(.*)";
+      String regexPattern = ".*Microsoft.MicrosoftEdge.Stable_(.*)";
       String regValue = searchRegistryByPattern(registryKey, regexPattern);
       version = regValue.split("_")[0];
+      if(StringUtils.isBlank(version) || NOT_FOUND.equals(version)) {
+        regexPattern = ".*Microsoft.MicrosoftEdge_(.*)";
+        regValue = searchRegistryByPattern(registryKey, regexPattern);
+        version = regValue.split("_")[0];
+      }
     }
     if (version.equals(NOT_FOUND))
       version = getBrowserVersionFromExe("Microsoft\\Edge\\Application\\msedge.exe");

agent/src/main/java/com/testsigma/agent/controllers/HomeController.java

@@ -7,6 +7,7 @@
 
 package com.testsigma.agent.controllers;
 
+import com.testsigma.agent.browsers.AgentBrowser;
 import com.testsigma.agent.config.AgentConfig;
 import com.testsigma.agent.constants.AgentOs;
 import com.testsigma.agent.dto.AgentDTO;
@@ -19,6 +20,7 @@
 import com.testsigma.agent.services.AgentService;
 import com.testsigma.agent.ws.server.AgentWebServer;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.testsigma.automator.entity.OsBrowserType;
 import com.testsigma.automator.http.HttpResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
@@ -28,8 +30,10 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
 
 @Log4j2
 @RestController
@@ -57,7 +61,7 @@ public ResponseEntity<String> register(@PathVariable("uuid") String uuid,
       agentDTO.setHostName(hostName);
       agentDTO.setOsVersion(AgentService.getOsVersion());
       agentDTO.setAgentVersion(this.agentConfig.getAgentVersion());
-      agentDTO.setBrowserList(agentBrowserService.getBrowserList());
+      agentDTO.setBrowserList(getUniqueBrowsersList(agentBrowserService.getBrowserList()));
       agentDTO.setHostName(hostName);
       agentDTO.setOsType(osType);
 
@@ -84,4 +88,20 @@ public ResponseEntity<String> register(@PathVariable("uuid") String uuid,
     }
     return response;
   }
+  private Set<AgentBrowser> getUniqueBrowsersList(Set<AgentBrowser> browsers){
+    Set<AgentBrowser> set = browsers.stream().collect(Collectors.toSet());
+    HashMap<OsBrowserType,AgentBrowser> browserMap = new HashMap<>();
+    for(AgentBrowser set1 : set){
+      if(browserMap.containsKey(set1.getName())){
+        if(browserMap.get(set1.getName()).getMajorVersion()<set1.getMajorVersion()){
+          browserMap.put(set1.getName(),set1);
+        }
+      }
+      else {
+        browserMap.put(set1.getName(),set1);
+      }
+   }
+    Set<AgentBrowser> browserList= new HashSet<>(browserMap.values());
+    return browserList;
+  }
 }

agent/src/main/java/com/testsigma/agent/dto/AgentDTO.java

@@ -13,6 +13,7 @@
 import lombok.ToString;
 
 import java.util.List;
+import java.util.Set;
 
 @Data
 public class AgentDTO {
@@ -24,7 +25,7 @@ public class AgentDTO {
   private String hostName;
   private String osVersion;
   private Boolean isRegistered;
-  private List<AgentBrowser> browserList;
+  private Set<AgentBrowser> browserList;
   private String agentBuild;
   private String ipAddress;
   private String title;

agent/src/main/java/com/testsigma/agent/mobile/DeviceContainer.java

@@ -19,7 +19,6 @@
 import com.testsigma.agent.mappers.MobileDeviceMapper;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.testsigma.automator.AutomatorConfig;
-import com.testsigma.automator.drivers.DriversUpdateService;
 import com.testsigma.automator.entity.Browsers;
 import com.testsigma.automator.entity.OsBrowserType;
 import com.testsigma.automator.exceptions.AutomatorException;
@@ -97,7 +96,6 @@ public void syncBrowserDrivers(MobileDevice mobileDevice) {
         Browsers browser = OsBrowserType.getBrowserType(browserType);
         String driverPath = AutomatorConfig.getInstance().getAppBridge().getDriverExecutablePath(browser.getKey(),
           browserVersion);
-        new DriversUpdateService().syncBrowserDriver(browserType, browserVersion, driverPath);
       } catch (AutomatorException e) {
         log.error(e.getMessage(), e);
       }