Index: trunk/test/test.sh =================================================================== --- trunk/test/test.sh (revision 25) +++ trunk/test/test.sh (revision 27) @@ -1,3 +1,22 @@ #! /bin/sh + +# +# Copyright Rainer Wichmann (2006) +# +# License Information: +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# isok=`test -t 1 2>&1 | wc -c` @@ -288,7 +307,8 @@ rm -f testrc_1.dyn rm -f testrc_2 + rm -f testrc_22 rm -f ./.samhain_file rm -f ./.samhain_log* - rm -f ./.samhain_lock + rm -f ./.samhain_lock* test -d testrun_testdata && chmod -R 0700 testrun_testdata test -d .quarantine && rm -rf .quarantine @@ -296,7 +316,8 @@ rm -f test_log_db rm -f test_log_prelude - rm -f test_log_valgrind + rm -f test_log_valgrind* rm -f test_log_yulectl rm -f yule.html + rm -f yule.html2 } Index: trunk/test/testcompile.sh =================================================================== --- trunk/test/testcompile.sh (revision 25) +++ trunk/test/testcompile.sh (revision 27) @@ -1,3 +1,22 @@ #! /bin/sh + +# +# Copyright Rainer Wichmann (2006) +# +# License Information: +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# MAXTEST=56; export MAXTEST Index: trunk/test/testext.sh =================================================================== --- trunk/test/testext.sh (revision 25) +++ trunk/test/testext.sh (revision 27) @@ -1,3 +1,22 @@ #! /bin/sh + +# +# Copyright Rainer Wichmann (2006) +# +# License Information: +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# MAXTEST=1; export MAXTEST Index: trunk/test/testhash.sh =================================================================== --- trunk/test/testhash.sh (revision 25) +++ trunk/test/testhash.sh (revision 27) @@ -1,3 +1,22 @@ #! /bin/sh + +# +# Copyright Rainer Wichmann (2006) +# +# License Information: +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# RCFILE="$PW_DIR/testrc_1.dyn"; export RCFILE Index: trunk/test/testrun_1.sh =================================================================== --- trunk/test/testrun_1.sh (revision 25) +++ trunk/test/testrun_1.sh (revision 27) @@ -1,3 +1,22 @@ #! /bin/sh + +# +# Copyright Rainer Wichmann (2006) +# +# License Information: +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# RCFILE="$PW_DIR/testrc_1.dyn"; export RCFILE Index: trunk/test/testrun_1a.sh =================================================================== --- trunk/test/testrun_1a.sh (revision 25) +++ trunk/test/testrun_1a.sh (revision 27) @@ -1,3 +1,22 @@ #! /bin/sh + +# +# Copyright Rainer Wichmann (2006) +# +# License Information: +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# BUILDOPTS="--quiet $TRUST --enable-debug --enable-xml-log --enable-micro-stealth=137 --enable-login-watch --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$RCFILE --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --with-data-file=$PW_DIR/.samhain_file" Index: trunk/test/testrun_1b.sh =================================================================== --- trunk/test/testrun_1b.sh (revision 25) +++ trunk/test/testrun_1b.sh (revision 27) @@ -1,4 +1,22 @@ #! /bin/sh +# +# Copyright Rainer Wichmann (2006) +# +# License Information: +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# MAXTEST=2; export MAXTEST Index: trunk/test/testrun_1c.sh =================================================================== --- trunk/test/testrun_1c.sh (revision 25) +++ trunk/test/testrun_1c.sh (revision 27) @@ -1,3 +1,22 @@ #! /bin/sh + +# +# Copyright Rainer Wichmann (2006) +# +# License Information: +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# BUILDOPTS="--quiet $TRUST --enable-xml-log --enable-suidcheck --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$RCFILE --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --with-data-file=$PW_DIR/.samhain_file" Index: trunk/test/testrun_2.sh =================================================================== --- trunk/test/testrun_2.sh (revision 25) +++ trunk/test/testrun_2.sh (revision 27) @@ -1,3 +1,22 @@ #! /bin/sh + +# +# Copyright Rainer Wichmann (2006) +# +# License Information: +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# LOGFILE="$PW_DIR/.samhain_log"; export LOGFILE @@ -16,5 +35,16 @@ rm -f test_log_valgrind - ${VALGRIND} ./yule -l info -p none >/dev/null 2>>test_log_valgrind & + ${VALGRIND} ./yule.2 -l info -p none >/dev/null 2>>test_log_valgrind & + PROC_Y2=$! + sleep 5 + + [ -z "$verbose" ] || { + echo; + echo "${S}Start Server #2${E}: ./yule.2 -l info -p none &"; + echo; + } + + ${VALGRIND} ./yule -l info -p none -e info --bind-address=127.0.0.1 \ + --server-port=49778 >/dev/null 2>>test_log_valgrind & PROC_Y=$! sleep 5 @@ -32,9 +62,36 @@ [ -z "$quiet" ] && log_msg_fail "samhain.new -t check"; kill $PROC_Y + kill $PROC_Y2 return 1 fi kill $PROC_Y - sleep 5 + kill $PROC_Y2 + sleep 5 + + # cp ${LOGFILE} triple_test + # cp ${LOGFILE}2 triple_test_2 + + egrep "START(>|\").*Yule(>|\")" ${LOGFILE}2 >/dev/null 2>&1 + if [ $? -ne 0 ]; then + [ -z "$verbose" ] || log_msg_fail "Server #2 start"; + return 1 + fi + egrep "remote_host.*Checking.*/bin" ${LOGFILE}2 >/dev/null 2>&1 + if [ $? -ne 0 ]; then + [ -z "$verbose" ] || log_msg_fail "Client file check (relayed)"; + return 1 + fi + egrep "remote_host.*EXIT.*Samhain" ${LOGFILE}2 >/dev/null 2>&1 + if [ $? -ne 0 ]; then + [ -z "$verbose" ] || log_msg_fail "Client exit (relayed)"; + return 1 + fi + egrep "EXIT.*Yule.*SIGTERM" ${LOGFILE}2 >/dev/null 2>&1 + if [ $? -ne 0 ]; then + [ -z "$verbose" ] || log_msg_fail "Server #2 exit"; + return 1 + fi + egrep "START(>|\").*Yule(>|\")" $LOGFILE >/dev/null 2>&1 @@ -195,5 +252,5 @@ rm -f test_log_valgrind - ${VALGRIND} ./yule -p none >/dev/null 2>>test_log_valgrind & + ${VALGRIND} ./yule -p none -e none >/dev/null 2>>test_log_valgrind & PROC_Y=$! sleep 5 @@ -292,5 +349,6 @@ rm -f test_log_valgrind - ${VALGRIND} ./yule -l info -p none >/dev/null 2>>test_log_valgrind & + ${VALGRIND} ./yule -l info -p none -e none \ + >/dev/null 2>>test_log_valgrind & PROC_Y=$! sleep 5 @@ -427,21 +485,22 @@ ) >entry.html - ${VALGRIND} ./yule -l info -p none >/dev/null 2>>test_log_valgrind & + ${VALGRIND} ./yule -l info -p none -e none \ + >/dev/null 2>>test_log_valgrind & PROC_Y=$! sleep 5 egrep '' $HTML >/dev/null 2>&1 + if [ $? -ne 0 ]; then + # rm -f head.html; rm -f foot.html; rm -f entry.html; + kill $PROC_Y + [ -z "$verbose" ] || log_msg_fail "head.html (1)"; + return 1 + fi + + egrep '' $HTML >/dev/null 2>&1 if [ $? -ne 0 ]; then rm -f head.html; rm -f foot.html; rm -f entry.html; kill $PROC_Y - [ -z "$verbose" ] || log_msg_fail "head.html"; - return 1 - fi - - egrep '' $HTML >/dev/null 2>&1 - if [ $? -ne 0 ]; then - rm -f head.html; rm -f foot.html; rm -f entry.html; - kill $PROC_Y - [ -z "$verbose" ] || log_msg_fail "foot.html"; + [ -z "$verbose" ] || log_msg_fail "foot.html (1)"; return 1 fi @@ -500,5 +559,5 @@ egrep '' $HTML >/dev/null 2>&1 if [ $? -ne 0 ]; then - [ -z "$verbose" ] || log_msg_fail "head.html"; + [ -z "$verbose" ] || log_msg_fail "end head.html"; return 1 fi @@ -511,5 +570,5 @@ egrep '' $HTML >/dev/null 2>&1 if [ $? -ne 0 ]; then - [ -z "$verbose" ] || log_msg_fail "entry.html"; + [ -z "$verbose" ] || log_msg_fail "end entry.html"; return 1 fi @@ -522,5 +581,5 @@ egrep '' $HTML >/dev/null 2>&1 if [ $? -ne 0 ]; then - [ -z "$verbose" ] || log_msg_fail "foot.html"; + [ -z "$verbose" ] || log_msg_fail "end foot.html"; return 1 fi @@ -571,10 +630,10 @@ fi - # save binary and build server + # save binary and build server2 # cp samhain samhain.build || return 1 make clean >/dev/null || return 1 - ${TOP_SRCDIR}/configure --quiet $TRUST --enable-debug --enable-network=server --enable-xml-log --enable-login-watch --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$RCFILE --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --with-data-file=$PW_DIR/.samhain_file --with-html-file=$HTML --enable-encrypt=2 + ${TOP_SRCDIR}/configure --quiet $TRUST --enable-debug --enable-network=server --enable-xml-log --enable-login-watch --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=${RCFILE}2 --with-log-file=${LOGFILE}2 --with-pid-file=$PW_DIR/.samhain_lock2 --with-html-file=${HTML}2 --with-state-dir=$PW_DIR --enable-encrypt=2 --with-port=49778 # if test x$? = x0; then @@ -593,4 +652,26 @@ fi + # save binary and build server + # + cp yule yule.2 || return 1 + make clean >/dev/null || return 1 + + ${TOP_SRCDIR}/configure --quiet $TRUST --enable-debug --enable-network=server --enable-xml-log --enable-login-watch --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$RCFILE --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --with-html-file=$HTML --with-state-dir=$PW_DIR --enable-encrypt=2 + # + if test x$? = x0; then + [ -z "$verbose" ] || log_msg_ok "configure..."; + $MAKE > /dev/null 2>>test_log + if test x$? = x0; then + [ -z "$verbose" ] || log_msg_ok "make..."; + else + [ -z "$quiet" ] && log_msg_fail "make..."; + return 1 + fi + + else + [ -z "$quiet" ] && log_msg_fail "configure..."; + return 1 + fi + ##################################################################### @@ -633,6 +714,21 @@ mv samhain.build.new samhain.new || return 1 - rm -f ./.samhain_log.* - rm -f ./.samhain_lock + # Set in server + + ./samhain_setpwd yule new $SHPW >/dev/null + + if test x$? = x0; then + [ -z "$verbose" ] || log_msg_ok "./samhain_setpwd yule new $SHPW"; + else + [ -z "$quiet" ] && log_msg_fail "./samhain_setpwd yule new $SHPW"; + return 1 + fi + + mv yule.new yule || return 1 + + # + + rm -f ./.samhain_log* + rm -f ./.samhain_lock* SHCLT=`./yule -P $SHPW | sed s%HOSTNAME%${SH_LOCALHOST}%` @@ -646,4 +742,5 @@ echo $SHCLT >> testrc_2 + cp testrc_2 testrc_22 do_test_1 Index: trunk/test/testrun_2a.sh =================================================================== --- trunk/test/testrun_2a.sh (revision 25) +++ trunk/test/testrun_2a.sh (revision 27) @@ -1,3 +1,22 @@ #! /bin/sh + +# +# Copyright Rainer Wichmann (2006) +# +# License Information: +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# LOGFILE="$PW_DIR/.samhain_log"; export LOGFILE Index: trunk/test/testrun_2b.sh =================================================================== --- trunk/test/testrun_2b.sh (revision 25) +++ trunk/test/testrun_2b.sh (revision 27) @@ -1,3 +1,22 @@ #! /bin/sh + +# +# Copyright Rainer Wichmann (2006) +# +# License Information: +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# LOGFILE="$PW_DIR/.samhain_log"; export LOGFILE Index: trunk/test/testrun_2c.sh =================================================================== --- trunk/test/testrun_2c.sh (revision 25) +++ trunk/test/testrun_2c.sh (revision 27) @@ -1,3 +1,22 @@ #! /bin/sh + +# +# Copyright Rainer Wichmann (2006) +# +# License Information: +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# SERVER_BUILDOPTS="--quiet $TRUST --enable-xml-log --enable-debug --enable-network=server --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER$PW_DIR/testrc_2 --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-logserver=${SH_LOCALHOST} --with-log-file=$PW_DIR/.samhain_log --with-pid-file=$PW_DIR/.samhain_lock --with-database=mysql"; export SERVER_BUILDOPTS Index: trunk/test/testrun_2d.sh =================================================================== --- trunk/test/testrun_2d.sh (revision 25) +++ trunk/test/testrun_2d.sh (revision 27) @@ -1,3 +1,22 @@ #! /bin/sh + +# +# Copyright Rainer Wichmann (2006) +# +# License Information: +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# SERVER_BUILDOPTS="--quiet $TRUST --enable-xml-log --enable-debug --enable-network=server --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER$PW_DIR/testrc_2 --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-logserver=${SH_LOCALHOST} --with-log-file=$PW_DIR/.samhain_log --with-pid-file=$PW_DIR/.samhain_lock --with-database=postgresql"; export SERVER_BUILDOPTS Index: trunk/test/testtimesrv.sh =================================================================== --- trunk/test/testtimesrv.sh (revision 25) +++ trunk/test/testtimesrv.sh (revision 27) @@ -1,3 +1,22 @@ #! /bin/sh + +# +# Copyright Rainer Wichmann (2006) +# +# License Information: +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# RCFILE="$PW_DIR/testrc_1.dyn"; export RCFILE