tinythings · isbm · Dec 10, 2024 · Dec 7, 2024 · Dec 7, 2024 · Dec 7, 2024
diff --git a/docs/genusage/targeting.rst b/docs/genusage/targeting.rst
@@ -47,12 +47,12 @@ in the following format:
 .. code-block:: text
     :caption: Precise model query synopsis
 
-    "model://<model>/[entity]/[state] [traits query]"
+    "/<model>/[entity]/[state] [traits query]"
 
 .. code-block:: text
     :caption: Checkbook model query synopsis
 
-    "model://<model>/[entity]:[checkbook labels]"
+    "/<model>/[entity]:[checkbook labels]"
 
 Since there can be many models, it is essential to select one, therefore a model Id is
 always required. If ``entity`` and/or ``state`` are not specified, they are defaulted to
@@ -61,7 +61,7 @@ always required. If ``entity`` and/or ``state`` are not specified, they are defa
 .. code-block:: bash
     :caption: Example of Model targeting by precise query
 
-    sysinspect "model://router/network,devices/online"
+    sysinspect "/router/network,devices/online"
 
 In the example above, a network is verified in a router only when it supposed to be online.
 Under the hood, omitted parts are translated to "all" (``$``). E.g. ``router/network`` is
@@ -74,11 +74,16 @@ values and logical operations. See :ref:`query_targeting` for more details.
 .. code-block:: bash
     :caption: Example of Model targeting by checkbook labels
 
-    sysinspect "model://router:network,devices"
+    sysinspect "/router:network,devices"
 
 The example above is the same as the previous one, except it is using Checkbook. Entities
 in the Checkbook are basically the top-high groups of other entities.
 
+.. hint::
+
+  Trailing slash in model specification path can be omitted: ``router/network/online`` would also working
+  the same way.
+
 Using Traits
 ------------
 

diff --git a/docs/global_config.rst b/docs/global_config.rst
@@ -161,15 +161,15 @@ Minion
 Sysinspect Minion configuration is located under earlier mentioned ``minion`` section,
 and contains the following directives:
 
-``root``
+``path.root``
 
     Typically, Minion if running standard, the root of all data kept by a Minion is
     defaulted to ``/etc/sysinspect``, same as Master. However, in an embedded and custom
     systems this might not be possible, especially if the system is usually read-only
     and writable directories are limited to only a few. In this case *root* must be
     set according to the system setup.
 
-``id.path``
+``path.id``
 
     By default, the minion Id is the ``/etc/machine-id``. However, this file is usually
     present on a regular Linux server and desktop distributions, but practically never
@@ -187,6 +187,11 @@ and contains the following directives:
 
         id.path: </absolute/path>|relative
 
+``path.sharelib``
+
+    The location of sharelib directory, which is by default is at the location
+    ``/usr/share/sysinspect``. On most embedded systems those root filesystem is usually read-only,
+    this location can be changed. This directory contains ``lib`` and ``modules`` subdirectories.
 
 
 ``master.ip``
@@ -195,7 +200,12 @@ and contains the following directives:
 
 ``master.port``
 
-    Corresponds to ``bind.ip.port`` of Master node and should be identical.
+    Corresponds to ``bind.ip.port`` of Master node and should be identical. By default it is
+    set to ``4200``.
+
+``master.fileserver.port``
+
+    Port of Master's fileserver. By default it is set to ``4201``.
 
 Example configuration for the Sysinspect Minion:
 

diff --git a/docs/modeldescr/overview.rst b/docs/modeldescr/overview.rst
@@ -6,8 +6,13 @@ Model Description
 
 .. _model_description:
 
-The Model is essentially a configuration of a system. It is written in YAML format,
-and it is following a specific expression schema and logic.
+The Model is essentially a configuration of a system. It serves two purposes:
+
+- An assertion verification about system integrity (information only)
+- A state enforcement as a configuration management system does
+
+
+The Aodel is written in YAML format, and it is following a specific expression schema and logic.
 
 This document explains each part of the Model Description.
 

diff --git a/docs/modeldescr/states.rst b/docs/modeldescr/states.rst
@@ -54,4 +54,4 @@ is passed, then default state is selected:
 
 .. code-block:: text
 
