STRLCPY/wrongsecrets

fix checkstyle
Jeroen Willemsen committed 2 years ago

ba78de35

1 parent 7205796d

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

■ ■ ■ ■ ■ ■

Dockerfile.web

1		-	FROM jeroenwillemsen/wrongsecrets:challenge20test2-no-vault
	1	+	FROM jeroenwillemsen/wrongsecrets:challenge21test-no-vault
2	2
3	3		ARG argBasedVersion="1.4.4"
4	4		ARG CANARY_URLS="http://canarytokens.com/terms/about/s7cfbdakys13246ewd8ivuvku/post.jsp,http://canarytokens.com/terms/about/y0all60b627gzp19ahqh7rl6j/post.jsp"
		skipped 9 lines

■ ■ ■ ■ ■ ■

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

		skipped 17 lines
18	18		this.challengeNumber = challengeNumber;
19	19		}
20	20
	21	+	public String executeGoCommand(String guess) {
	22	+	try {
	23	+	File execFile = createTempExecutable("wrongsecrets-golang");
	24	+	String result;
	25	+	if (Strings.isNullOrEmpty(guess)) {
	26	+	result = executeCommand(execFile, "spoil");
	27	+	} else {
	28	+	result = executeCommand(execFile, "guess " + guess);
	29	+	}
	30	+	deleteFile(execFile);
	31	+	log.info("stdout challenge {}: {}", challengeNumber, result);
	32	+	return result;
	33	+	} catch (IOException \| NullPointerException \| InterruptedException e) {
	34	+	log.warn("Error executing:", e);
	35	+	return ERROR_EXECUTION;
	36	+	}
	37	+	}
	38	+
	39	+	public String executeCommand(String guess, String fileName) {
	40	+	if (Strings.isNullOrEmpty((guess))) {
	41	+	guess = "spoil";
	42	+	}
	43	+	try {
	44	+	File execFile = createTempExecutable(fileName);
	45	+	String result = executeCommand(execFile, guess);
	46	+	deleteFile(execFile);
	47	+	log.info("stdout challenge {}: {}", challengeNumber, result);
	48	+	return result;
	49	+	} catch (IOException \| NullPointerException \| InterruptedException e) {
	50	+	log.warn("Error executing:", e);
	51	+	return ERROR_EXECUTION;
	52	+	}
	53	+
	54	+	}
	55	+
21	56		private boolean useX86() {
22	57		String systemARch = System.getProperty("os.arch");
23	58		log.info("System arch detected: {}", systemARch);
		skipped 55 lines
79	114		return result;
80	115		}
81	116
82		-	public String executeGoCommand(String guess) {
83		-	try {
84		-	File execFile = createTempExecutable("wrongsecrets-golang");
85		-	String result;
86		-	if (Strings.isNullOrEmpty(guess)) {
87		-	result = executeCommand(execFile, "spoil");
88		-	} else {
89		-	result = executeCommand(execFile, "guess " + guess);
90		-	}
91		-	deleteFile(execFile);
92		-	log.info("stdout challenge {}: {}", challengeNumber, result);
93		-	return result;
94		-	} catch (IOException \| NullPointerException \| InterruptedException e) {
95		-	log.warn("Error executing:", e);
96		-	return ERROR_EXECUTION;
97		-	}
98		-	}
99		-
100	117		private void deleteFile(File execFile) {
101	118		if (!execFile.delete()) {
102	119		log.info("Deleting the file {} failed...", execFile.getPath());
103	120		}
104		-	}
105		-
106		-	public String executeCommand(String guess, String fileName) {
107		-	if (Strings.isNullOrEmpty((guess))) {
108		-	guess = "spoil";
109		-	}
110		-	try {
111		-	File execFile = createTempExecutable(fileName);
112		-	String result = executeCommand(execFile, guess);
113		-	deleteFile(execFile);
114		-	log.info("stdout challenge {}: {}", challengeNumber, result);
115		-	return result;
116		-	} catch (IOException \| NullPointerException \| InterruptedException e) {
117		-	log.warn("Error executing:", e);
118		-	return ERROR_EXECUTION;
119		-	}
120		-
121	121		}
122	122		}
123	123

fix checkstyle