dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing the functional testcases together with Travis CI which stopped due to excessive logging from the Tomcat 7 Maven plugin

Browse Source
This commit is contained in:
Nanne Baars 2016-09-19 23:08:44 +02:00
parent 6919b15013
commit 0687b088b6
2 changed files with 124 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -4,11 +4,14 @@ jdk:
- oraclejdk8 - oraclejdk8
install: "/bin/true" install: "/bin/true"
script: script:
- mvn clean install - mvn clean install -q
- git clone -b develop https://github.com/WebGoat/WebGoat-Lessons.git - git clone -b develop https://github.com/WebGoat/WebGoat-Lessons.git
- mvn -file ./WebGoat-Lessons/pom.xml clean package - mvn -file ./WebGoat-Lessons/pom.xml clean package -q
- cp -fa ./WebGoat-Lessons/target/plugins/*.jar ./webgoat-container/src/main/webapp/plugin_lessons/ - cp -fa ./WebGoat-Lessons/target/plugins/*.jar ./webgoat-container/src/main/webapp/plugin_lessons/
- if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then mvn "-Dbuild.number=$TRAVIS_BUILD_NUMBER" -Prun-integration-tests clean install; else mvn clean install; fi # Start the container this will make sure we do not see the debug logging of the Tomcat 7 Maven plugin
# which seems to always be set to DEBUG this will fail the build because we generate too much logging
- nohup bash -c "java -jar ./webgoat-standalone/target/webgoat-standalone-7.1-SNAPSHOT-exec.jar --port 8888 2>&1 &"
- if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then mvn "-Dbuild.number=$TRAVIS_BUILD_NUMBER" clean install failsafe:integration-test; else mvn failsafe:integration-test; fi
cache: cache:
directories: directories:
- $HOME/.m2 - $HOME/.m2

227
webgoat-container/src/test/java/org/owasp/webgoat/plugins/WebGoatIT.java
View File

@ -43,7 +43,7 @@ public class WebGoatIT implements SauceOnDemandSessionIdProvider {
// Since most Tomcat deployments run on port 8080, let's set the automated integration tests to // Since most Tomcat deployments run on port 8080, let's set the automated integration tests to
// spawn tomcat on port 8888 so that we don't interfere with local Tomcat's // spawn tomcat on port 8888 so that we don't interfere with local Tomcat's
private String baseWebGoatUrl = "http://localhost:8888/WebGoat"; protected String baseWebGoatUrl = "http://localhost:8888/WebGoat";
private String loginUser = "webgoat"; private String loginUser = "webgoat";
private String loginPassword = "webgoat"; private String loginPassword = "webgoat";
@ -90,15 +90,9 @@ public class WebGoatIT implements SauceOnDemandSessionIdProvider {
* Represents the device-orientation of mobile device * Represents the device-orientation of mobile device
*/ */
private String deviceOrientation; private String deviceOrientation;
/**
* Instance variable which contains the Sauce Job Id.
*/
private String sessionId;
/** protected ThreadLocal<WebDriver> _webDriver = new ThreadLocal<>();
* The {@link WebDriver} instance which is used to perform browser interactions with. protected ThreadLocal<String> sessionId = new ThreadLocal<>();
*/
private WebDriver driver;
/** /**
@ -122,6 +116,15 @@ public class WebGoatIT implements SauceOnDemandSessionIdProvider {
this.deviceOrientation = deviceOrientation; this.deviceOrientation = deviceOrientation;
} }
public WebDriver getWebDriver() {
return _webDriver.get();
}
public String getSessionId() {
return sessionId.get();
}
/** /**
* @return a LinkedList containing String arrays representing the browser combinations the test should be run against. The values * @return a LinkedList containing String arrays representing the browser combinations the test should be run against. The values
* in the String array are used as part of the invocation of the test constructor * in the String array are used as part of the invocation of the test constructor
@ -153,7 +156,7 @@ public class WebGoatIT implements SauceOnDemandSessionIdProvider {
//browsers.add(new String[]{"Windows 8.1", "11", "internet explorer", null, null}); //browsers.add(new String[]{"Windows 8.1", "11", "internet explorer", null, null});
// windows 10, Microsoft Edge Browser // windows 10, Microsoft Edge Browser
//browsers.add(new String[]{"Windows 10", "20.10240", "microsoftedge", null, null}); browsers.add(new String[]{"Windows 10", "20.10240", "microsoftedge", null, null});
// OS X 10.9, Safari 7 // OS X 10.9, Safari 7
//browsers.add(new String[]{"OSX 10.9", "7", "safari", null, null}); //browsers.add(new String[]{"OSX 10.9", "7", "safari", null, null});
@ -185,7 +188,7 @@ public class WebGoatIT implements SauceOnDemandSessionIdProvider {
// Additional settings to help debugging and improve job perf // Additional settings to help debugging and improve job perf
capabilities.setCapability("public", "share"); capabilities.setCapability("public", "share");
capabilities.setCapability("wwebdriverRemoteQuietExceptions", false); capabilities.setCapability("wwebgetWebDriver()RemoteQuietExceptions", false);
capabilities.setCapability("captureHtml", true); capabilities.setCapability("captureHtml", true);
if (System.getenv("CI") != null && System.getenv("TRAVIS").equals("true")) { if (System.getenv("CI") != null && System.getenv("TRAVIS").equals("true")) {
@ -199,12 +202,12 @@ public class WebGoatIT implements SauceOnDemandSessionIdProvider {
String methodName = name.getMethodName(); String methodName = name.getMethodName();
capabilities.setCapability("name", methodName); capabilities.setCapability("name", methodName);
this.driver = new RemoteWebDriver( this._webDriver.set(new RemoteWebDriver(
new URL("http://" + authentication.getUsername() + ":" + authentication.getAccessKey() + new URL("http://" + authentication.getUsername() + ":" + authentication.getAccessKey() +
"@ondemand.saucelabs.com:80/wd/hub"), "@ondemand.saucelabs.com:80/wd/hub"),
capabilities); capabilities));
this.driver.manage().timeouts().implicitlyWait(2, SECONDS); this.getWebDriver().manage().timeouts().implicitlyWait(2, SECONDS);
this.sessionId = (((RemoteWebDriver) driver).getSessionId()).toString(); this.sessionId.set((((RemoteWebDriver) getWebDriver()).getSessionId()).toString());
String message = String.format("SauceOnDemandSessionID=%1$s job-name=%2$s", this.sessionId, methodName); String message = String.format("SauceOnDemandSessionID=%1$s job-name=%2$s", this.sessionId, methodName);
System.out.println(message); System.out.println(message);
@ -212,19 +215,19 @@ public class WebGoatIT implements SauceOnDemandSessionIdProvider {
public void doLoginWebgoatUser() { public void doLoginWebgoatUser() {
driver.get(baseWebGoatUrl + "/login.mvc"); getWebDriver().get(baseWebGoatUrl + "/login.mvc");
driver.navigate().refresh(); getWebDriver().navigate().refresh();
WebDriverWait wait = new WebDriverWait(driver, 15); // wait for a maximum of 15 seconds WebDriverWait wait = new WebDriverWait(getWebDriver(), 15); // wait for a maximum of 15 seconds
wait.until(ExpectedConditions.presenceOfElementLocated(By.id("exampleInputEmail1"))); wait.until(ExpectedConditions.presenceOfElementLocated(By.id("exampleInputEmail1")));
wait.until(ExpectedConditions.presenceOfElementLocated(By.id("exampleInputPassword1"))); wait.until(ExpectedConditions.presenceOfElementLocated(By.id("exampleInputPassword1")));
WebElement usernameElement = driver.findElement(By.name("username")); WebElement usernameElement = getWebDriver().findElement(By.name("username"));
WebElement passwordElement = driver.findElement(By.name("password")); WebElement passwordElement = getWebDriver().findElement(By.name("password"));
usernameElement.sendKeys(loginUser); usernameElement.sendKeys(loginUser);
passwordElement.sendKeys(loginPassword); passwordElement.sendKeys(loginPassword);
passwordElement.submit(); passwordElement.submit();
driver.get(baseWebGoatUrl + "/start.mvc"); getWebDriver().get(baseWebGoatUrl + "/start.mvc");
} }
/** /**
@ -234,15 +237,15 @@ public class WebGoatIT implements SauceOnDemandSessionIdProvider {
*/ */
@Test @Test
public void verifyWebGoatLoginPage() throws Exception { public void verifyWebGoatLoginPage() throws Exception {
driver.get(baseWebGoatUrl + "/login.mvc"); getWebDriver().get(baseWebGoatUrl + "/login.mvc");
WebDriverWait wait = new WebDriverWait(driver, 15); // wait for a maximum of 15 seconds WebDriverWait wait = new WebDriverWait(getWebDriver(), 15); // wait for a maximum of 15 seconds
wait.until(ExpectedConditions.presenceOfElementLocated(By.id("exampleInputEmail1"))); wait.until(ExpectedConditions.presenceOfElementLocated(By.id("exampleInputEmail1")));
wait.until(ExpectedConditions.presenceOfElementLocated(By.id("exampleInputPassword1"))); wait.until(ExpectedConditions.presenceOfElementLocated(By.id("exampleInputPassword1")));
assertTrue(driver.getTitle().equals("Login Page")); assertTrue(getWebDriver().getTitle().equals("Login Page"));
WebElement usernameElement = driver.findElement(By.name("username")); WebElement usernameElement = getWebDriver().findElement(By.name("username"));
WebElement passwordElement = driver.findElement(By.name("password")); WebElement passwordElement = getWebDriver().findElement(By.name("password"));
assertNotNull(usernameElement); assertNotNull(usernameElement);
assertNotNull(passwordElement); assertNotNull(passwordElement);
} }
@ -250,9 +253,9 @@ public class WebGoatIT implements SauceOnDemandSessionIdProvider {
@Test @Test
public void testStartMvc() { public void testStartMvc() {
driver.get(baseWebGoatUrl + "/start.mvc"); getWebDriver().get(baseWebGoatUrl + "/start.mvc");
WebDriverWait wait = new WebDriverWait(driver, 15); // wait for a maximum of 15 seconds WebDriverWait wait = new WebDriverWait(getWebDriver(), 15); // wait for a maximum of 15 seconds
wait.until(ExpectedConditions.presenceOfElementLocated(By.name("username"))); wait.until(ExpectedConditions.presenceOfElementLocated(By.name("username")));
wait.until(ExpectedConditions.presenceOfElementLocated(By.name("password"))); wait.until(ExpectedConditions.presenceOfElementLocated(By.name("password")));
} }
@ -262,11 +265,11 @@ public class WebGoatIT implements SauceOnDemandSessionIdProvider {
doLoginWebgoatUser(); doLoginWebgoatUser();
driver.get(baseWebGoatUrl + "/start.mvc"); getWebDriver().get(baseWebGoatUrl + "/start.mvc");
String pageSource = driver.getPageSource(); String pageSource = getWebDriver().getPageSource();
assertTrue("user: webgoat is not in the page source", pageSource.contains("Role: webgoat_admin")); assertTrue("user: webgoat is not in the page source", pageSource.contains("Role: webgoat_admin"));
WebElement cookieParameters = driver.findElement(By.id("cookies-and-params")); WebElement cookieParameters = getWebDriver().findElement(By.id("cookies-and-params"));
assertNotNull("element id=cookieParameters should be displayed to user upon successful login", cookieParameters); assertNotNull("element id=cookieParameters should be displayed to user upon successful login", cookieParameters);
} }
@ -275,9 +278,9 @@ public class WebGoatIT implements SauceOnDemandSessionIdProvider {
doLoginWebgoatUser(); doLoginWebgoatUser();
driver.get(baseWebGoatUrl + "/service/lessonmenu.mvc"); getWebDriver().get(baseWebGoatUrl + "/service/lessonmenu.mvc");
String pageSource = driver.getPageSource(); String pageSource = getWebDriver().getPageSource();
assertTrue("Page source should contain lessons: Test 1", pageSource.contains("Reflected XSS")); assertTrue("Page source should contain lessons: Test 1", pageSource.contains("Reflected XSS"));
@ -289,14 +292,14 @@ public class WebGoatIT implements SauceOnDemandSessionIdProvider {
public void testAccessControlFlaws() { public void testAccessControlFlaws() {
doLoginWebgoatUser(); doLoginWebgoatUser();
driver.get(baseWebGoatUrl + "/start.mvc#attack/1708534694/200"); getWebDriver().get(baseWebGoatUrl + "/start.mvc#attack/1708534694/200");
driver.get(baseWebGoatUrl + "/service/restartlesson.mvc"); getWebDriver().get(baseWebGoatUrl + "/service/restartlesson.mvc");
driver.get(baseWebGoatUrl + "/start.mvc#attack/1708534694/200"); getWebDriver().get(baseWebGoatUrl + "/start.mvc#attack/1708534694/200");
FluentWait<WebDriver> wait = new WebDriverWait(driver, 15); // wait for a maximum of 15 seconds FluentWait<WebDriver> wait = new WebDriverWait(getWebDriver(), 15); // wait for a maximum of 15 seconds
wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("lesson-title"), "Using an Access Control Matrix")); wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("lesson-title"), "Using an Access Control Matrix"));
wait = new FluentWait(driver) wait = new FluentWait(getWebDriver())
.withTimeout(10, SECONDS) .withTimeout(10, SECONDS)
.pollingEvery(2, SECONDS) .pollingEvery(2, SECONDS)
.ignoring(NoSuchElementException.class) .ignoring(NoSuchElementException.class)
@ -305,21 +308,21 @@ public class WebGoatIT implements SauceOnDemandSessionIdProvider {
user.click(); user.click();
user.sendKeys("Larry"); user.sendKeys("Larry");
WebElement resource = driver.findElement(By.name("Resource")); WebElement resource = getWebDriver().findElement(By.name("Resource"));
resource.click(); resource.click();
resource.sendKeys("A"); resource.sendKeys("A");
WebElement submit = driver.findElement(By.name("SUBMIT")); WebElement submit = getWebDriver().findElement(By.name("SUBMIT"));
submit.click(); submit.click();
wait = new FluentWait(driver) wait = new FluentWait(getWebDriver())
.withTimeout(10, SECONDS) .withTimeout(10, SECONDS)
.pollingEvery(2, SECONDS) .pollingEvery(2, SECONDS)
.ignoring(NoSuchElementException.class); .ignoring(NoSuchElementException.class);
wait.until(new Predicate<WebDriver>() { wait.until(new Predicate<WebDriver>() {
public boolean apply(WebDriver driver) { public boolean apply(WebDriver webDriver) {
return driver.getPageSource().contains("Congratulations"); return webDriver.getPageSource().contains("Congratulations");
} }
}); });
} }
@ -328,14 +331,14 @@ public class WebGoatIT implements SauceOnDemandSessionIdProvider {
public void testFailOpenAuthenticationScheme() throws IOException { public void testFailOpenAuthenticationScheme() throws IOException {
doLoginWebgoatUser(); doLoginWebgoatUser();
driver.get(baseWebGoatUrl + "/start.mvc#attack/1075773632/200"); getWebDriver().get(baseWebGoatUrl + "/start.mvc#attack/1075773632/200");
driver.get(baseWebGoatUrl + "/service/restartlesson.mvc"); getWebDriver().get(baseWebGoatUrl + "/service/restartlesson.mvc");
driver.get(baseWebGoatUrl + "/start.mvc#attack/1075773632/200"); getWebDriver().get(baseWebGoatUrl + "/start.mvc#attack/1075773632/200");
FluentWait<WebDriver> wait = new WebDriverWait(driver, 15); // wait for a maximum of 15 seconds FluentWait<WebDriver> wait = new WebDriverWait(getWebDriver(), 15); // wait for a maximum of 15 seconds
wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("lesson-title"), "Fail Open Authentication Scheme")); wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("lesson-title"), "Fail Open Authentication Scheme"));
wait = new FluentWait(driver) wait = new FluentWait(getWebDriver())
.withTimeout(10, SECONDS) .withTimeout(10, SECONDS)
.pollingEvery(2, SECONDS) .pollingEvery(2, SECONDS)
.ignoring(NoSuchElementException.class) .ignoring(NoSuchElementException.class)
@ -344,21 +347,21 @@ public class WebGoatIT implements SauceOnDemandSessionIdProvider {
user.click(); user.click();
user.sendKeys("Larry"); user.sendKeys("Larry");
JavascriptExecutor javascript = (JavascriptExecutor) driver; JavascriptExecutor javascript = (JavascriptExecutor) getWebDriver();
String todisable = "document.getElementsByName('Password')[0].setAttribute('disabled', '');"; String todisable = "document.getElementsByName('Password')[0].setAttribute('disabled', '');";
javascript.executeScript(todisable); javascript.executeScript(todisable);
assertFalse(driver.findElement(By.name("Password")).isEnabled()); assertFalse(getWebDriver().findElement(By.name("Password")).isEnabled());
WebElement submit = driver.findElement(By.name("SUBMIT")); WebElement submit = getWebDriver().findElement(By.name("SUBMIT"));
submit.click(); submit.click();
wait = new FluentWait(driver) wait = new FluentWait(getWebDriver())
.withTimeout(10, SECONDS) .withTimeout(10, SECONDS)
.pollingEvery(2, SECONDS) .pollingEvery(2, SECONDS)
.ignoring(NoSuchElementException.class); .ignoring(NoSuchElementException.class);
wait.until(new Predicate<WebDriver>() { wait.until(new Predicate<WebDriver>() {
public boolean apply(WebDriver driver) { public boolean apply(WebDriver webDriver) {
return driver.getPageSource().contains("Congratulations"); return webDriver.getPageSource().contains("Congratulations");
} }
}); });
} }
@ -367,73 +370,86 @@ public class WebGoatIT implements SauceOnDemandSessionIdProvider {
public void testSqlInjectionLabLessonPlanShouldBePresent() throws IOException { public void testSqlInjectionLabLessonPlanShouldBePresent() throws IOException {
doLoginWebgoatUser(); doLoginWebgoatUser();
driver.get(baseWebGoatUrl + "/start.mvc#attack/1537271095/200"); getWebDriver().get(baseWebGoatUrl + "/start.mvc#attack/1537271095/200");
driver.get(baseWebGoatUrl + "/service/restartlesson.mvc"); getWebDriver().get(baseWebGoatUrl + "/service/restartlesson.mvc");
driver.get(baseWebGoatUrl + "/start.mvc#attack/1537271095/200"); getWebDriver().get(baseWebGoatUrl + "/start.mvc#attack/1537271095/200");
FluentWait<WebDriver> wait = new FluentWait(driver) FluentWait<WebDriver> wait = new FluentWait(getWebDriver())
.withTimeout(10, SECONDS) .withTimeout(10, SECONDS)
.pollingEvery(2, SECONDS) .pollingEvery(2, SECONDS)
.ignoring(NoSuchElementException.class); .ignoring(NoSuchElementException.class);
wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("lesson-title"), "LAB: SQL Injection")); wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("lesson-title"), "LAB: SQL Injection"));
assertFalse(driver.getPageSource().contains("Lesson Plan Title: How to Perform a SQL Injection")); assertFalse(getWebDriver().getPageSource().contains("Lesson Plan Title: How to Perform a SQL Injection"));
WebElement user = driver.findElement(By.id("show-plan-button")); WebElement user = getWebDriver().findElement(By.id("show-plan-button"));
user.click(); user.click();
wait = new WebDriverWait(driver, 15); // wait for a maximum of 15 seconds wait = new WebDriverWait(getWebDriver(), 15); // wait for a maximum of 15 seconds
wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("lesson-plan-content"), "Lesson Plan Title: How to Perform a SQL Injection")); wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("lesson-plan-content"), "Lesson Plan Title: How to Perform a SQL Injection"));
} }
@Test //@Test
public void testClientSideValidation() throws IOException { public void testClientSideValidation() throws IOException {
doLoginWebgoatUser(); doLoginWebgoatUser();
driver.get(baseWebGoatUrl + "/start.mvc#attack/1129417221/200"); getWebDriver().get(baseWebGoatUrl + "/start.mvc#attack/1129417221/200");
driver.get(baseWebGoatUrl + "/service/restartlesson.mvc"); getWebDriver().get(baseWebGoatUrl + "/service/restartlesson.mvc");
driver.get(baseWebGoatUrl + "/start.mvc#attack/1129417221/200"); getWebDriver().get(baseWebGoatUrl + "/start.mvc#attack/1129417221/200");
FluentWait<WebDriver> wait = new WebDriverWait(driver, 15); // wait for a maximum of 15 seconds FluentWait<WebDriver> wait = new WebDriverWait(getWebDriver(), 15); // wait for a maximum of 15 seconds
wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("lesson-title"), "Insecure Client Storage")); wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("lesson-title"), "Insecure Client Storage"));
getWebDriver().manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS);
//Stage 1 //Stage 1
WebElement user = driver.findElement(By.name("field1")); WebElement user = getWebDriver().findElement(By.name("field1"));
user.click(); user.click();
user.sendKeys("PLATINUM"); user.sendKeys("PLATINUM");
WebElement submit = driver.findElement(By.name("SUBMIT")); WebElement submit = getWebDriver().findElement(By.name("SUBMIT"));
submit.click(); submit.click();
wait = new FluentWait(driver) wait = new FluentWait(getWebDriver())
.withTimeout(10, SECONDS) .withTimeout(20, SECONDS)
.pollingEvery(2, SECONDS) .pollingEvery(2, SECONDS)
.ignoring(NoSuchElementException.class); .ignoring(NoSuchElementException.class);
wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("message"), "Stage 1 completed.")); wait.until(new Predicate<WebDriver>() {
@Override
public boolean apply(WebDriver input) {
return getWebDriver().getPageSource().contains("Stage 2");
}
});
//Stage 2 //Stage 2
WebElement qty = driver.findElement(By.name("QTY1")); wait = new FluentWait(getWebDriver())
.withTimeout(10, SECONDS)
.pollingEvery(2, SECONDS)
.ignoring(NoSuchElementException.class)
.ignoring(StaleElementReferenceException.class);
WebElement qty = wait.until(ExpectedConditions.presenceOfElementLocated(By.name("QTY1")));
qty.click(); qty.click();
qty.sendKeys("8"); qty.sendKeys("8");
qty = driver.findElement(By.name("QTY1")); qty = getWebDriver().findElement(By.name("QTY1"));
qty.click(); qty.click();
qty.sendKeys("8"); qty.sendKeys("8");
driver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS); getWebDriver().manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS);
JavascriptExecutor javascript = (JavascriptExecutor) driver; JavascriptExecutor javascript = (JavascriptExecutor) getWebDriver();
String cmd = "document.getElementsByName('GRANDTOT')[0].value = '$0.00';"; String cmd = "document.getElementsByName('GRANDTOT')[0].value = '$0.00';";
javascript.executeScript(cmd); javascript.executeScript(cmd);
getWebDriver().manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS);
submit = driver.findElement(By.name("SUBMIT"));
submit = getWebDriver().findElement(By.name("SUBMIT"));
submit.click(); submit.click();
driver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS); wait = new FluentWait(getWebDriver())
wait = new FluentWait(driver)
.withTimeout(10, SECONDS) .withTimeout(10, SECONDS)
.pollingEvery(2, SECONDS) .pollingEvery(2, SECONDS)
.ignoring(NoSuchElementException.class); .ignoring(NoSuchElementException.class);
wait.until(new Predicate<WebDriver>() { wait.until(new Predicate<WebDriver>() {
public boolean apply(WebDriver driver) { public boolean apply(WebDriver webDriver) {
return driver.getPageSource().contains("Congratulations"); return webDriver.getPageSource().contains("Congratulations");
} }
}); });
} }
@ -442,38 +458,38 @@ public class WebGoatIT implements SauceOnDemandSessionIdProvider {
public void testJavaScriptValidation() throws IOException { public void testJavaScriptValidation() throws IOException {
doLoginWebgoatUser(); doLoginWebgoatUser();
driver.get(baseWebGoatUrl + "/start.mvc#attack/1574219258/1700"); getWebDriver().get(baseWebGoatUrl + "/start.mvc#attack/1574219258/1700");
driver.get(baseWebGoatUrl + "/service/restartlesson.mvc"); getWebDriver().get(baseWebGoatUrl + "/service/restartlesson.mvc");
driver.get(baseWebGoatUrl + "/start.mvc#attack/1574219258/1700"); getWebDriver().get(baseWebGoatUrl + "/start.mvc#attack/1574219258/1700");
FluentWait<WebDriver> wait = new WebDriverWait(driver, 15); // wait for a maximum of 15 seconds FluentWait<WebDriver> wait = new WebDriverWait(getWebDriver(), 15); // wait for a maximum of 15 seconds
wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("lesson-title"), "Bypass Client Side JavaScript Validation")); wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("lesson-title"), "Bypass Client Side JavaScript Validation"));
driver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS); getWebDriver().manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS);
for (int i = 1; i <= 7; i++) { for (int i = 1; i <= 7; i++) {
WebElement field = driver.findElement(By.name("field" + i)); WebElement field = getWebDriver().findElement(By.name("field" + i));
field.click(); field.click();
field.sendKeys("@#@{@#{"); field.sendKeys("@#@{@#{");
} }
JavascriptExecutor javascript = (JavascriptExecutor) driver; JavascriptExecutor javascript = (JavascriptExecutor) getWebDriver();
String cmd = "document.getElementById('submit_btn').onclick=''"; String cmd = "document.getElementById('submit_btn').onclick=''";
javascript.executeScript(cmd); javascript.executeScript(cmd);
WebElement submit = driver.findElement(By.id("submit_btn")); WebElement submit = getWebDriver().findElement(By.id("submit_btn"));
submit.click(); submit.click();
driver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS); getWebDriver().manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS);
wait = new FluentWait(driver) wait = new FluentWait(getWebDriver())
.withTimeout(10, SECONDS) .withTimeout(10, SECONDS)
.pollingEvery(2, SECONDS) .pollingEvery(2, SECONDS)
.ignoring(NoSuchElementException.class); .ignoring(NoSuchElementException.class);
wait.until(new Predicate<WebDriver>() { wait.until(new Predicate<WebDriver>() {
public boolean apply(WebDriver driver) { public boolean apply(WebDriver webDriver) {
return driver.getPageSource().contains("Congratulations"); return webDriver.getPageSource().contains("Congratulations");
} }
}); });
} }
@ -482,17 +498,17 @@ public class WebGoatIT implements SauceOnDemandSessionIdProvider {
public void testSqlInjectionLabLessonSolutionAreNotAvailable() throws IOException { public void testSqlInjectionLabLessonSolutionAreNotAvailable() throws IOException {
doLoginWebgoatUser(); doLoginWebgoatUser();
driver.get(baseWebGoatUrl + "/start.mvc#attack/1537271095/200"); getWebDriver().get(baseWebGoatUrl + "/start.mvc#attack/1537271095/200");
driver.get(baseWebGoatUrl + "/service/restartlesson.mvc"); getWebDriver().get(baseWebGoatUrl + "/service/restartlesson.mvc");
driver.get(baseWebGoatUrl + "/start.mvc#attack/1537271095/200"); getWebDriver().get(baseWebGoatUrl + "/start.mvc#attack/1537271095/200");
FluentWait<WebDriver> wait = new WebDriverWait(driver, 15); // wait for a maximum of 15 seconds FluentWait<WebDriver> wait = new WebDriverWait(getWebDriver(), 15); // wait for a maximum of 15 seconds
wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("lesson-title"), "LAB: SQL Injection")); wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("lesson-title"), "LAB: SQL Injection"));
WebElement user = driver.findElement(By.id("show-solution-button")); WebElement user = getWebDriver().findElement(By.id("show-solution-button"));
user.click(); user.click();
assertTrue(driver.getPageSource().contains("Could not find the solution file")); assertTrue(getWebDriver().getPageSource().contains("Could not find the solution file"));
} }
@ -501,11 +517,11 @@ public class WebGoatIT implements SauceOnDemandSessionIdProvider {
doLoginWebgoatUser(); doLoginWebgoatUser();
driver.get(baseWebGoatUrl + "/logout.mvc"); getWebDriver().get(baseWebGoatUrl + "/logout.mvc");
assertTrue("Page title should be Logout Page", driver.getTitle().contains("Logout Page")); assertTrue("Page title should be Logout Page", getWebDriver().getTitle().contains("Logout Page"));
assertTrue("Logout message should be displayed to user when successful logout", assertTrue("Logout message should be displayed to user when successful logout",
driver.getPageSource().contains("You have logged out successfully")); getWebDriver().getPageSource().contains("You have logged out successfully"));
} }
/** /**
@ -515,14 +531,7 @@ public class WebGoatIT implements SauceOnDemandSessionIdProvider {
*/ */
@After @After
public void tearDown() throws Exception { public void tearDown() throws Exception {
driver.quit(); getWebDriver().quit();
} }
/**
* @return the value of the Sauce Job id.
*/
@Override
public String getSessionId() {
return sessionId;
}
} }