Skip to content

CFE-4621: Fix owner on file creation with content attribute #5996

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
btriller wants to merge 1 commit into
base: 3.24.x
Choose a base branch
from
+72 −2
Open

CFE-4621: Fix owner on file creation with content attribute #5996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions cf-agent/verify_files.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,8 +577,6 @@ static PromiseResult VerifyFilePromise(EvalContext *ctx, char *path, const Promi

PromiseResult render_result = WriteContentFromString(ctx, path, &a, pp);
result = PromiseResultUpdate(result, render_result);

goto exit;
}

/* Phase 3b - content editing */
Expand Down
72 changes: 72 additions & 0 deletions tests/acceptance/10_files/01_create/013.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
#######################################################
#
# Create a file with content attribute and owner via perms,
# but witout create attribute, check owner
#
#######################################################

body common control
{
inputs => { "../../default.cf.sub" };
bundlesequence => { default("$(this.promise_filename)") };
version => "1.0";
}

#######################################################

bundle agent init
{
files:
"$(G.testfile)"
delete => init_delete;
}

body delete init_delete
{
dirlinks => "delete";
rmdirs => "true";
}

#######################################################

bundle agent test
{
vars:
"owner" string => "sys";

files:
"$(G.testfile)"
content => "",
perms => test_perms($(owner));
}

body perms test_perms(o)
{
rxdirs => "false";
mode => "644";
owners => { "$(o)" };
groups => { "0" };
}

#######################################################

bundle agent check
{
vars:
"ui" data => getuserinfo(filestat($(G.testfile), "uid"));

classes:
"not_ok" not => strcmp($(test.owner), $(ui[username]));

reports:
DEBUG::
"expected: username = '$(test.owner)'";
"got: username = '$(ui[username])'";
!not_ok::
"$(this.promise_filename) Pass";
not_ok::
"$(this.promise_filename) FAIL";
}

### PROJECT_ID: core
### CATEGORY_ID: 27
Loading