Fixes #19411: Add new methods tests

ncf

@@ -6,13 +6,15 @@ import os
 import sys
 import shutil
 import json
+import grp
 from pprint import pprint
 
 DEFAULT_NCF_DIR = '/usr/share/ncf'
 
 NCF_DIR = os.path.dirname(os.path.realpath(__file__))
 NCF_TREE_DIR  = os.path.join(NCF_DIR, 'tree')
 NCF_TOOLS_DIR = os.path.join(NCF_DIR, 'tools')
+GROUP_OWNER = 'rudder'
 
 sys.path[0:0] = [NCF_TOOLS_DIR, DEFAULT_NCF_DIR]
 
@@ -63,10 +65,13 @@ def write_all_methods(path):
   methods = ncf.get_all_generic_methods_metadata()
 
   methodsFile = '/var/rudder/configuration-repository/ncf/generic_methods.json'
+  gid = grp.getgrnam(GROUP_OWNER)[2]
   if not os.path.exists(os.path.dirname(methodsFile)):
     os.makedirs(os.path.dirname(methodsFile))
+    os.chown(os.path.dirname(methodsFile), -1, gid)
   with open(methodsFile, 'w') as outfile:
     json.dump(methods["data"]["generic_methods"], outfile, indent=2)
+  os.chown(methodsFile, -1, gid)
 
 def write_all_techniques(path, migrate_old):
   techniques = ncf.get_all_techniques_metadata(True,migrate_old)
@@ -77,8 +82,8 @@ def write_all_techniques(path, migrate_old):
     techniqueFile = '/var/rudder/configuration-repository/techniques/'+category+"/"+ bundle_name +"/"+version+'/technique.json'
     if not os.path.exists(techniqueFile):
       with open('/var/rudder/configuration-repository/techniques/'+category+"/"+ bundle_name +"/"+version+'/technique.json', 'w') as outfile:
-       json.dump(technique, outfile, indent=2)
-
+        json.dump(technique, outfile, indent=2)
+      os.chown(techniqueFile, -1, grp.getgrnam(GROUP_OWNER)[2])
 
 
 def usage():

tests/acceptance/30_generic_methods/command_execution.cf

@@ -24,7 +24,7 @@ bundle agent init
   vars:
       "tmp"        string => getenv("TEMP", 1024);
 
-      "command[1]" string => "/bin/date | egrep '[0-9]'";
+      "command[1]" string => "/bin/date | ${paths.path[egrep]} '[0-9]'";
       "result[1]"  string => "repaired";
 
       "command[2]" string => "/bin/false";

tests/acceptance/30_generic_methods/staging/file_augeas_set.cf → tests/acceptance/30_generic_methods/file_augeas_set.cf

