STRLCPY/wrongsecrets

Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)

■ ■ ■ ■ ■ ■

src/main/java/org/owasp/wrongsecrets/challenges/docker/BinaryExecutionHelper.java

		skipped 24 lines
25	25		if (Strings.isNullOrEmpty(guess)) {
26	26		result = executeCommand(execFile, "spoil");
27	27		} else {
28		-	result = executeCommand(execFile, "guess " + guess);
	28	+	result = executeCommand(execFile, "guess", guess);
29	29		}
	30	+	log.info("stdout challenge {}: {}", challengeNumber, result);
	31	+
30	32		deleteFile(execFile);
31		-	log.info("stdout challenge {}: {}", challengeNumber, result);
32	33		return result;
33	34		} catch (IOException \| NullPointerException \| InterruptedException e) {
34	35		log.warn("Error executing:", e);
		skipped 18 lines
53	54
54	55		}
55	56
56		-	private String executeCommand(File execFile, String argument) throws IOException, InterruptedException {
57		-	ProcessBuilder ps = new ProcessBuilder(execFile.getPath(), argument);
	57	+	private String executeCommand(File execFile, String argument, String argument2) throws IOException, InterruptedException {
	58	+	ProcessBuilder ps;
	59	+	if (Strings.isNullOrEmpty(argument2)) {
	60	+	ps = new ProcessBuilder(execFile.getPath(), argument);
	61	+	} else {
	62	+	ps = new ProcessBuilder(execFile.getPath(), argument, argument2);
	63	+	}
58	64		ps.redirectErrorStream(true);
59	65		Process pr = ps.start();
60	66		BufferedReader in = new BufferedReader(new InputStreamReader(pr.getInputStream()));
61	67		String result = in.readLine();
62	68		pr.waitFor();
63	69		return result;
	70	+	}
	71	+
	72	+	private String executeCommand(File execFile, String argument) throws IOException, InterruptedException {
	73	+	return executeCommand(execFile, argument, "");
64	74		}
65	75
66	76		private boolean useX86() {
		skipped 57 lines

■ ■ ■ ■ ■ ■

src/main/java/org/owasp/wrongsecrets/challenges/docker/Challenge21.java

		skipped 27 lines
28	28
29	29		@Override
30	30		public Spoiler spoiler() {
31		-	return new Spoiler(binaryExecutionHelper.executeCommand("", "wrongsecrets-golang"));
	31	+	return new Spoiler(binaryExecutionHelper.executeGoCommand(""));
32	32		}
33	33
34	34		@Override
		skipped 9 lines

■ ■ ■ ■ ■ ■

src/test/java/org/owasp/wrongsecrets/challenges/docker/Challenge19Test.java

		skipped 19 lines
20	20		var challenge = new Challenge19(scoreCard);
21	21
22	22		Assertions.assertThat(challenge.spoiler()).isNotEqualTo(new Spoiler(BinaryExecutionHelper.ERROR_EXECUTION));
	23	+	Assertions.assertThat(challenge.answerCorrect(challenge.spoiler().solution())).isTrue();
23	24		}
24	25
25	26		}
		skipped 1 lines

■ ■ ■ ■ ■ ■

src/test/java/org/owasp/wrongsecrets/challenges/docker/Challenge20Test.java

		skipped 18 lines
19	19		var challenge = new Challenge20(scoreCard);
20	20
21	21		Assertions.assertThat(challenge.spoiler()).isNotEqualTo(new Spoiler(BinaryExecutionHelper.ERROR_EXECUTION));
	22	+	Assertions.assertThat(challenge.answerCorrect(challenge.spoiler().solution())).isTrue();
22	23		}
23	24
24	25		}
		skipped 1 lines

■ ■ ■ ■ ■ ■

src/test/java/org/owasp/wrongsecrets/challenges/docker/Challenge21Test.java

		skipped 18 lines
19	19		var challenge = new Challenge21(scoreCard);
20	20
21	21		Assertions.assertThat(challenge.spoiler()).isNotEqualTo(new Spoiler(BinaryExecutionHelper.ERROR_EXECUTION));
	22	+	Assertions.assertThat(challenge.answerCorrect(challenge.spoiler().solution())).isTrue();
22	23		}
23	24
24	25		}
		skipped 1 lines