From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Wed, 3 May 2017 15:54:30 +0000 (-0600)
Subject: Add tests for parsing tuples and syslog options.
X-Git-Tag: SUDO_1_8_20^2~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c3796655568cd18806569d1a99e8cf5577d1df8b;p=sudo

Add tests for parsing tuples and syslog options.
---

diff --git a/MANIFEST b/MANIFEST
index d2debad5b..25ceea8ce 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -431,6 +431,14 @@ plugins/sudoers/regress/sudoers/test2.in
 plugins/sudoers/regress/sudoers/test2.json.ok
 plugins/sudoers/regress/sudoers/test2.out.ok
 plugins/sudoers/regress/sudoers/test2.toke.ok
+plugins/sudoers/regress/sudoers/test20.in
+plugins/sudoers/regress/sudoers/test20.json.ok
+plugins/sudoers/regress/sudoers/test20.out.ok
+plugins/sudoers/regress/sudoers/test20.toke.ok
+plugins/sudoers/regress/sudoers/test21.in
+plugins/sudoers/regress/sudoers/test21.json.ok
+plugins/sudoers/regress/sudoers/test21.out.ok
+plugins/sudoers/regress/sudoers/test21.toke.ok
 plugins/sudoers/regress/sudoers/test3.in
 plugins/sudoers/regress/sudoers/test3.json.ok
 plugins/sudoers/regress/sudoers/test3.out.ok
