Skip to content

Commit f7f5102

Browse files
author
owen-jones-diffblue
authored
Merge pull request diffblue#474 from diffblue/owen-jones-diffblue/fix-benchmark-shell-scripts
SEC-471: fix benchmark shell scripts
2 parents 5b3cd06 + 5ed7ace commit f7f5102

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

‎benchmarks/GENUINE/Ginco_files/0001-Reverting-XSS-issue-and-adding-generation-of-jar.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ diff -ur Ginco/ginco-admin/src/main/java/fr/mcc/ginco/rest/services/ImportRestSe
2626
response.setExternalConceptIds(externalConceptIds);
2727
ObjectMapper mapper = new ObjectMapper();
2828
String serialized = mapper.writeValueAsString(new ExtJsonFormLoadData(response));
29-
- return StringEscapeUtils.unescapeHtml4(serialized);
30-
+ return serialized;
29+
- return StringEscapeUtils.unescapeHtml4(serialized);
30+
+ return serialized;
3131
}
3232

3333
/**

‎benchmarks/GENUINE/WebGoat.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ if [ -z "$SECURITY_SCANNER_HOME" ]; then
55
exit 1
66
fi
77

8-
LESSONS_WHICH_WORK='webgoat-run-SqlInjectionLesson5a webgoat-run-SqlInjectionLesson5b webgoat-run-SqlInjectionLesson6a webgoat-run-SqlInjectionLesson12a webgoat-run-SqlInjectionChallenge webgoat-run-Assignment5 webgoat-run-Assignment6 webgoat-run-CrossSiteScriptingLesson5a webgoat-run-SimpleXXE webgoat-run-BlindSendFileAssignment'
9-
LESSONS_WHICH_DO_NOT_WORK='webgoat-run-CrossSiteScriptingLesson5a webgoat-run-Assignment3 webgoat-run-ContentTypeAssignment webgoat-run-VulnerableComponentsLesson webgoat-run-MissingFunctionACUsers'
8+
LESSONS_WHICH_WORK='SqlInjectionLesson5a SqlInjectionLesson5b SqlInjectionLesson6a SqlInjectionLesson12a SqlInjectionChallenge Assignment5 Assignment6 CrossSiteScriptingLesson5a SimpleXXE BlindSendFileAssignment'
9+
LESSONS_WHICH_DO_NOT_WORK='CrossSiteScriptingLesson5a Assignment3 ContentTypeAssignment VulnerableComponentsLesson MissingFunctionACUsers'
1010

1111
set -u
1212
set -x

‎benchmarks/GENUINE/WebGoat_files/Main.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,14 @@ public static void main(String[] args) {
7777
public static void SqlInjectionLesson5a(String[] args) {
7878
// WebGoat/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/plugin/introduction/SqlInjectionLesson5a.java
7979
String test = makeTainted("dave");
80-
SqlInjectionLesson5a obj = CProver.nondetWithNull();
80+
SqlInjectionLesson5a obj = CProver.nondetWithNull((SqlInjectionLesson5a)null);
8181
obj.completed(test);
8282
}
8383

8484
public static void SqlInjectionLesson5b(String[] args) {
8585
// WebGoat/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/plugin/introduction/SqlInjectionLesson5b.java
8686
String test = makeTainted("dave");
87-
SqlInjectionLesson5b obj = CProver.nondetWithNull();
87+
SqlInjectionLesson5b obj = CProver.nondetWithNull((SqlInjectionLesson5b)null);
8888
try {
8989
obj.completed(test, null);
9090
}
@@ -95,7 +95,7 @@ public static void SqlInjectionLesson5b(String[] args) {
9595
public static void SqlInjectionLesson6a(String[] args) {
9696
// WebGoat/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/plugin/introduction/SqlInjectionLesson6a.java
9797
String test = makeTainted(args[0]);
98-
SqlInjectionLesson6a obj = CProver.nondetWithNull();
98+
SqlInjectionLesson6a obj = CProver.nondetWithNull((SqlInjectionLesson6a)null);
9999
try {
100100
obj.completed(test);
101101
}
@@ -106,7 +106,7 @@ public static void SqlInjectionLesson6a(String[] args) {
106106
public static void SqlInjectionLesson12a(String[] args) {
107107
// WebGoat/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/plugin/mitigation/SqlInjectionLesson12a.java
108108
String arg0 = makeTainted(args[0]);
109-
SqlInjectionLesson12a obj = CProver.nondetWithNull();
109+
SqlInjectionLesson12a obj = CProver.nondetWithNull((SqlInjectionLesson12a)null);
110110
try {
111111
obj.completed(arg0);
112112
}
@@ -119,7 +119,7 @@ public static void SqlInjectionChallenge(String[] args) {
119119
String arg0 = makeTainted(args[0]);
120120
String arg1 = makeTainted(args[1]);
121121
String arg2 = makeTainted(args[2]);
122-
SqlInjectionChallenge obj = CProver.nondetWithNull();
122+
SqlInjectionChallenge obj = CProver.nondetWithNull((SqlInjectionChallenge)null);
123123
try {
124124
obj.registerNewUser(arg0, arg1, arg2);
125125
}
@@ -131,7 +131,7 @@ public static void Assignment5(String[] args) {
131131
// WebGoat/webgoat-lessons/challenge/src/main/java/org/owasp/webgoat/plugin/challenge5/challenge6/Assignment5.java
132132
String arg0 = makeTainted(args[0]);
133133
String arg1 = makeTainted(args[1]);
134-
Assignment5 obj = CProver.nondetWithNull();
134+
Assignment5 obj = CProver.nondetWithNull((Assignment5)null);
135135
try {
136136
obj.login(arg0, arg1);
137137
}
@@ -144,7 +144,7 @@ public static void Assignment6(String[] args) {
144144
String arg0 = makeTainted(args[0]);
145145
String arg1 = makeTainted(args[1]);
146146
String arg2 = makeTainted(args[2]);
147-
Assignment6 obj = CProver.nondetWithNull();
147+
Assignment6 obj = CProver.nondetWithNull((Assignment6)null);
148148
try {
149149
obj.registerNewUser(arg0, arg1, arg2);
150150
}
@@ -155,7 +155,7 @@ public static void Assignment6(String[] args) {
155155
public static void CrossSiteScriptingLesson5a(String[] args) {
156156
// WebGoat/webgoat-lessons/cross-site-scripting/src/main/java/org/owasp/webgoat/plugin/CrossSiteScriptingLesson5a.java
157157
String arg0 = makeTainted(args[0]);
158-
CrossSiteScriptingLesson5a obj = CProver.nondetWithNull();
158+
CrossSiteScriptingLesson5a obj = CProver.nondetWithNull((CrossSiteScriptingLesson5a)null);
159159
try {
160160
obj.completed(1, 2, 3, 4, arg0, 5, null);
161161
}
@@ -167,7 +167,7 @@ public static void Assignment3(String[] args) {
167167
// WebGoat/webgoat-lessons/challenge/src/main/java/org/owasp/webgoat/plugin/challenge3/Assignment3.java
168168
String arg0 = makeTainted(args[0]);
169169
String arg1 = makeTainted(args[1]);
170-
Assignment3 obj = CProver.nondetWithNull();
170+
Assignment3 obj = CProver.nondetWithNull((Assignment3)null);
171171
try {
172172
obj.createNewComment(arg0, arg1);
173173
}
@@ -178,7 +178,7 @@ public static void Assignment3(String[] args) {
178178
public static void SimpleXXE(String[] args) {
179179
// WebGoat/webgoat-lessons/xxe/src/main/java/org/owasp/webgoat/plugin/SimpleXXE.java
180180
String arg0 = makeTainted(args[0]);
181-
SimpleXXE obj = CProver.nondetWithNull();
181+
SimpleXXE obj = CProver.nondetWithNull((SimpleXXE)null);
182182
try {
183183
obj.createNewComment(arg0);
184184
}
@@ -190,7 +190,7 @@ public static void ContentTypeAssignment(String[] args) {
190190
// WebGoat/webgoat-lessons/xxe/src/main/java/org/owasp/webgoat/plugin/ContentTypeAssignment.java
191191
String arg0 = makeTainted(args[0]);
192192
String arg1 = args[1];
193-
ContentTypeAssignment obj = CProver.nondetWithNull();
193+
ContentTypeAssignment obj = CProver.nondetWithNull((ContentTypeAssignment)null);
194194
try {
195195
obj.createNewUser(arg0, arg1);
196196
}
@@ -201,7 +201,7 @@ public static void ContentTypeAssignment(String[] args) {
201201
public static void BlindSendFileAssignment(String[] args) {
202202
// WebGoat/webgoat-lessons/xxe/src/main/java/org/owasp/webgoat/plugin/BlindSendFileAssignment.java
203203
String arg0 = makeTainted(args[0]);
204-
BlindSendFileAssignment obj = CProver.nondetWithNull();
204+
BlindSendFileAssignment obj = CProver.nondetWithNull((BlindSendFileAssignment)null);
205205
try {
206206
obj.addComment(arg0);
207207
}
@@ -212,7 +212,7 @@ public static void BlindSendFileAssignment(String[] args) {
212212
public static void VulnerableComponentsLesson(String[] args) {
213213
// WebGoat/webgoat-lessons/vulnerable-components/src/main/java/org/owasp/webgoat/plugin/VulnerableComponentsLesson.java
214214
String arg0 = makeTainted(args[0]);
215-
VulnerableComponentsLesson obj = CProver.nondetWithNull();
215+
VulnerableComponentsLesson obj = CProver.nondetWithNull((VulnerableComponentsLesson)null);
216216
try {
217217
obj.completed(arg0);
218218
}
@@ -222,8 +222,8 @@ public static void VulnerableComponentsLesson(String[] args) {
222222

223223
public static void MissingFunctionACUsers(String[] args) {
224224
// WebGoat/webgoat-lessons/missing-function-ac/src/main/java/org/owasp/webgoat/plugin/MissingFunctionACUsers.java
225-
HttpServletRequest arg0 = CProver.nondetWithNull();
226-
MissingFunctionACUsers obj = CProver.nondetWithNull();
225+
HttpServletRequest arg0 = CProver.nondetWithNull((HttpServletRequest)null);
226+
MissingFunctionACUsers obj = CProver.nondetWithNull((MissingFunctionACUsers)null);
227227
try {
228228
obj.usersService(arg0);
229229
}

0 commit comments

Comments
 (0)