Merge pull request #385 from ax3l/topic-encCompile

Use explicit urlencoded POST data
ComputationalRadiationPhysics · Apr 30, 2014 · 33b1e4b · 33b1e4b
2 parents 8695169 + 29b9e27
commit 33b1e4b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/buildsystem/CompileSuite/autoTests/config.sh b/buildsystem/CompileSuite/autoTests/config.sh
@@ -51,7 +51,7 @@ cnf_from="someone@example.com"
 cnf_rctp_to="someoneelse@example.com"
 
 # preview N lines of the compile output for failing examples
-cnf_mail_preview=60
+cnf_mail_preview=100
 
 # global functions ############################################################
 #

diff --git a/buildsystem/CompileSuite/autoTests/report.sh b/buildsystem/CompileSuite/autoTests/report.sh
@@ -38,11 +38,11 @@ function conclusion {
     state="$1"
     echo "State: $state"
     lastUser="$2"
-    #echo "lastUser: $lastUser"
+    echo "lastUser: $lastUser"
     lastUserMail="$3"
     #echo "email: $lastUserMail"
     sha="$4"
-    #echo "sha: $sha"
+    echo "sha: $sha"
     eventid="$5"
     echo "eventid: $eventid"
     logEntry="$6"
@@ -126,20 +126,11 @@ $logEntry"
 
     # report to scheduler
     #
-    # escape / \ and " (to do: control codes < U+0020 )
-    #textJSON=$(echo "$text" | sed 's|\\|\\\\|g' | sed 's|\"|\\\"|g' | sed 's|\/|\\\/|g')
-    textJSON=${text//\\/\\\\} # \
-    textJSON=${textJSON//\//\\\/} # /
-#    textJSON=${textJSON//\'/\\\'} # ' should not be escaped in JSON
-    textJSON=${textJSON//\"/\\\"} # "
-    textJSON=${textJSON//	/\\t} # \t
-    textJSON=${textJSON//
-/\\n} # \n
-    textJSON=${textJSON//^M/\\r} # \r
-    textJSON=${textJSON//^L/\\f} # \f
-    textJSON=${textJSON//^H/\\b} # \b
-    postParams='payload={"action":"report","eventid":'$eventid',"result":"'$stateName'","output":"'"$textJSON"'"}'
-    curl --raw -d"$postParams" $cnf_scheduler
+    # escape special characters
+    textJSON=`echo -n "$text" | python -c 'import json,sys; print json.dumps(sys.stdin.read())'`
+    postParams='{"action":"report","eventid":'$eventid',"result":"'$stateName'","output":'$textJSON'}'
+    echo -n "$postParams" > "$thisDir"lastPostParams.log
+    curl -X POST --data-urlencode payload@"$thisDir"lastPostParams.log $cnf_scheduler
     if [ $? -ne 0 ]; then
         echo "Error contacting scheduler at $cnf_scheduler"
         exit 1