Skip to content

ENT-13303: Fixed booleans for classes in augments #6024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
victormlg wants to merge 4 commits into
base: master
Choose a base branch
from
+20 −4
Open

ENT-13303: Fixed booleans for classes in augments #6024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e59bc2
Fixed booleans for classes in augments
victormlg Jan 20, 2026
d455e4a
Added tests to augments classes from booleans
victormlg Jan 20, 2026
0788e19
Fixed incorrect logging
victormlg Jan 20, 2026
f670d8a
Removed redundant code
victormlg Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions libpromises/generic_agent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,8 @@ static bool LoadAugmentsData(EvalContext *ctx, const char *filename, const JsonE
if (!(StringEqual(key, "vars") ||
StringEqual(key, "classes") ||
StringEqual(key, "inputs") ||
StringEqual(key, "augments")))
StringEqual(key, "augments") ||
StringEqual(key, "variables")))
{
Log(LOG_LEVEL_VERBOSE, "Unknown augments key '%s' in file '%s', skipping it",
key, filename);
Expand Down Expand Up @@ -730,6 +731,10 @@ static bool LoadAugmentsData(EvalContext *ctx, const char *filename, const JsonE
EvalContextClassPutSoft(ctx, ckey, CONTEXT_SCOPE_NAMESPACE, default_tags);
}
}
else if (StringEqual(check, "true"))
{
EvalContextClassPutSoft(ctx, ckey, CONTEXT_SCOPE_NAMESPACE, default_tags);
}
free(check);
}
else if (JsonGetElementType(data) == JSON_ELEMENT_TYPE_CONTAINER &&
Expand All @@ -753,6 +758,10 @@ static bool LoadAugmentsData(EvalContext *ctx, const char *filename, const JsonE
free(check);
break;
}
else if (StringEqual(check, "true"))
{
EvalContextClassPutSoft(ctx, ckey, CONTEXT_SCOPE_NAMESPACE, default_tags);
}

free(check);
}
Expand Down Expand Up @@ -790,6 +799,11 @@ static bool LoadAugmentsData(EvalContext *ctx, const char *filename, const JsonE
installed = EvalContextClassPutSoftTagsSetWithComment(ctx, ckey, CONTEXT_SCOPE_NAMESPACE,
tags, comment);
}
else if (StringEqual(check, "true"))
{
installed = EvalContextClassPutSoftTagsSetWithComment(ctx, ckey, CONTEXT_SCOPE_NAMESPACE,
tags, comment);
}
free(check);
break;
}
Expand Down Expand Up @@ -1590,8 +1604,6 @@ void GenericAgentInitialize(EvalContext *ctx, GenericAgentConfig *config)
OpenLog(default_facility);
SetSyslogFacility(default_facility);

EvalContextClassPutHard(ctx, "any", "source=agent");
Copy link
Contributor

@larsewi larsewi Jan 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please explain why this is redundant in the commit message. It's not clear from looking at the diff.

Copy link
Contributor Author

@victormlg victormlg Jan 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The hard class is already defined in DetectEnvironment so It feels redundant to define in generic_agent.c as well. Also sysinfo.c is where most hard class and special vars are defined already

Copy link
Contributor

@larsewi larsewi Jan 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant please explain why this is redundant in the commit message for the sake of the commit history.


GenericAgentAddEditionClasses(ctx); // May set "enterprise_edition" class

const Class *enterprise_edition = EvalContextClassGet(ctx, "default", "enterprise_edition");
Expand Down
2 changes: 2 additions & 0 deletions tests/acceptance/00_basics/def.json/class_from_classexpression.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ bundle agent main
"augments_class_from_classexpression_not",
"augments_class_from_classexpression_or",
"augments_class_from_classexpression_complex",
"augments_class_from_true",
not("augments_class_from_false")
};


Expand Down
4 changes: 3 additions & 1 deletion tests/acceptance/00_basics/def.json/class_from_classexpression.cf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
"augments_class_from_classexpression_and": [ "cfengine.cfengine_3::" ],
"augments_class_from_classexpression_not": [ "!MISSING::" ],
"augments_class_from_classexpression_or": [ "cfengine|cfengine_3::" ],
"augments_class_from_classexpression_complex": [ "(cfengine|cfengine_3).!MISSING::" ]
"augments_class_from_classexpression_complex": [ "(cfengine|cfengine_3).!MISSING::" ],
"augments_class_from_true": [ true ],
"augments_class_from_false": [ false ]
}
}
Loading