diff --git a/plugins/sudoers/regress/sudoers/test20.in b/plugins/sudoers/regress/sudoers/test20.in
new file mode 100644
index 000000000..c24f88a18
--- /dev/null
+++ b/plugins/sudoers/regress/sudoers/test20.in
@@ -0,0 +1,26 @@
+# Test parsing of tuples
+Defaults	lecture
+Defaults	!lecture
+Defaults	lecture=never
+Defaults	lecture=once
+Defaults	lecture=always
+
+Defaults	listpw
+Defaults	!listpw
+Defaults	listpw=never
+Defaults	listpw=any
+Defaults	listpw=all
+Defaults	listpw=always
+
+Defaults	verifypw
+Defaults	!verifypw
+Defaults	verifypw=never
+Defaults	verifypw=any
+Defaults	verifypw=all
+Defaults	verifypw=always
+
+Defaults	fdexec
+Defaults	!fdexec
+Defaults	fdexec=never
+Defaults	fdexec=digest_only
+Defaults	fdexec=always
diff --git a/plugins/sudoers/regress/sudoers/test20.json.ok b/plugins/sudoers/regress/sudoers/test20.json.ok
new file mode 100644
index 000000000..f2f1d55c2
--- /dev/null
+++ b/plugins/sudoers/regress/sudoers/test20.json.ok
@@ -0,0 +1,114 @@
+{
+    "Defaults": [
+        {
+            "Options": [
+                { "lecture": true }
+            ]
+        },
+        {
+            "Options": [
+                { "lecture": false }
+            ]
+        },
+        {
+            "Options": [
+                { "lecture": "never" }
+            ]
+        },
+        {
+            "Options": [
+                { "lecture": "once" }
+            ]
+        },
+        {
+            "Options": [
+                { "lecture": "always" }
+            ]
+        },
+        {
+            "Options": [
+                { "listpw": true }
+            ]
+        },
+        {
+            "Options": [
+                { "listpw": false }
+            ]
+        },
+        {
+            "Options": [
+                { "listpw": "never" }
+            ]
+        },
+        {
+            "Options": [
+                { "listpw": "any" }
+            ]
+        },
+        {
+            "Options": [
+                { "listpw": "all" }
+            ]
+        },
+        {
+            "Options": [
+                { "listpw": "always" }
+            ]
+        },
+        {
+            "Options": [
+                { "verifypw": true }
+            ]
+        },
+        {
+            "Options": [
+                { "verifypw": false }
+            ]
+        },
+        {
+            "Options": [
+                { "verifypw": "never" }
+            ]
+        },
+        {
+            "Options": [
+                { "verifypw": "any" }
+            ]
+        },
+        {
+            "Options": [
+                { "verifypw": "all" }
+            ]
+        },
+        {
+            "Options": [
+                { "verifypw": "always" }
+            ]
+        },
+        {
+            "Options": [
+                { "fdexec": true }
+            ]
+        },
+        {
+            "Options": [
+                { "fdexec": false }
+            ]
+        },
+        {
+            "Options": [
+                { "fdexec": "never" }
+            ]
+        },
+        {
+            "Options": [
+                { "fdexec": "digest_only" }
+            ]
+        },
+        {
+            "Options": [
+                { "fdexec": "always" }
+            ]
+        }
+    ]
+}
diff --git a/plugins/sudoers/regress/sudoers/test20.out.ok b/plugins/sudoers/regress/sudoers/test20.out.ok
new file mode 100644
index 000000000..fcb54996a
--- /dev/null
+++ b/plugins/sudoers/regress/sudoers/test20.out.ok
@@ -0,0 +1,26 @@
+Parses OK.
+
+Defaults	lecture
+Defaults	!lecture
+Defaults	lecture=never
+Defaults	lecture=once
+Defaults	lecture=always
+Defaults	listpw
+Defaults	!listpw
+Defaults	listpw=never
+Defaults	listpw=any
+Defaults	listpw=all
+Defaults	listpw=always
+Defaults	verifypw
+Defaults	!verifypw
+Defaults	verifypw=never
+Defaults	verifypw=any
+Defaults	verifypw=all
+Defaults	verifypw=always
+Defaults	fdexec
+Defaults	!fdexec
+Defaults	fdexec=never
+Defaults	fdexec=digest_only
+Defaults	fdexec=always
+
+
diff --git a/plugins/sudoers/regress/sudoers/test20.toke.ok b/plugins/sudoers/regress/sudoers/test20.toke.ok
new file mode 100644
index 000000000..184714909
--- /dev/null
+++ b/plugins/sudoers/regress/sudoers/test20.toke.ok
@@ -0,0 +1,26 @@
+#
+DEFAULTS DEFVAR 
+DEFAULTS !DEFVAR 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+
+DEFAULTS DEFVAR 
+DEFAULTS !DEFVAR 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+
+DEFAULTS DEFVAR 
+DEFAULTS !DEFVAR 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+
+DEFAULTS DEFVAR 
+DEFAULTS !DEFVAR 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
diff --git a/plugins/sudoers/regress/sudoers/test21.in b/plugins/sudoers/regress/sudoers/test21.in
new file mode 100644
index 000000000..cba6df77a
--- /dev/null
+++ b/plugins/sudoers/regress/sudoers/test21.in
@@ -0,0 +1,38 @@
+# Test parsing of syslog settings
+Defaults	syslog
+Defaults	!syslog
+Defaults	syslog=auth
+Defaults	syslog=daemon
+Defaults	syslog=user
+Defaults	syslog=local0
+Defaults	syslog=local1
+Defaults	syslog=local2
+Defaults	syslog=local3
+Defaults	syslog=local4
+Defaults	syslog=local5
+Defaults	syslog=local6
+Defaults	syslog=local7
+
+Defaults	syslog_goodpri
+Defaults	!syslog_goodpri
+Defaults	syslog_goodpri=alert
+Defaults	syslog_goodpri=crit
+Defaults	syslog_goodpri=debug
+Defaults	syslog_goodpri=emerg
+Defaults	syslog_goodpri=err
+Defaults	syslog_goodpri=info
+Defaults	syslog_goodpri=notice
+Defaults	syslog_goodpri=warning
+Defaults	syslog_goodpri=none
+
+Defaults	syslog_badpri
+Defaults	!syslog_badpri
+Defaults	syslog_badpri=alert
+Defaults	syslog_badpri=crit
+Defaults	syslog_badpri=debug
+Defaults	syslog_badpri=emerg
+Defaults	syslog_badpri=err
+Defaults	syslog_badpri=info
+Defaults	syslog_badpri=notice
+Defaults	syslog_badpri=warning
+Defaults	syslog_badpri=none
diff --git a/plugins/sudoers/regress/sudoers/test21.json.ok b/plugins/sudoers/regress/sudoers/test21.json.ok
new file mode 100644
index 000000000..04404733e
--- /dev/null
+++ b/plugins/sudoers/regress/sudoers/test21.json.ok
@@ -0,0 +1,179 @@
+{
+    "Defaults": [
+        {
+            "Options": [
+                { "syslog": true }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog": false }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog": "auth" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog": "daemon" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog": "user" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog": "local0" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog": "local1" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog": "local2" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog": "local3" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog": "local4" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog": "local5" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog": "local6" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog": "local7" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog_goodpri": true }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog_goodpri": false }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog_goodpri": "alert" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog_goodpri": "crit" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog_goodpri": "debug" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog_goodpri": "emerg" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog_goodpri": "err" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog_goodpri": "info" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog_goodpri": "notice" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog_goodpri": "warning" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog_goodpri": "none" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog_badpri": true }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog_badpri": false }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog_badpri": "alert" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog_badpri": "crit" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog_badpri": "debug" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog_badpri": "emerg" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog_badpri": "err" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog_badpri": "info" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog_badpri": "notice" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog_badpri": "warning" }
+            ]
+        },
+        {
+            "Options": [
+                { "syslog_badpri": "none" }
+            ]
+        }
+    ]
+}
diff --git a/plugins/sudoers/regress/sudoers/test21.out.ok b/plugins/sudoers/regress/sudoers/test21.out.ok
new file mode 100644
index 000000000..a37ad56b3
--- /dev/null
+++ b/plugins/sudoers/regress/sudoers/test21.out.ok
@@ -0,0 +1,39 @@
+Parses OK (problem with defaults entries).
+
+Defaults	syslog
+Defaults	!syslog
+Defaults	syslog=auth
+Defaults	syslog=daemon
+Defaults	syslog=user
+Defaults	syslog=local0
+Defaults	syslog=local1
+Defaults	syslog=local2
+Defaults	syslog=local3
+Defaults	syslog=local4
+Defaults	syslog=local5
+Defaults	syslog=local6
+Defaults	syslog=local7
+Defaults	syslog_goodpri
+Defaults	!syslog_goodpri
+Defaults	syslog_goodpri=alert
+Defaults	syslog_goodpri=crit
+Defaults	syslog_goodpri=debug
+Defaults	syslog_goodpri=emerg
+Defaults	syslog_goodpri=err
+Defaults	syslog_goodpri=info
+Defaults	syslog_goodpri=notice
+Defaults	syslog_goodpri=warning
+Defaults	syslog_goodpri=none
+Defaults	syslog_badpri
+Defaults	!syslog_badpri
+Defaults	syslog_badpri=alert
+Defaults	syslog_badpri=crit
+Defaults	syslog_badpri=debug
+Defaults	syslog_badpri=emerg
+Defaults	syslog_badpri=err
+Defaults	syslog_badpri=info
+Defaults	syslog_badpri=notice
+Defaults	syslog_badpri=warning
+Defaults	syslog_badpri=none
+
+
diff --git a/plugins/sudoers/regress/sudoers/test21.toke.ok b/plugins/sudoers/regress/sudoers/test21.toke.ok
new file mode 100644
index 000000000..779883cca
--- /dev/null
+++ b/plugins/sudoers/regress/sudoers/test21.toke.ok
@@ -0,0 +1,40 @@
+#
+DEFAULTS DEFVAR 
+DEFAULTS !DEFVAR 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+
+DEFAULTS DEFVAR 
+DEFAULTS !DEFVAR 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+
+DEFAULTS DEFVAR 
+DEFAULTS !DEFVAR 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+DEFAULTS DEFVAR = WORD(2) 
+testsudoers: sudoers:16 no value specified for "syslog_goodpri"
+testsudoers: sudoers:28 no value specified for "syslog_badpri"