From d9b155d2a3c817819558cef1ab9fe3ee3682498c Mon Sep 17 00:00:00 2001 From: cassio Date: Mon, 29 Oct 2018 16:24:56 +0100 Subject: extra check in file names --- tools/boca-submit-run | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/boca-submit-run b/tools/boca-submit-run index 9de52bd..ab1cd57 100755 --- a/tools/boca-submit-run +++ b/tools/boca-submit-run @@ -74,8 +74,12 @@ if [ -r "$5" ]; then fi nom=`echo -n "$5" | perl -MURI::Escape -lne 'print uri_escape($_)'` + if [ "$nom" != "$5" ]; then + echo "Invalid file name" + exit 1 + fi for BOCASERVER in `echo $BOCASERVERS | tr ';' ' '`; do - $runroot "$BOCASERVER" "$1" "$2" "$3" "$4" "`basename $5`" "$5" + $runroot "$BOCASERVER" "$1" "$2" "$3" "$4" "`basename $nom`" "$nom" done else echo "file $5 not found/readable" -- cgit v1.2.3 From 1b68edba58dac20687e0c020e64ef1797410f30a Mon Sep 17 00:00:00 2001 From: cassio Date: Mon, 29 Oct 2018 16:37:15 +0100 Subject: save direct runs also as processed in local storage --- tools/boca-submit-run-root | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/boca-submit-run-root b/tools/boca-submit-run-root index ad94aad..04cec99 100755 --- a/tools/boca-submit-run-root +++ b/tools/boca-submit-run-root @@ -83,7 +83,7 @@ if [ "$7" != "" ]; then mv "$nom" "/root/submissions/`basename $nom .tmp`" echo "Run submission included in the queue -- it shall appear in the system later when connection is available" else - [ -f "$nom" ] && rm -f $nom + [ -f "$nom" ] && mv "$nom" "/root/submissions/`basename $nom .tmp`.processed" fi fi fi -- cgit v1.2.3 From 6ef5a17d21e2b4c89e4c42627b148f9d5adaa2ab Mon Sep 17 00:00:00 2001 From: cassio Date: Mon, 29 Oct 2018 16:47:33 +0100 Subject: help team by keeping track of user and pass from previous attempts --- tools/boca-submit-run-root | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'tools') diff --git a/tools/boca-submit-run-root b/tools/boca-submit-run-root index 04cec99..686c5eb 100755 --- a/tools/boca-submit-run-root +++ b/tools/boca-submit-run-root @@ -46,9 +46,17 @@ if [ "$7" != "" ]; then tmpvar=`echo "$1" | tr -cd '[[:alnum:]]._+-/'` echo "BOCASERVER=$tmpvar" > "$nom" tmpvar=`echo "$2" | tr -cd '[[:alnum:]]._+-/'` + if [ -f "/root/submissions/user.ok" && "`cat /root/submissions/user.ok`" != "$tmpvar" ]; then + echo "WARNING: different username had been successfully used before - I will try to continue but you better check, this may fail later" + fi echo "user=$tmpvar" >> "$nom" + tmpuser=$tmpvar tmpvar=`echo "$3" | tr -cd '[[:alnum:]]._+-/'` + if [ -f "/root/submissions/pass.ok" && "`cat /root/submissions/pass.ok`" != "$tmpvar" ]; then + echo "WARNING: different password had been successfully used before - I will try to continue but you better check, this may fail later" + fi echo "pass=$tmpvar" >> "$nom" + tmppass=$tmpvar tmpvar=`echo "$4" | tr -cd '[[:alnum:]]._+-/'` echo "problem=$tmpvar" >> "$nom" tmpvar=`echo "$5" | tr -cd '[[:alnum:]]._+-/'` @@ -84,6 +92,8 @@ if [ "$7" != "" ]; then echo "Run submission included in the queue -- it shall appear in the system later when connection is available" else [ -f "$nom" ] && mv "$nom" "/root/submissions/`basename $nom .tmp`.processed" + echo -n "$tmpuser" > /root/submissions/user.ok + echo -n "$tmpvar" > /root/submissions/pass.ok fi fi fi -- cgit v1.2.3