Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ch1 less default #814

Merged
merged 2 commits into from
May 12, 2020
Merged

Ch1 less default #814

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe903d7
random pincode in challenge1
zubcevic May 7, 2020
135e9e1
unit test fix
zubcevic May 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
random pincode in challenge1
  • Loading branch information
@zubcevic
zubcevic committed May 7, 2020
commit fe903d7ed0689a2dbb7af80b21377241cfbb2489
16 changes: 15 additions & 1 deletion webgoat-integration-tests/src/test/java/org/owasp/webgoat/ChallengeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,38 @@

import static org.junit.jupiter.api.Assertions.assertTrue;

import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.junit.jupiter.api.Test;

import io.restassured.RestAssured;
import static org.owasp.webgoat.challenges.SolutionConstants.PASSWORD;


public class ChallengeTest extends IntegrationTest {

@Test
public void testChallenge1() {
startLesson("Challenge1");

byte[] resultBytes =
RestAssured.given()
.when()
.relaxedHTTPSValidation()
.cookie("JSESSIONID", getWebGoatCookie())
.get(url("/WebGoat/challenge/logo"))
.then()
.statusCode(200)
.extract().asByteArray();

String pincode = new String(Arrays.copyOfRange(resultBytes, 81216, 81220));
Map<String, Object> params = new HashMap<>();
params.clear();
params.put("username", "admin");
params.put("password", "!!webgoat_admin_1234!!");
params.put("password", PASSWORD.replace("1234", pincode));


checkAssignment(url("/WebGoat/challenge/1"), params, true);
Expand Down
2 changes: 1 addition & 1 deletion ...-lessons/challenge/src/main/java/org/owasp/webgoat/challenges/challenge1/Assignment1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public class Assignment1 extends AssignmentEndpoint {
@ResponseBody
public AttackResult completed(@RequestParam String username, @RequestParam String password, HttpServletRequest request) {
boolean ipAddressKnown = true;
boolean passwordCorrect = "admin".equals(username) && PASSWORD.equals(password);
boolean passwordCorrect = "admin".equals(username) && PASSWORD.replace("1234", String.format("%04d",ImageServlet.PINCODE)).equals(password);
if (passwordCorrect && ipAddressKnown) {
return success(this).feedback("challenge.solved").feedbackArgs(Flag.FLAGS.get(1)).build();
} else if (passwordCorrect) {
Expand Down
44 changes: 44 additions & 0 deletions ...lessons/challenge/src/main/java/org/owasp/webgoat/challenges/challenge1/ImageServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package org.owasp.webgoat.challenges.challenge1;

import java.io.IOException;
import java.security.SecureRandom;

import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.springframework.core.io.ClassPathResource;
import org.springframework.http.MediaType;
import org.springframework.util.FileCopyUtils;

@WebServlet(name = "ImageServlet", urlPatterns = "/challenge/logo")
public class ImageServlet extends HttpServlet {

private static final long serialVersionUID = 9132775506936676850L;
static final int PINCODE = new SecureRandom().nextInt(10000);

@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {

byte[] in = new ClassPathResource("images/webgoat2.png").getInputStream().readAllBytes();

String pincode = String.format("%04d", PINCODE);

in[81216]=(byte) pincode.charAt(0);
in[81217]=(byte) pincode.charAt(1);
in[81218]=(byte) pincode.charAt(2);
in[81219]=(byte) pincode.charAt(3);

response.setContentType(MediaType.IMAGE_PNG_VALUE);
FileCopyUtils.copy(in, response.getOutputStream());
}

@Override
protected void doPost(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
doGet(request, response);
}
}
2 changes: 1 addition & 1 deletion webgoat-lessons/challenge/src/main/resources/html/Challenge1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<div class="container-fluid">
<div class="panel panel-default">
<div class="panel-heading">
<img th:src="@{/images/webgoat2.png}" class="img-thumbnail"/>
<img th:src="@{/challenge/logo}" class="img-thumbnail"/>
</div>
<div class="panel-body">
<form class="attack-form" accept-charset="UNKNOWN"
Expand Down
2 changes: 2 additions & 0 deletions webgoat-server/src/main/java/org/owasp/webgoat/StartWebGoat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.util.StringUtils;

Expand All @@ -38,6 +39,7 @@
* @date 2/21/17
*/
@SpringBootApplication(scanBasePackages = "org.owasp.webgoat")
@ServletComponentScan
@Slf4j
public class StartWebGoat extends SpringBootServletInitializer {

Expand Down