@@ -1,13 +1,3 @@
- #######################################################
-#
-# Read a file into a string
-# Currently in staging since the method does not behave
-# as intended. The fix need to deprecate this one and
-# develop a new one. Until then, the test will be set
-# to staging.
-#
-#######################################################
-
 bundle common acc_path
 {
   vars:
@@ -28,40 +18,32 @@ bundle agent init
   vars:
     "tmp"   string => getenv("TEMP", 1024);
 
-    "file[0]"   string => "${tmp}/etc/hosts0";
-    "value[0]" string => "127.0.0.1";
-    "lens[0]"   string => "Hosts";
-    "path[0]"   string => "/etc/hosts/1/ipaddr";
+    "file[0]"   string => "${tmp}/etc/sshd_config0";
+    "value[0]"  string => "yes";
+    "lens[0]"   string => "Sshd";
+    "path[0]"   string => "${tmp}/etc/sshd_config0/PermitRootLogin";
     "status[0]" string => "success";
     "mode[0]"   string => "enforce";
 
-    "file[1]"   string => "${tmp}/etc/hosts1";
-    "value[1]" string => "127.0.0.1";
-    "lens[1]"   string => "";
-    "path[1]"   string => "/etc/hosts/1/ipaddr";
-    "status[1]" string => "error";
+    "file[1]"   string => "${tmp}/etc/sshd_config1";
+    "value[1]"  string => "no";
+    "lens[1]"   string => "Sshd";
+    "path[1]"   string => "${tmp}/etc/sshd_config1/PermitRootLogin";
+    "status[1]" string => "repaired";
     "mode[1]"   string => "enforce";
 
-    #file is null but the lens should be enough for augeas
-    "file[2]"   string => "";
-    "value[2]" string => "127.0.0.1";
-    "lens[2]"   string => "Hosts";
-    "path[2]"   string => "/etc/hosts/1/ipaddr";
+    "file[2]"   string => "${tmp}/etc/sshd_config1";
+    "value[2]"  string => "yes";
+    "lens[2]"   string => "Sshd";
+    "path[2]"   string => "${tmp}/etc/sshd_config1/StrictModes";
     "status[2]" string => "success";
     "mode[2]"   string => "enforce";
 
-    "file[3]"   string => "${tmp}/etc/hosts3";
-    "value[3]"  string => "0.1.2.3";
-    "lens[3]"   string => "Hosts";
-    "path[3]"   string => "/etc/hosts/1/ipaddr";
-    "status[3]" string => "repaired";
-    "mode[3]"   string => "enforce";
-
     "indices" slist => getindices("file");
 
   files:
-    "${tmp}/etc/hosts${indices}"
-      copy_from => local_cp("/etc/hosts");
+    "${tmp}/etc/sshd_config${indices}"
+       copy_from => local_cp("${this.promise_dirname}/file_augeas_set.sshd_config_yes");
 }
 
 #######################################################
@@ -75,18 +57,20 @@ bundle agent test
     "ph0"  usebundle => apply_gm("file_augeas_set", @{args0},  "${init.status[0]}",  "ph0",  "${init.mode[0]}");
     "ph1"  usebundle => apply_gm("file_augeas_set", @{args1},  "${init.status[1]}",  "ph1",  "${init.mode[1]}");
     "ph2"  usebundle => apply_gm("file_augeas_set", @{args2},  "${init.status[2]}",  "ph2",  "${init.mode[2]}");
-    "ph3"  usebundle => apply_gm("file_augeas_set", @{args3},  "${init.status[3]}",  "ph3",  "${init.mode[3]}");
 }
 
 #######################################################
 
 bundle agent check
 {
   classes:
+      "classes_ok" expression => "ph0_ok.ph1_ok.ph2_ok";
+    classes_ok::
+      "content_0" expression => returnszero("diff ${init.file[0]} ${this.promise_dirname}/file_augeas_set.sshd_config_yes 2>/dev/null", "useshell");
+      "content_1" expression => returnszero("diff ${init.file[1]} ${this.promise_dirname}/file_augeas_set.sshd_config_no 2>/dev/null", "useshell");
+      "content_ok" expression => "content_0.content_1";
 
-    "classes_ok" expression => "ph0_ok.ph1_ok.ph2_ok.ph3_ok";
-
-    "ok" expression => "classes_ok";
+      "ok" expression => "classes_ok.content_ok";
 
   reports:
     ok::

tests/acceptance/30_generic_methods/file_augeas_set.sshd_config_no

@@ -0,0 +1,7 @@
+# Authentication:
+
+#LoginGraceTime 2m
+PermitRootLogin no
+StrictModes yes
+#MaxAuthTries 6
+#MaxSessions 10

tests/acceptance/30_generic_methods/file_augeas_set.sshd_config_yes

@@ -0,0 +1,7 @@
+# Authentication:
+
+#LoginGraceTime 2m
+PermitRootLogin yes
+StrictModes yes
+#MaxAuthTries 6
+#MaxSessions 10

tests/acceptance/30_generic_methods/file_check_block_device.cf

@@ -1,7 +1,7 @@
 #########################################
 #
-# Test checking if a block device or not 
-# 
+# Test checking if a block device or not
+#
 #########################################
 
 bundle common acc_path
@@ -30,14 +30,26 @@ bundle agent init
     "block_device_canon"  string => canonify("${block_device}");
 
     "file_list"       slist => { "${file}", "${block_device}" };
+    solaris::
+      "mknod"          string => "/usr/sbin/mknod";
+    debian::
+      "mknod"          string => "/bin/mknod";
+    !solaris.!debian::
+      "mknod"          string => "/usr/bin/mknod";
 
   files:
     "${file}"
       create => "true";
 
   commands:
-    "/bin/mknod"
-      args => "-m 640 \"${block_device}\" b 7 0"; # /dev/loop0
+    "${mknod}"
+      args => "\"${block_device}\" b 7 0", # /dev/loop0
+      if => "solaris";
+
+    "${mknod}"
+      args => "-m 640 \"${block_device}\" b 7 0", # /dev/loop0
+      if => "!solaris";
+
 }
 
 #######################################################

