Fixes #16518: Missing report on "Synchronize files" on simple relays when shared-files are empty

.gitignore

@@ -1 +1,5 @@
 scripts/technique-files
+rudder-templates-cli.jar
+initial-promises/
+bootstrap-promises/promises.cf
+bootstrap-promises/rudder.json

Makefile

@@ -1,21 +1,3 @@
-#####################################################################################
-# Copyright 2016 Normation SAS
-#####################################################################################
-#
-# 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, Version 3.
-#
-# 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, see <http://www.gnu.org/licenses/>.
-#
-#####################################################################################
-
 # Autodetect wget or curl or curl usage and proxy configuration
 PROXY_ENV = $(if $(PROXY), http_proxy=$(PROXY) ftp_proxy=$(PROXY))
 WGET = wget -q -O
@@ -31,7 +13,11 @@ GET = $(PROXY_ENV) $(WGET)
 endif
 endif
 
-all: rudder-templates-cli.jar test
+
+all: initial-promises bootstrap-promises/rudder.json bootstrap-promises/promises.cf
+
+initial-promises: rudder-templates-cli.jar test
+
 	# The common technique
 	sed -i -e 's/.*TRACKINGKEY.*/  "TRACKINGKEY": "hasPolicyServer-root@@common-root@@00",/' variables.json
 	java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/common/1.0/ techniques/system/common/1.0/*.st
@@ -46,8 +32,6 @@ all: rudder-templates-cli.jar test
 	cp techniques/system/common/1.0/rudder-agent-nova-cron initial-promises/node-server/common/cron/
 	mv initial-promises/node-server/common/1.0/run_interval.cf initial-promises/node-server/run_interval
 	mkdir -p initial-promises/node-server/common/utilities
-	cp techniques/system/common/1.0/minicurl initial-promises/node-server/common/utilities/
-	chmod +x initial-promises/node-server/common/utilities/minicurl
 	# The inventory technique
 	sed -i -e 's/.*TRACKINGKEY.*/  "TRACKINGKEY": "inventory-all@@inventory-all@@00",/' variables.json
 	java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/inventory/1.0/ techniques/system/inventory/1.0/*.st
@@ -58,14 +42,14 @@ all: rudder-templates-cli.jar test
 	java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/distributePolicy/1.0/ techniques/system/distributePolicy/1.0/*.st
 	cp techniques/system/distributePolicy/1.0/*.cf initial-promises/node-server/distributePolicy/1.0/ || true
 	mkdir -p initial-promises/node-server/distributePolicy/ncf
-	cp techniques/system/distributePolicy/1.0/rudder-ncf-conf initial-promises/node-server/distributePolicy/ncf/ncf.conf
 	mkdir -p initial-promises/node-server/distributePolicy/rsyslog.conf
 	mv initial-promises/node-server/distributePolicy/1.0/rudder-rsyslog-root.cf initial-promises/node-server/distributePolicy/rsyslog.conf/rudder-rsyslog-root.conf
 	mv initial-promises/node-server/distributePolicy/1.0/rudder-rsyslog-relay.cf initial-promises/node-server/distributePolicy/rsyslog.conf/rudder-rsyslog-relay.conf
 	# The server-roles technique
 	sed -i -e 's/.*TRACKINGKEY.*/  "TRACKINGKEY": "server-roles@@server-roles-directive@@0",/' variables.json
 	java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/server-roles/1.0/ techniques/system/server-roles/1.0/*.st
 	cp techniques/system/server-roles/1.0/*.cf initial-promises/node-server/server-roles/1.0/ || true
+	cp techniques/system/server-roles/1.0/relayd.conf.tpl initial-promises/node-server/server-roles/1.0/
 	mkdir -p initial-promises/node-server/server-roles/logrotate.conf/
 	cp techniques/system/server-roles/1.0/rudder-logrotate initial-promises/node-server/server-roles/logrotate.conf/rudder
 	mv initial-promises/node-server/server-roles/1.0/rudder-server-roles.cf initial-promises/node-server/rudder-server-roles.conf
@@ -74,8 +58,13 @@ all: rudder-templates-cli.jar test
 	# Initial ncf reporting empty (for compatibility with pre-4.3 servers)
 	touch initial-promises/rudder_expected_reports.csv
 	# Provide a default rudder.json
-	cp variables.json initial-promises/rudder.json
+	cp variables.json initial-promises/node-server/rudder.json
+
+bootstrap-promises/rudder.json:
+	cp variables.json $@
 
+bootstrap-promises/promises.cf:
+	cp bootstrap-promises/failsafe.cf bootstrap-promises/promises.cf
 
 rudder-templates-cli.jar:
 	$(GET) rudder-templates-cli.jar https://repository.rudder.io/build-dependencies/rudder-templates-cli/rudder-templates-cli.jar

README.adoc

@@ -0,0 +1,19 @@
+= Rudder: Continuous Auditing & Configuration
+
+This project is part of Rudder, see https://github.com/Normation/rudder[the main repository]
+for more information.
+
+== License
+
+This sub-project is licensed under GPLv3 license, 
+see the provided "LICENSE" file or 
+http://www.gnu.org/licenses/gpl-3.0.txt
+
+== Synopsis
+
+This repository contains the Techniques Library of Rudder.
+
+== Usage
+
+This project is part of Rudder, and as such is bundled with every Rudder server.
+

bootstrap-promises/failsafe.cf

@@ -0,0 +1,160 @@
+body common control
+{
+    bundlesequence   => { "update" };
+    output_prefix    => "rudder";
+    protocol_version => "2";
+    tls_min_version  => "1.2";
+}
+
+
+body server control
+{
+    # Listen on correct port from the beginning	
+    port => "5309";
+}
+
+# WARN: this bundle comes from update.cf
+bundle common server_info
+{
+  vars:
+      "policy_server_file"
+        string  => translatepath("${sys.workdir}/policy_server.dat"),
+        comment => "Path to file containing address to policy server";
+
+    #This part work, because for some reason, the evaluation converge in one pass, and allows to have
+    # the correct value in policy_server value. In verbose output, policy_server_file_exists is defined first
+    policy_server_file_exists::
+      "policy_server_temp" string => readfile("${policy_server_file}", 2048);
+       # trim space in policy_server.dat
+      "policy_server"      string => regex_replace("${policy_server_temp}", " ", "", "g");
+
+    !policy_server_file_exists::
+      # Use "" as default policy_server if no policy_server.dat exists
+      "policy_server" string => "";
+
+  classes:
+      "root_server"               expression => strcmp("root","${g.uuid}");
+      "policy_server_file_exists" expression => fileexists("${policy_server_file}");
+}
+
+bundle agent update
+{
+  vars:
+      "inputs"          string => "${sys.workdir}/inputs";
+      "policies"        string => "${sys.masterdir}";
+      "rudder_var"      string => "/var/rudder";
+      "ncf_common_src"  string => "/usr/share/ncf/tree";
+      "ncf_common"      string => "${rudder_var}/ncf/common";
+      "ncf_excludedreps" slist => { "50_techniques" };
+
+  files:
+      "/var/rudder/ncf/."
+        create  => "true",
+        comment => "Make sure the ncf directory exists";
+
+    root_server::
+      "${inputs}"
+        copy_from         => local("${policies}"),
+        depth_search      => recurse("inf"),
+        perms             => u_mog("600", "root", "0"),
+        action            => immediate,
+        move_obstructions => "true",
+        classes           => classes_generic("config");
+
+      "${ncf_common}"
+        copy_from         => local("${ncf_common_src}"),
+        depth_search      => recurse_ignore("inf", @{ncf_excludedreps}),
+        perms             => u_mog("644", "root", "0"),
+        action            => immediate,
+        move_obstructions => "true",
+        classes           => classes_generic("ncf_common");
+
+    !root_server::
+      "${inputs}"
+        copy_from         => remote("${server_info.policy_server}", "${policies}"),
+        depth_search      => recurse("inf"),
+        perms             => u_mog("600", "root", "0"),
+        action            => immediate,
+        move_obstructions => "true",
+        classes           => classes_generic("config");
+
+      "${ncf_common}"
+        copy_from         => remote("${server_info.policy_server}", "${ncf_common_src}"),
+        depth_search      => recurse_ignore("inf", @{ncf_excludedreps}),
+        perms             => u_mog("644", "root", "0"),
+        action            => immediate,
+        move_obstructions => "true",
+        classes           => classes_generic("ncf_common");
+
+  reports:
+    config_ok.ncf_common_ok::
+      "Initial policies have been successfully downloaded from the policy server"
+        action => immediate;
+
+    !(config_ok.ncf_common_ok)::
+      "*********************************************************************************
+* rudder-agent could not get an its configuration from the policy server.       *
+* This can be caused by:                                                        *
+*   * a networking issue                                                        *
+*   * an unavailable server                                                     *
+*   * if the node's IP in not if the allowed networks of its policy server.     *
+*********************************************************************************"
+        action => immediate;
+}
+
+body perms u_mog(mode,user,group)
+{
+    mode   => "${mode}";
+    owners => { "${user}" };
+    groups => { "${group}" };
+}
+
+body depth_search recurse(d)
+{
+    depth => "${d}";
+}
+
+body depth_search recurse_ignore(d,list)
+{
+        depth => "${d}";
+        exclude_dirs => { @{list} };
+}
+
+body action immediate
+{
+    ifelapsed => "0";
+}
+
+body classes classes_generic(x)
+{
+      promise_repaired => { "promise_repaired_$(x)", "$(x)_repaired", "$(x)_ok", "$(x)_reached", "$(x)_not_kept" };
+      repair_failed => { "repair_failed_$(x)", "$(x)_failed", "$(x)_not_ok", "$(x)_error", "$(x)_not_kept", "$(x)_not_repaired", "$(x)_reached" };
+      repair_denied => { "repair_denied_$(x)", "$(x)_denied", "$(x)_not_ok", "$(x)_error", "$(x)_not_kept", "$(x)_not_repaired", "$(x)_reached" };
+      repair_timeout => { "repair_timeout_$(x)", "$(x)_timeout", "$(x)_not_ok", "$(x)_error", "$(x)_not_kept", "$(x)_not_repaired", "$(x)_reached" };
+      promise_kept => { "promise_kept_$(x)", "$(x)_kept", "$(x)_ok", "$(x)_not_repaired", "$(x)_reached" };
+}
+
+body copy_from remote(server, path)
+{
+        servers    => {
+          "${server}"
+        };
+        trustkey    => "true";
+        source      => "${path}";
+        compare     => "digest";
+        preserve    => "false";
+        verify      => "true";
+        purge       => "true";
+        copy_backup => "false";
+        portnumber  => "5309";
+}
+
+body copy_from local(from)
+{
+        source      => "${from}";
+        copy_backup => "false";
+        preserve    => "false";
+        compare     => "digest";
+        purge       => "true";
+        portnumber  => "5309";
+}

maintained-techniques

@@ -29,7 +29,6 @@ system/common/1.0
 system/distributePolicy/1.0
 system/inventory/1.0
 system/server-roles/1.0
-systemSettings/misc/clockConfiguration/3.1
 systemSettings/misc/clockConfiguration/3.2
 systemSettings/misc/genericCommandVariableDefinition/3.0
 systemSettings/misc/genericVariableDefinition/2.0
@@ -41,7 +40,6 @@ systemSettings/misc/variableFromJsonFile/3.0
 systemSettings/networking/dnsConfiguration/3.0
 systemSettings/networking/hostsConfiguration/2.0
 systemSettings/networking/nfsClient/3.0
-systemSettings/networking/nfsServer/3.0
 systemSettings/networking/routingManagement/2.0
 systemSettings/process/servicesManagement/3.0
 systemSettings/process/services/1.1
@@ -56,7 +54,4 @@ systemSettings/systemManagement/motdConfiguration/3.2
 systemSettings/systemManagement/motdConfiguration/3.3
 systemSettings/userManagement/groupManagement/5.1
 systemSettings/userManagement/sudoParameters/3.2
-systemSettings/userManagement/userManagement/7.2
-systemSettings/userManagement/userManagement/8.0
-systemSettings/userManagement/userManagement/8.1
 systemSettings/userManagement/userManagement/9.0

techniques/applications/apacheReverseProxy/2.0/bodies.st

@@ -1,21 +1,3 @@
-#####################################################################################
-# Copyright 2011-2013 Normation SAS
-#####################################################################################
-#
-# 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, Version 3.
-#
-# 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, see <http://www.gnu.org/licenses/>.
-#
-#####################################################################################
-
 #
 # Configure the reverse proxy entries used by Apache.
 #