-    syspect --model ./my_model --states=online,active
+    sysinspect --model ./my_model --states=online,active
diff --git a/examples/models/inherited/evt.cfg b/examples/models/inherited/evt.cfg
@@ -1,19 +1,44 @@
 constraints:
   addresses-verification:
     descr: Addresses verification
+    entities:
+      - addresses
     all:
       interfaces:
         - fact: if-up.virbr1.port
           equals: static(entities.addresses.claims.interfaces.virtual.port)
 
+        - fact: if-up.virbr1.port
+          event: log
+
+  python-module-tests:
+    descr: Python module tests
+    entities:
+      - addresses
+    all:
+      interfaces:
+        - fact: uid
+          #equals:
+          #static(entities.addresses.claims.interfaces.ansible.not_changed)
+          equals: 1000
+    any:
+      interfaces:
+        - fact: changed
+          #equals: false
+          event: log
+
 actions:
   python-module-tests:
     descr: Check if python module works at all
-    module: file.conf
+    module: cfg.bridge
     bind:
       - addresses
 
     state:
       interfaces:
         opts:
+          - copy
         args:
+          src: /etc/networks
+          dest: /tmp/networks.copy
+          mode: 0400
diff --git a/examples/models/router/entities/ports.cfg b/examples/models/router/entities/ports.cfg
@@ -52,6 +52,8 @@ entities:
       # Fact label. It is referred
       # by a constraint, if needed
       interfaces:
+        - ansible:
+            not_changed: false
         - virtual:
             if: virbr1
             mac: "52:54:00:36:8D:71"

diff --git a/examples/models/router/events/events-config.cfg b/examples/models/router/events/events-config.cfg
@@ -28,3 +28,10 @@ events:
       - console-logger
     console-logger:
       prefix: Asset Verification Error
+
+  log:
+    handler:
+      - console-logger
+    console-logger:
+      concise: false
+      prefix: Configuration Management Results
diff --git a/examples/models/router/relations/basic.cfg b/examples/models/router/relations/basic.cfg
@@ -15,7 +15,7 @@ relations:
     interfaces:
       requires:
         - addresses
-        - routes
+        #- routes
 
     # State
     $:

diff --git a/libsysinspect/src/inspector.rs b/libsysinspect/src/inspector.rs
@@ -79,12 +79,12 @@ impl SysInspectRunner {
                                         }
                                     }
                                 }
-                                evtproc.process();
                             }
                             Err(err) => {
                                 log::error!("{}", err);
                             }
                         }
+                        evtproc.process();
                     }
                     Err(err) => log::error!("{err}"),
                 }

