Fix logic to find driver version from CfT URL (should prevent #1160)

bonigarcia · Nov 6, 2023 · 6299f0b · 6299f0b
1 parent 2901534
commit 6299f0b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/main/java/io/github/bonigarcia/wdm/WebDriverManager.java b/src/main/java/io/github/bonigarcia/wdm/WebDriverManager.java
@@ -164,6 +164,7 @@ public abstract class WebDriverManager {
     protected static final String SLASH = "/";
     protected static final String DASH = "-";
     protected static final String LATEST_RELEASE = "LATEST_RELEASE";
+    protected static final String CFT_LABEL = "chrome-for-testing";
     protected static final NamespaceContext S3_NAMESPACE_CONTEXT = new S3NamespaceContext();
     protected static final String IN_DOCKER = "-in-docker";
     protected static final String CLI_SERVER = "server";
@@ -1387,6 +1388,10 @@ protected String getCurrentVersion(URL url) {
             int i = url.getFile().lastIndexOf(SLASH);
             int j = url.getFile().substring(0, i).lastIndexOf(SLASH) + 1;
             return url.getFile().substring(j, i);
+        } else if (url.getFile().contains(CFT_LABEL)) {
+            int i = url.getFile().indexOf(CFT_LABEL) + CFT_LABEL.length();
+            int j = url.getFile().indexOf(SLASH, i + 1);
+            return url.getFile().substring(i + 1, j);
         } else {
             String currentVersion = "";
             String pattern = "/([^/]*?)/[^/]*?" + getShortDriverName();

diff --git a/src/main/java/io/github/bonigarcia/wdm/online/UrlHandler.java b/src/main/java/io/github/bonigarcia/wdm/online/UrlHandler.java
@@ -93,22 +93,22 @@ public void filterByLatestVersion(Function<URL, String> getCurrentVersion) {
                 candidateUrls);
         List<URL> out = new ArrayList<>();
         List<URL> copyOfList = new ArrayList<>(candidateUrls);
-        String foundFriverVersion = null;
+        String foundDriverVersion = null;
 
         for (URL url : copyOfList) {
             try {
                 if (isNotStable(url)) {
                     continue;
                 }
                 String currentVersion = getCurrentVersion.apply(url);
-                if (isNullOrEmpty(foundFriverVersion)) {
-                    foundFriverVersion = currentVersion;
+                if (isNullOrEmpty(foundDriverVersion)) {
+                    foundDriverVersion = currentVersion;
                 }
-                if (versionCompare(currentVersion, foundFriverVersion) > 0) {
-                    foundFriverVersion = currentVersion;
+                if (versionCompare(currentVersion, foundDriverVersion) > 0) {
+                    foundDriverVersion = currentVersion;
                     out.clear();
                 }
-                if (url.getFile().contains(foundFriverVersion)) {
+                if (url.getFile().contains(foundDriverVersion)) {
                     out.add(url);
                 }
             } catch (Exception e) {
@@ -118,7 +118,7 @@ public void filterByLatestVersion(Function<URL, String> getCurrentVersion) {
             }
         }
 
-        this.driverVersion = foundFriverVersion;
+        this.driverVersion = foundDriverVersion;
         this.candidateUrls = out;
     }