PR11105 part 2: tighten constraints on stap-server parameters passed to make

* util.h, util.cxx (assert_match_regexp): New function.
* main.cxx (main): Constrain -R, -r, -a, -D, -S, -q, -B flags.
* stap-serverd (listen): Harden stap-server-connect with ulimit/loop.
* testsuite/systemtap.server/{client,server}_args.exp: Revised.

1 files changed, 13 insertions, 15 deletions

diff --git a/testsuite/systemtap.server/client_args.exp b/testsuite/systemtap.server/client_args.exp
index f41b91cb..694d546d 100644
--- a/testsuite/systemtap.server/client_args.exp
+++ b/testsuite/systemtap.server/client_args.exp
@@ -5,33 +5,34 @@ set test "Invalid Server Client Arguments"
 set test_file $srcdir/systemtap.server/test.stp
 
 # Test invalid combinations.
-set error_regexp ".*You can't specify .* when --unprivileged is specified.*"
+set error_regexp ".*(ERROR)|(You can't specify .* when --unprivileged is specified).*"
 
 set invalid_options [list \
-  "--unprivileged --client-options -a i386" \
   "--unprivileged --client-options -B X=Y" \
   "--unprivileged --client-options -D X=Y" \
   "--unprivileged --client-options -I /tmp" \
   "--unprivileged --client-options -m test" \
   "--unprivileged --client-options -R /tmp" \
-  "--unprivileged --client-options -r [exec uname -r]" \
-  "--unprivileged --client-options -a i386 -B X=Y -D X=Y -I /tmp -m test -R /tmp -r [exec uname -r]" \
-  "--client-options --unprivileged -a i386" \
+  "--unprivileged --client-options -B X=Y -D X=Y -I /tmp -m test -R /tmp -r [exec uname -r]" \
   "--client-options --unprivileged -B X=Y" \
   "--client-options --unprivileged -D X=Y" \
   "--client-options --unprivileged -I /tmp" \
   "--client-options --unprivileged -m test" \
   "--client-options --unprivileged -R /tmp" \
-  "--client-options --unprivileged -r [exec uname -r]" \
-  "--client-options --unprivileged -a i386 -B X=Y -D X=Y -I /tmp -m test -R /tmp -r [exec uname -r]" \
-  "--client-options -a i386 --unprivileged" \
+  "--client-options --unprivileged -B X=Y -D X=Y -I /tmp -m test -R /tmp -r [exec uname -r]" \
   "--client-options -B X=Y --unprivileged" \
   "--client-options -D X=Y --unprivileged" \
   "--client-options -I /tmp --unprivileged" \
   "--client-options -m test --unprivileged" \
   "--client-options -R /tmp --unprivileged" \
-  "--client-options -r [exec uname -r] --unprivileged" \
-  "--client-options -a i386 -B X=Y -D X=Y -I /tmp -m test -R /tmp -r [exec uname -r] --unprivileged" \
+  "--client-options -B X=Y -D X=Y -I /tmp -m test -R /tmp -r [exec uname -r] --unprivileged" \
+  "--client-options -R /path" \
+  "-D \"foo;bar\"" \
+  "-D 2=4" \
+  "-D \"foo;bar\"" \
+  "--client-options -r /path" \
+  "-S /path" \
+  "--client-options -q" \
 ]
 
 foreach options $invalid_options {
@@ -66,9 +67,8 @@ set valid_options [list \
   "-D X=Y" \
   "-I /tmp" \
   "-m test" \
-  "-R /tmp" \
   "-r [exec uname -r]" \
-  "-a i386 -B X=Y -D X=Y -I /tmp -m test -R /tmp -r [exec uname -r]" \
+  "-a i386 -B X=Y -D X=Y -I /tmp -m test -r [exec uname -r]" \
   "--unprivileged" \
   "--unprivileged -a i386" \
   "--unprivileged -B X=Y" \
@@ -80,13 +80,11 @@ set valid_options [list \
   "--unprivileged -a i386 -B X=Y -D X=Y -I /tmp -m test -R /tmp -r [exec uname -r]" \
   "--client-options" \
   "--client-options -a i386" \
-  "--client-options -B X=Y" \
   "--client-options -D X=Y" \
   "--client-options -I /tmp" \
   "--client-options -m test" \
-  "--client-options -R /tmp" \
   "--client-options -r [exec uname -r]" \
-  "--client-options -a i386 -B X=Y -D X=Y -I /tmp -m test -R /tmp -r [exec uname -r]" \
+  "--client-options -a i386 -D X=Y -I /tmp -m test -r [exec uname -r]" \
   "--unprivileged --client-options" \
   "--client-options --unprivileged" \
   "--unprivileged -a i386 --client-options" \