diff --git a/libsysinspect/src/intp/actproc/modfinder.rs b/libsysinspect/src/intp/actproc/modfinder.rs
@@ -3,7 +3,7 @@ use crate::{
     cfg::mmconf::{DEFAULT_MODULES_DIR, DEFAULT_PYLIB_DIR},
     intp::{
         actproc::response::ConstraintFailure,
-        constraints::{Constraint, ConstraintKind},
+        constraints::{Constraint, ConstraintKind, ExprRes},
         functions,
         inspector::get_cfg_sharelib,
     },
@@ -114,15 +114,23 @@ impl ModCall {
     }
 
     /// All expressions must be true
-    fn eval_cst_all(&self, cstr: &Constraint, resp: &ActionModResponse) -> (Option<bool>, Option<Vec<String>>) {
+    fn eval_cst_all(&self, cstr: &Constraint, resp: &ActionModResponse) -> (Option<bool>, Option<Vec<String>>, Vec<ExprRes>) {
+        let mut er: Vec<ExprRes> = Vec::new();
         let exp = cstr.all(self.state());
         if exp.is_empty() {
-            return (None, None);
+            return (None, None, er);
         }
 
         for exp in exp {
             let fact = functions::get_by_namespace(resp.data(), &exp.get_fact_namespace());
             let res = exp.eval(fact.to_owned());
+            er.push(res.to_owned());
+
+            // Skip infos
+            if res.is_info() {
+                continue;
+            }
+
             if !res.is_positive() {
                 let mut traces: Vec<String> = vec![format!(
                     "{} fact {}{}",
@@ -131,61 +139,78 @@ impl ModCall {
                     dataconv::to_string(fact).unwrap_or_default()
                 )];
                 traces.extend(res.traces().to_owned());
-                return (Some(false), Some(traces));
+                return (Some(false), Some(traces), er);
             }
         }
 
-        (Some(true), None)
+        (None, Some(vec![]), er)
     }
 
     /// At least one of the expressions must be true
-    fn eval_cst_any(&self, cstr: &Constraint, resp: &ActionModResponse) -> (Option<bool>, Option<Vec<String>>) {
+    fn eval_cst_any(&self, cstr: &Constraint, resp: &ActionModResponse) -> (Option<bool>, Option<Vec<String>>, Vec<ExprRes>) {
+        let mut er: Vec<ExprRes> = Vec::new();
         let exp = cstr.any(self.state());
         if exp.is_empty() {
-            return (None, None);
+            return (None, None, er);
         }
 
         let mut traces: Vec<String> = vec![];
         for exp in exp {
             let res = exp.eval(functions::get_by_namespace(resp.data(), &exp.get_fact_namespace()));
+            er.push(res.to_owned());
+
+            // Skip infos
+            if res.is_info() {
+                continue;
+            }
+
             if res.is_positive() {
-                return (Some(true), None);
+                return (Some(true), None, er);
             }
             traces.extend(res.traces().to_owned());
         }
 
-        (Some(false), Some(traces))
+        (None, Some(traces), er)
     }
 
     /// None of expressions should be true. It is basically !all.
-    fn eval_cst_none(&self, cstr: &Constraint, resp: &ActionModResponse) -> (Option<bool>, Option<Vec<String>>) {
+    fn eval_cst_none(&self, cstr: &Constraint, resp: &ActionModResponse) -> (Option<bool>, Option<Vec<String>>, Vec<ExprRes>) {
+        let mut er: Vec<ExprRes> = Vec::new();
         let exp = cstr.none(self.state());
         if exp.is_empty() {
-            return (None, None);
+            return (None, None, er);
         }
 
         for e in exp {
             let fact = functions::get_by_namespace(resp.data(), &e.get_fact_namespace());
             let res = e.eval(fact.to_owned());
+            er.push(res.to_owned());
+
+            // SKip infos
+            if res.is_info() {
+                continue;
+            }
+
             if res.is_positive() {
                 let mut traces: Vec<String> =
                     vec![format!("{} fails with {}", &e.get_fact_namespace(), dataconv::to_string(fact).unwrap_or_default())];
                 traces.extend(res.traces().to_owned());
-                return (Some(false), Some(traces));
+                return (Some(false), Some(traces), er);
             }
         }
 
-        (Some(true), None)
+        (None, None, er)
     }
 
     /// Evaluate constraints
     fn eval_constraints(&self, ar: &ActionModResponse) -> ConstraintResponse {
         fn eval<F>(
             mc: &ModCall, cret: &mut ConstraintResponse, c: &Constraint, kind: ConstraintKind, eval_fn: F, ar: &ActionModResponse,
         ) where
-            F: Fn(&ModCall, &Constraint, &ActionModResponse) -> (Option<bool>, Option<Vec<String>>),
+            F: Fn(&ModCall, &Constraint, &ActionModResponse) -> (Option<bool>, Option<Vec<String>>, Vec<ExprRes>),
         {
-            let (res, msgs) = eval_fn(mc, c, ar);
+            let (res, msgs, expr) = eval_fn(mc, c, ar);
+            cret.set_eval_results(expr);
             if let Some(res) = res {
                 if !res {
                     cret.add_failure(ConstraintFailure::new(c.descr(), msgs.unwrap_or(vec![]).join(" - "), kind.clone()));
Original file line number	Diff line number	Diff line change
Expand Up		@@ -54,4 +54,4 @@ is passed, then default state is selected:

		.. code-block:: text

		syspect --model ./my_model --states=online,active
		sysinspect --model ./my_model --states=online,active