Skip to content

Commit 2d066cc

Browse files
author
Owen Jones
committed
Make Sakai.sh use a patch file instead of sed
1 parent ca17b87 commit 2d066cc

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

benchmarks/GENUINE/Sakai.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ cd sakai
1717
git checkout f333f0c
1818

1919
# Revert the sanitiser introduced in 8550c16
20-
sed -i 's@rv = formattedText.processEscapedHtml(rv);@// rv = formattedText.processEscapedHtml(rv);@' assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
20+
patch -p0 < $SCRIPT_WORKING_DIR/Sakai_files/remove_sanitiser.patch
2121

2222
# Build Sakai
2323
mvn install sakai:deploy -Dmaven.tomcat.home="$REPO_DIR/__dist__" -DskipTests -Dmaven.test.skip=true
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java 2018-06-06 15:39:57.651182570 +0100
2+
+++ assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java 2018-06-05 10:14:12.105084905 +0100
3+
@@ -13556,7 +13556,7 @@
4+
rv = rv.replaceAll("\\r\\n|\\r|\\n", "<br>");
5+
}
6+
//Escape the html from malicious tags.
7+
- rv = formattedText.processEscapedHtml(rv);
8+
+ // rv = formattedText.processEscapedHtml(rv);
9+
10+
int start = rv.indexOf("<body>");
11+
int end = rv.indexOf("</body>");

0 commit comments

Comments
 (0)