tests/acceptance/30_generic_methods/file_content.cf

@@ -23,6 +23,7 @@ bundle agent init
 {
   vars:
     "tmp"          string => getenv("TEMP", 1024);
+
     "file_1"       string => "${tmp}/test_1";
     "file_1_canon" string => canonify("${file_1}");
     "file_2"       string => "${tmp}/test_2";
@@ -73,10 +74,10 @@ bundle agent test
 bundle agent check
 {
   vars:
-    "line_1_present_exists_test" string => "/bin/grep -E \"^${init.line_present}$\" \"${init.file_1}\"";
-    "line_1_added_exists_test"   string => "/bin/grep -E \"^${init.line_to_add}$\" \"${init.file_1}\"";
-    "line_2_present_exists_test" string => "/bin/grep -E \"^${init.line_present}$\" \"${init.file_2}\"";
-    "line_2_added_exists_test"   string => "/bin/grep -E \"^${init.line_to_add}$\" \"${init.file_2}\"";
+    "line_1_present_exists_test" string => "${paths.path[grep]} -E \"^${init.line_present}$\" \"${init.file_1}\"";
+    "line_1_added_exists_test"   string => "${paths.path[grep]} -E \"^${init.line_to_add}$\" \"${init.file_1}\"";
+    "line_2_present_exists_test" string => "${paths.path[grep]} -E \"^${init.line_present}$\" \"${init.file_2}\"";
+    "line_2_added_exists_test"   string => "${paths.path[grep]} -E \"^${init.line_to_add}$\" \"${init.file_2}\"";
     "file_3_test"                string => "/usr/bin/diff \"${init.ref_3}\" \"${init.file_3}\"";
 
   classes:

tests/acceptance/30_generic_methods/file_from_local_source_with_check.cf

@@ -37,6 +37,7 @@ bundle agent init
     "${source_file}"
       edit_line => insert_lines("test file"),
       create => "true";
+
     "${destination_file_3}"
       edit_line => insert_lines("test file"),
       create => "true";
@@ -50,7 +51,7 @@ bundle agent test
     "ph1"  usebundle => file_from_local_source_with_check("${init.source_file}", "${init.destination_file_1}", "/bin/true", "0");
     "ph2"  usebundle => file_from_local_source_with_check("${init.source_file}", "${init.destination_file_2}", "/bin/false", "0");
     "ph3"  usebundle => file_from_local_source_with_check("${init.source_file}", "${init.destination_file_3}", "/bin/false", "0");
-    "ph4"  usebundle => file_from_local_source_with_check("${init.source_file}", "${init.destination_file_4}", "/bin/false", "1");
+    "ph4"  usebundle => file_from_local_source_with_check("${init.source_file}", "${init.destination_file_4}", "exit 1", "1");
 }
 
 #######################################################
@@ -78,7 +79,7 @@ bundle agent check
     "ok_3" expression => "file_3.content_3.file_from_local_source_with_check_${init.destination_file_canon_3}_kept";
     "ok_4" expression => "file_4.content_4.file_from_local_source_with_check_${init.destination_file_canon_4}_repaired.!file_from_local_source_with_check_${init.destination_file_canon_4}_error";
     "ok" expression => "ok_1.ok_2.ok_3.ok_4";
-  
+
   reports:
     ok::
       "$(this.promise_filename) Pass";

tests/acceptance/30_generic_methods/file_from_string_mustache.cf

@@ -44,8 +44,8 @@ bundle agent test
 bundle agent check
 {
   vars:
-    "file_length_check_1" string => "/usr/bin/test `/bin/cat ${init.destination_file_1} | wc -l` = '1'";
-    "file_content_check_1" string => "/bin/cat ${init.destination_file_1} | head -n1 | grep '^sys.host is: ${sys.host}$'";
+    "file_length_check_1" string => "${paths.path[test]} `${paths.path[cat]} ${init.destination_file_1} | wc -l` = '1'";
+    "file_content_check_1" string => "${paths.path[cat]} ${init.destination_file_1} | ${ncf_paths.path[head]} -n1 | ${paths.path[grep]} '^sys.host is: ${sys.host}$'";
 
   classes:
     # By default, should create the file if it doesn't exist

tests/acceptance/30_generic_methods/file_from_template.cf

@@ -47,8 +47,8 @@ bundle agent test
 bundle agent check
 {
   vars:
-    "file_length_check" string => "/usr/bin/test `/bin/cat ${init.destination_file} | wc -l` = '1'";
-    "file_content_check" string => "/bin/cat ${init.destination_file} | head -n1 | grep '^sys.host is: ${sys.host}$'";
+    "file_length_check" string => "${paths.path[test]} `${paths.path[cat]} ${init.destination_file} | wc -l` = '1'";
+    "file_content_check" string => "${paths.path[cat]} ${init.destination_file} | ${ncf_paths.path[head]} -n1 | ${paths.path[grep]} '^sys.host is: ${sys.host}$'";
 
   classes:
     # By default, should create the file if it doesn't exist

tests/acceptance/30_generic_methods/file_from_template_mustache.cf

@@ -47,8 +47,8 @@ bundle agent test
 bundle agent check
 {
   vars:
-    "file_length_check" string => "/usr/bin/test `/bin/cat ${init.destination_file} | wc -l` = '1'";
-    "file_content_check" string => "/bin/cat ${init.destination_file} | head -n1 | grep '^sys.host is: ${sys.host}$'";
+    "file_length_check" string => "${paths.path[test]} `${paths.path[cat]} ${init.destination_file} | wc -l` = '1'";
+    "file_content_check" string => "${paths.path[cat]} ${init.destination_file} | ${ncf_paths.path[head]} -n1 | ${paths.path[grep]} '^sys.host is: ${sys.host}$'";
 
   classes:
     # By default, should create the file if it doesn't exist

tests/acceptance/30_generic_methods/file_lines_absent.cf

@@ -44,7 +44,7 @@ bundle agent test
 bundle agent check
 {
   vars:
-    "line_exists_test" string => "/bin/grep -E \"^${init.line_to_test}$\" \"${init.file}\"";
+    "line_exists_test" string => "${paths.path[grep]} -E \"^${init.line_to_test}$\" \"${init.file}\"";
 
   classes:
     "file_exists" expression => fileexists("${init.file}");

tests/acceptance/30_generic_methods/file_lines_present.cf

@@ -41,12 +41,12 @@ bundle agent test
 bundle agent check
 {
   vars:
-    "line_exists_test" string => "/bin/grep -E \"^${init.line_to_add}$\" \"${init.file}\"";
+      "line_exists_test" string => "${paths.path[grep]} -E \"^${init.line_to_add}$\" \"${init.file}\"";
 
   classes:
     # By default, file_lines_present should create the file if it doesn't exist
     "file_exists" expression => fileexists("${init.file}");
-    "line_exists" 
+    "line_exists"
        expression => returnszero("${line_exists_test}", "noshell"),
        ifvarclass => canonify("file_lines_present_${init.file}_reached");
 

tests/acceptance/30_generic_methods/file_lines_present_test_already_present.cf

@@ -48,12 +48,12 @@ bundle agent test
 bundle agent check
 {
   vars:
-    "line_exists_test" string => "/usr/bin/test `/bin/grep \"^${init.line_to_add}$\" \"${init.file}\" | wc -l` = '1'";
+    "line_exists_test" string => "${paths.path[test]} `${paths.path[grep]} \"^${init.line_to_add}$\" \"${init.file}\" | wc -l` = '1'";
 
   classes:
     # By default, file_lines_present should create the file if it doesn't exist
     "file_exists" expression => fileexists("${init.file}");
-    
+
     "line_exists" expression => returnszero("${line_exists_test}", "useshell"),
                   ifvarclass => canonify("file_lines_present_${init.file}_reached");
 

tests/acceptance/30_generic_methods/file_lines_test_from_empty_file.cf

@@ -47,7 +47,7 @@ bundle agent test
 bundle agent check
 {
   vars:
-    "line_exists_test" string => "/bin/grep -E \"^${init.line_to_test}$\" \"${init.file}\"";
+    "line_exists_test" string => "${paths.path[grep]} -E \"^${init.line_to_test}$\" \"${init.file}\"";
 
   classes:
     "file_exists" expression => fileexists("${init.file}");

tests/acceptance/30_generic_methods/file_replace_lines.cf

@@ -45,7 +45,7 @@ bundle agent test
 bundle agent check
 {
   vars:
-    "line_exists_test" string => "/bin/grep -E \"^${init.line_for_replacement}$\" \"${init.file}\"";
+    "line_exists_test" string => "${paths.path[grep]} -E \"^${init.line_for_replacement}$\" \"${init.file}\"";
 
   classes:
     # By default, file_replace_lines should create the file if it doesn't exist

tests/acceptance/30_generic_methods/file_report_content_head_tail.cf

@@ -91,7 +91,7 @@ bundle agent result(id, result)
 #######################################################
 
 bundle agent check
-{  
+{
   classes:
     "ok_1" expression => strcmp("${init.file_1_expected}", "${result.file_1}");
     "ok_1_class" expression => "file_report_content_head_${init.file_1_canon}_kept.!file_report_content_head_${init.file_1_canon}_error";
@@ -103,7 +103,15 @@ bundle agent check
     "ok" expression => "ok_1.ok_2.ok_1_class.ok_2_class.ok_3_class.ok_4_class";
 
   reports:
-  "'${result.file_1}'";
+      "'${result.file_1}'";
+    !ok_1::
+      "Issue in 1";
+    !ok_2::
+      "Issue in 2";
+    !ok_3::
+      "Issue in 3";
+    !ok_4::
+      "Issue in 4";
     ok::
       "$(this.promise_filename) Pass";
     !ok::

tests/acceptance/30_generic_methods/unsafe/service_started_start.cf

@@ -47,7 +47,7 @@ bundle agent test
 bundle agent check
 {
   vars:
-    "command_ps" string => "/bin/ps afux | /bin/grep ${init.service_name} | /bin/grep -v grep";
+    "command_ps" string => "/bin/ps afux | ${paths.path[grep]} ${init.service_name} | ${paths.path[grep]} -v grep";
 
   classes:
       "service_running" expression => returnszero("${command_ps}", "useshell"),

tests/acceptance/30_generic_methods/unsafe/user_create.cf

@@ -44,7 +44,7 @@ bundle agent check
 {
   vars:
     pass1::
-      "user_line" string => execresult("/bin/grep '^${init.user}:' /etc/passwd", "useshell");
+      "user_line" string => execresult("${paths.path[grep]} '^${init.user}:' /etc/passwd", "useshell");
 
   classes:
     pass1::
@@ -53,7 +53,7 @@ bundle agent check
       "ph1_ok" expression => "!user_create_${init.user}_kept.user_create_${init.user}_repaired.!user_create_${init.user}_error";
 
       "ok" expression => "user1_ok.ph1_ok";
-    
+
     any::
       "pass1" expression => "any";