From cb1fdb34041d04490a30712464c5e2e05ac78429 Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Fri, 4 Aug 2017 11:32:32 +0100
Subject: more checks to strings

---
 tools/boca-submit-run-root | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'tools/boca-submit-run-root')

diff --git a/tools/boca-submit-run-root b/tools/boca-submit-run-root
index 0fac460..0ae0b39 100755
--- a/tools/boca-submit-run-root
+++ b/tools/boca-submit-run-root
@@ -42,12 +42,18 @@ if [ "$7" != "" ]; then
 	chmod 700 /root/submissions
 	nom=/root/submissions/`date +%s%N`.bocarun.tmp
 
-	echo "BOCASERVER=`echo $1 | tr -cd '[[:alnum:]]._+-/'`" > "$nom"
-	echo "user=`echo $2 | tr -cd '[[:alnum:]]._+-/'`" >> "$nom"
-	echo "pass=`echo $3 | tr -cd '[[:alnum:]]._+-/'`" >> "$nom"
-	echo "problem=`echo $4 | tr -cd '[[:alnum:]]._+-/'`" >> "$nom"
-	echo "language=`echo $5 | tr -cd '[[:alnum:]]._+-/'`" >> "$nom"
-	echo "name=`echo $6 | tr -cd '[[:alnum:]]._+-/'`" >> "$nom"
+	tmpvar=`echo "$1" | tr -cd '[[:alnum:]]._+-/'`
+	echo "BOCASERVER=$tmpvar" > "$nom"
+	tmpvar=`echo "$2" | tr -cd '[[:alnum:]]._+-/'`
+	echo "user=$tmpvar" >> "$nom"
+	tmpvar=`echo "$3" | tr -cd '[[:alnum:]]._+-/'`
+	echo "pass=$tmpvar" >> "$nom"
+	tmpvar=`echo "$4" | tr -cd '[[:alnum:]]._+-/'`
+	echo "problem=$tmpvar" >> "$nom"
+	tmpvar=`echo "$5" | tr -cd '[[:alnum:]]._+-/'`
+	echo "language=$tmpvar" >> "$nom"
+	tmpvar=`echo "$6" | tr -cd '[[:alnum:]]._+-/'`
+	echo "name=$tmpvar" >> "$nom"
 	echo -en "data=\"" >> "$nom"
 	uuencode -m zzzzzzzzzz < `echo -n "$7" | tr -cd '[[:alnum:]]._+-/'` | grep -v "begin-base64.*zzzzzzzzzz" >> "$nom"
 	echo "\"" >> "$nom"
-- 
cgit v1.2.3


From cc3aa973b6bc448bd52d1f6bfb9e9613c4dfbfdd Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Fri, 4 Aug 2017 11:44:16 +0100
Subject: further checks

---
 tools/boca-submit-run-root | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'tools/boca-submit-run-root')

diff --git a/tools/boca-submit-run-root b/tools/boca-submit-run-root
index 0ae0b39..3bba4aa 100755
--- a/tools/boca-submit-run-root
+++ b/tools/boca-submit-run-root
@@ -62,7 +62,11 @@ if [ "$7" != "" ]; then
 #	uniq=`date +%sN`-`sha256sum "$7"`
 #	uniq=`echo $uniq | sha256sum - | cut -f1 -d' '`
 	uniq=`sha256sum "$7" | cut -f1 -d' '`
-	code=`cat /root/submissions/code`
+	code=`cat /root/submissions/code 2>/dev/null`
+	if [ "$code" == "" ]; then
+	    echo "ERROR: this computer is not configured to submit runs"
+	    exit 1
+	fi
 	comp="error"
 	if [ -r /root/submissions/comp ]; then
 	    comp=`cat /root/submissions/comp`
-- 
cgit v1.2.3


From 5592a6c28bdf04165d60a9579f70f9c63fc830ca Mon Sep 17 00:00:00 2001
From: Cassio de Campos <cassiopc@gmail.com>
Date: Fri, 4 Aug 2017 12:38:05 +0100
Subject: bf

---
 tools/boca-submit-run-root | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'tools/boca-submit-run-root')

diff --git a/tools/boca-submit-run-root b/tools/boca-submit-run-root
index 3bba4aa..eb2528f 100755
--- a/tools/boca-submit-run-root
+++ b/tools/boca-submit-run-root
@@ -64,12 +64,13 @@ if [ "$7" != "" ]; then
 	uniq=`sha256sum "$7" | cut -f1 -d' '`
 	code=`cat /root/submissions/code 2>/dev/null`
 	if [ "$code" == "" ]; then
-	    echo "ERROR: this computer is not configured to submit runs"
+	    echo "ERROR: this computer is not configured to submit runs -- code missing"
 	    exit 1
 	fi
-	comp="error"
-	if [ -r /root/submissions/comp ]; then
-	    comp=`cat /root/submissions/comp`
+	comp=`cat /root/submissions/comp 2>/dev/null`
+	if [ "$comp" == "" ]; then
+	    echo "ERROR: this computer is not configured to submit runs -- comp missing"
+	    exit 1
 	fi
 	res=`echo -n "${code}${uniq}${comp}${dateerr}" | sha256sum - | cut -f1 -d' '`
 	echo "uniq=$uniq" >> "$nom"
-- 
cgit v1.2.3