probes: fixes

diff --git a/crontab.part.INO b/crontab.part.INO
index 5bb16437246d92f1b5596d9645d34362baeb99b4..dc6fa010db812e713bfc9a0ac8033dac6ac499f9 100644 (file)
--- a/crontab.part.INO
+++ b/crontab.part.INO
@@ -7,5 +7,5 @@
 51 7  12 * *   savelog -p live-%ABBREV%/errs
 52 7  12 * *   savelog -p live-%ABBREV%/webstump/log/webstump.log
 53 7  * * 1    find live-%ABBREV%/xlog/log/%GROUP%/public -mtime +14 -type f -print0 | xargs -r0 rm --
-42     *  * * *        cd %BASEDIR% && probes/modrelays-probe all
+51     *  * * *        cd %BASEDIR% && probes/modrelays-probe all
 3-59/5 *  * * *        cd %BASEDIR% && probes/modrelays-probe report

diff --git a/probes/modrelays-probe b/probes/modrelays-probe
index 79e8ab7f5f4b0d10f13795ec888bb0ec11e0b3c9..6245c82804543dde67dafb66600b4019b00048d9 100755 (executable)
--- a/probes/modrelays-probe
+++ b/probes/modrelays-probe
@@ -31,9 +31,9 @@ compute-td () {
        # caller must "local td", which will be set
        local probeid=$1
 
-       probeid="$domain,${probeid//[^-=.,_0-9A-Za-z]/%/},$id"
+       probeid="$domain,${probeid//[^-=:.,_0-9A-Za-z]/%},$id"
        case $probeid in
-       .*|*/*) fail "yikes, sanitisation bug!" ;;
+       .*|*/*) fail "yikes, sanitisation bug ($probeid) !" ;;
        esac
 
        td="$statedir/$probeid"
@@ -358,6 +358,9 @@ mode_received () {
        while read hn group id domain mx addr; do
                if [ x"$hn" != x"X-WebSTUMP-Relay-Probe:" ]; then continue; fi
                if [ x"$group" != x"$GROUP" ]; then continue; fi
+               case " $id $domain $mx $addr" in
+               */*|' '.*)      fail "bad syntax" ;;
+               esac
                local td
                compute-td "mx=$mx,addr=$addr"
                >"$td/ok" ||: