STRLCPY/wrongsecrets

Fix for string checks for challenge 7, 13, and 14

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

Total 2 files Show one by one

■ ■ ■ ■ ■ ■

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

1	1		package org.owasp.wrongsecrets.challenges.docker;
2	2
	3	+	import com.google.common.base.Strings;
3	4		import lombok.extern.slf4j.Slf4j;
4		-	import org.apache.logging.log4j.util.Strings;
5	5		import org.owasp.wrongsecrets.RuntimeEnvironment;
6	6		import org.owasp.wrongsecrets.ScoreCard;
7	7		import org.owasp.wrongsecrets.challenges.Challenge;
		skipped 50 lines
58	58		return isKeyCorrect(answer);
59	59		}
60	60
61		-	@Override
	61	+
62	62		/**
63	63		* {@inheritDoc}
64	64		*/
	65	+	@Override
65	66		public List<RuntimeEnvironment.Environment> supportedRuntimeEnvironments() {
66	67		return List.of(RuntimeEnvironment.Environment.DOCKER);
67	68		}
		skipped 22 lines
90	91		}
91	92
92	93		private boolean isKeyCorrect(String base64EncodedKey) {
93		-	if (Strings.isEmpty(base64EncodedKey) \|\| Strings.isEmpty(plainText) \|\| Strings.isEmpty(cipherText)) {
	94	+	if (Strings.isNullOrEmpty(base64EncodedKey) \|\| Strings.isNullOrEmpty(plainText) \|\| Strings.isNullOrEmpty(cipherText)) {
94	95		//log.debug("Checking secret with values {}, {}, {}", base64EncodedKey, plainText, cipherText);
95	96		return false;
96	97		}
		skipped 25 lines

■ ■ ■ ■ ■ ■

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

1	1		package org.owasp.wrongsecrets.challenges.docker;
2	2
	3	+	import com.google.common.base.Strings;
3	4		import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
4	5		import lombok.extern.slf4j.Slf4j;
5		-	import org.apache.logging.log4j.util.Strings;
6	6		import org.linguafranca.pwdb.Database;
7	7		import org.linguafranca.pwdb.kdbx.KdbxCreds;
8	8		import org.linguafranca.pwdb.kdbx.simple.SimpleDatabase;
		skipped 57 lines
66	66		return isanswerCorrectInKeeyPassx(answer);
67	67		}
68	68
69		-	@Override
	69	+
70	70		/**
71	71		* {@inheritDoc}
72	72		*/
	73	+	@Override
73	74		public List<RuntimeEnvironment.Environment> supportedRuntimeEnvironments() {
74	75		return List.of(RuntimeEnvironment.Environment.DOCKER);
75	76		}
		skipped 23 lines
99	100
100	101		@SuppressFBWarnings("PATH_TRAVERSAL_IN")
101	102		private String findAnswer() {
102		-	if (Strings.isEmpty(keepassxPassword)) {
	103	+	if (Strings.isNullOrEmpty(keepassxPassword)) {
103	104		//log.debug("Checking secret with values {}", keepassxPassword);
104	105		return defaultKeepassValue;
105	106		}
		skipped 11 lines
117	118		}
118	119
119	120		private boolean isanswerCorrectInKeeyPassx(String answer) {
120		-	if (Strings.isEmpty(keepassxPassword) \|\| Strings.isEmpty(answer)) {
	121	+	if (Strings.isNullOrEmpty(keepassxPassword) \|\| Strings.isNullOrEmpty(answer)) {
121	122		//log.debug("Checking secret with values {}, {}", keepassxPassword, answer);
122	123		return false;
123	124		}
		skipped 5 lines