added nested frame depth limit. (max depth is 16) (#311)

vmi · Feb 2, 2020 · 44c51d2 · 44c51d2
1 parent 177b421
commit 44c51d2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/RELEASENOTE.md b/RELEASENOTE.md
@@ -4,6 +4,7 @@ Selenese Runner Java Relase Note
 ### 3.29.0
 
 * Don't take screenshots with assert* and `selectFrame` commands. (#315, #316)
+* Add nested frame depth limit. (max depth is 16) (#311)
 * Update dependency versions.
 
 ### 3.28.0

diff --git a/src/main/java/jp/vmi/selenium/selenese/locator/WebDriverElementFinder.java b/src/main/java/jp/vmi/selenium/selenese/locator/WebDriverElementFinder.java
@@ -37,6 +37,7 @@ public class WebDriverElementFinder {
 
     private static final int MIN_TIMEOUT = 3000; // ms
     private static final long RETRY_INTERVAL = 100; // ms
+    private static final int MAX_FRAME_DEPTH = 16;
 
     private static final Logger log = LoggerFactory.getLogger(WebDriverElementFinder.class);
 
@@ -211,6 +212,10 @@ private List<WebElement> findElementsByLocator(LocatorHandler handler, WebDriver
         List<WebElement> result = handler.handle(driver, ploc.arg);
         if (!result.isEmpty())
             return result;
+        if (ploc.frameIndexList.size() >= MAX_FRAME_DEPTH) {
+            log.warn("Nested (i)frame depth exceeded limit: " + MAX_FRAME_DEPTH);
+            return null;
+        }
         int iframeCount = driver.findElements(By.tagName("iframe")).size();
         for (int index = 0; index < iframeCount; index++) {
             pushFrame(driver, ploc, index);