Changeset 128

Timestamp:

Oct 5, 2007, 8:33:24 PM (19 years ago)

Author:

rainer

Message:

New option for portcheck to ignore selected ports. Released as 2.3.8.

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• docs/MANUAL-2_3.html.tar (modified) ( previous)
• docs/MANUAL-2_3.pdf (modified) ( previous)
• src/sh_portcheck.c (modified) (1 diff)
• test/test.sh (modified) (2 diffs)
• test/testrun_1e.sh (modified) (1 diff)

trunk/docs/Changelog

@@ -2 +2 @@
         * new option PortCheckIgnore = interface:portlist
 
-2.3.7:
+2.3.7 (13-09-2007):
         * Makefile.in: fix 'make deb' target, wrong name of config file
           written to debian/conffiles (reported by marc)

trunk/src/sh_portcheck.c

@@ -356 +356 @@
           ptr->status = SH_PORT_MISS;
 
-          if ((ptr->flag != SH_PORT_REQ) && (ptr->flag != SH_PORT_OPT))
+          if ((ptr->flag != SH_PORT_REQ) && (ptr->flag != SH_PORT_OPT) && (ptr->flag != SH_PORT_IGN))
             {
               if (portchk_debug && report)

trunk/test/test.sh

@@ -164 +164 @@
     echo "  (1) testcompile.sh (2) testhash.sh     (3) testrun_1.sh   (4) testrun_1a.sh"
     echo "  (5) testext.sh     (6) testtimesrv.sh  (7) testrun_1b.sh  (8) testrun_1c.sh" 
-    echo "  (9) testrun_1d.sh" 
+    echo "  (9) testrun_1d.sh (10) testrun_1e.sh" 
     echo " (20) testrun_2.sh  (21) testrun_2a.sh  (22) testrun_2b.sh (23) testrun_2c.sh"
     echo " (24) testrun_2d.sh"
@@ -285 +285 @@
 #
 #
-if test x$UID != x; then
+if test x$UID != x -a x$UID != x0; then
   TRUST="--with-trusted=0,2,$UID"
 else
-  TRUST="--with-trusted=0,2,500"
+  TRUST="--with-trusted=0,2,1000"
 fi
 export TRUST

trunk/test/testrun_1e.sh

@@ -23 +23 @@
 export BUILDOPTS
 
-MAXTEST=2; export MAXTEST
+MAXTEST=3; export MAXTEST
+
+PORTPOLICY_3="
+[ReadOnly]
+file=${BASE}
+[PortCheck]
+PortCheckActive = yes
+PortCheckUDP = no
+"
+
+chk_portdata_3 () {
+    one_sec_sleep
+
+    egrep 'CRIT.*POLICY \[ServiceNew\]' $LOGFILE >/dev/null 2>&1
+    if [ $? -eq 0 ]; then
+        
+        [ -z "$verbose" ] || log_msg_fail "Open ports";
+        return 1
+    fi
+}
+
+refine_portpolicy_3 ()
+{
+    cat "$LOGFILE" | grep ServiceNew | sed 's/.*port //' | awk '{ print $1 }' | \
+    while read line; do
+        echo "PortCheckIgnore=$line" >>"${RCFILE}"
+    done
+    echo "PortCheckIgnore=2026" >>"${RCFILE}"
+    echo "PortCheckIgnore=2027" >>"${RCFILE}"
+    echo "PortCheckIgnore=2028" >>"${RCFILE}"
+    echo "PortCheckIgnore=2029" >>"${RCFILE}"
+}
+
 
 PORTPOLICY_2="