Skip to content
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

wip for #196 but also fixing #198 #201

Open
wants to merge 11 commits into
base: development
Choose a base branch
from
+119 −110
Open

wip for #196 but also fixing #198 #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5fc86ae
derive identity for files only.
petersilva Jan 21, 2025
1719b39
just_the_name was using null pointers
petersilva Jan 22, 2025
981ad16
there are more files to delete, shim_post_run should expect 6
petersilva Jan 22, 2025
3477381
modernized SSL EVP API calls.
petersilva Jan 22, 2025
688edcb
polarity of debug levels was wrong.
petersilva Jan 23, 2025
eb4cbd6
simpler init routine
petersilva Jan 23, 2025
49e2a14
free of a null point not needed
petersilva Jan 23, 2025
facec67
local abbreviation for overly complicated variable
petersilva Jan 24, 2025
94c5d11
rmdir processing with api flag instead of global var
petersilva Jan 25, 2025
adc46a2
correct rmdir event v03 output format
petersilva Jan 25, 2025
5d6a4ed
Merge branch 'development' into issue196
petersilva Feb 14, 2025
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
96 changes: 51 additions & 45 deletions libsr3shim.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,19 +104,19 @@ void sr_shimdebug_msg(int level, const char *format, ...)
clock_gettime(CLOCK_REALTIME, &ts);
srshim_debug_level = atoi(srdbgstr);
mypid = getpid();
fprintf(stderr, " startup ");
fprintf(stderr, "sr_shimdebug startup SR_SHIMDEBUG=%d\n", srshim_debug_level );
pid_seconds_wallclock = ts.tv_sec;

} else if (srshim_debug_level == -2)
return;

clock_gettime(CLOCK_REALTIME, &ts);

if (level & srshim_debug_level)
if ( (level & srshim_debug_level) == 0)
return;

fprintf(stderr, "SR_SHIMDEBUG %d %d %g ", level, mypid,
(ts.tv_sec + ts.tv_nsec / 1e9) - pid_seconds_wallclock);
(ts.tv_sec + ts.tv_nsec / 1e9) - pid_seconds_wallclock);

va_start(ap, format);
vfprintf(stderr, format, ap);
Expand Down Expand Up @@ -280,7 +280,7 @@ struct filename_memory (*remembered_filenames)[] = NULL;
int remembered_count = 0;
int remembered_max = 0;

int should_not_post(const char *fn)
int should_not_post(const char *fn, const int rmflags)
/*
given the file name fn, return(1) if we should not post it, 0 otherwise.

Expand Down Expand Up @@ -353,7 +353,8 @@ int should_not_post(const char *fn)
(*remembered_filenames)[remembered_count].ts = ts;
(*remembered_filenames)[remembered_count++].name = strdup(fn);

sr_shimdebug_msg(1, "remembering post of %s (count=%d) \n", fn, remembered_count);
sr_shimdebug_msg(1, "remembering post of %s (count=%d) \n",
fn, remembered_count );
return (0);

}
Expand Down Expand Up @@ -472,7 +473,7 @@ int srshim_connect()
return (sr_connected);
}

void srshim_realpost(const char *path)
void srshim_realpost(const char *path, const int rmflags)
/*
post using initialize sr_ context.

Expand All @@ -484,7 +485,7 @@ void srshim_realpost(const char *path)
char fn[PATH_MAX + 1];
char fnreal[PATH_MAX + 1];

sr_shimdebug_msg(1, "srshim_realpost 1 PATH %s src=%p\n", path, sr_c);
sr_shimdebug_msg(1, "srshim_realpost 1 PATH %s src=%p rmflags=%d\n", path, sr_c, rmflags);

if (!path || !sr_c)
return;
Expand Down Expand Up @@ -524,7 +525,7 @@ void srshim_realpost(const char *path)
}
sr_shimdebug_msg(1, "srshim_realpost accepted... %s now\n", fn);

if (should_not_post(fn)) {
if (should_not_post(fn,rmflags)) {
sr_shimdebug_msg(1, "srshim_realpost rejecting should_not_post... %s\n", fn);
return;
}
Expand All @@ -541,16 +542,16 @@ void srshim_realpost(const char *path)
sr_shimdebug_msg(1,
"srshim_realpost should be really posting %s remove now sr_c=%p\n",
path, sr_c);
sr_post(sr_c, path, NULL);
sr_post(sr_c, path, NULL, rmflags);
return;
}

sr_shimdebug_msg(1, "srshim_realpost 9 PATH %s\n", path);
sr_post(sr_c, path, &sb);
sr_post(sr_c, path, &sb, rmflags);

}

int shimpost(const char *path, int status)
int shimpost(const char *path, int status, const int rmflags)
{
char *cwd = NULL;
char *real_path = NULL;
Expand All @@ -569,7 +570,7 @@ int shimpost(const char *path, int status)

if (path[0] == '/') {
sr_shimdebug_msg(4, "absolute 1 shimpost %s, status=%d\n", path, status);
srshim_realpost(path);
srshim_realpost(path, rmflags);
} else {
cwd = get_current_dir_name();
real_path = (char *)malloc(strlen(cwd) + strlen(path) + 3);
Expand All @@ -579,7 +580,7 @@ int shimpost(const char *path, int status)
strcat(real_path, path);
sr_shimdebug_msg(4, "relative 2 shimpost %s status=%d\n", real_path,
status);
srshim_realpost(real_path);
srshim_realpost(real_path, rmflags);
free(real_path);
free(cwd);
}
Expand Down Expand Up @@ -618,7 +619,7 @@ int truncate(const char *path, off_t length)
if (!strncmp(path, "/proc/", 6))
return (status);
errno=0;
return (shimpost(path, status));
return (shimpost(path, status, 0));

}

Expand Down Expand Up @@ -648,7 +649,7 @@ int mkdir(const char *pathname, mode_t mode)
if (!strncmp(pathname, "/proc/", 6))
return (status);

return (shimpost(pathname, status));
return (shimpost(pathname, status, 0));
}

static int mkdirat_init_done = 0;
Expand Down Expand Up @@ -677,7 +678,7 @@ int mkdirat(int dirfd, const char *pathname, mode_t mode)
if (!strncmp(pathname, "/proc/", 6))
return (status);

return (shimpost(pathname, status));
return (shimpost(pathname, status, 0));
}

static int rmdir_init_done = 0;
Expand Down Expand Up @@ -706,8 +707,7 @@ int rmdir(const char *pathname)
if (!strncmp(pathname, "/proc/", 6))
return (status);

rmdir_in_progress = 1;
return (shimpost(pathname, status));
return (shimpost(pathname, status, 2));
}

static int remove_init_done = 0;
Expand Down Expand Up @@ -739,7 +739,7 @@ int remove(const char *pathname)
if (shim_disabled)
return (status);

sr_shimdebug_msg(1, " remove 2 %s status=%d\n", pathname, status);
sr_shimdebug_msg(1, " remove 2 %s status=%d isdir=%d\n", pathname, status, isdir);

clerror(status);
if (status == -1)
Expand All @@ -750,10 +750,7 @@ int remove(const char *pathname)
if (!strncmp(pathname, "/proc/", 6))
return (status);

if (isdir) {
rmdir_in_progress = 1;
}
return (shimpost(pathname, status));
return (shimpost(pathname, status, isdir?2:1));
}

static int symlink_init_done = 0;
Expand Down Expand Up @@ -782,7 +779,7 @@ int symlink(const char *target, const char *linkpath)
if (!strncmp(linkpath, "/proc/", 6))
return (status);

return (shimpost(linkpath, status));
return (shimpost(linkpath, status, 0));
}

static int symlinkat_init_done = 0;
Expand Down Expand Up @@ -817,7 +814,7 @@ int symlinkat(const char *target, int dirfd, const char *linkpath)

if (dirfd == AT_FDCWD) {
clerror(status);
return (shimpost(linkpath, status));
return (shimpost(linkpath, status, 0));
}

snprintf(fdpath, 32, "/proc/self/fd/%d", dirfd);
Expand All @@ -834,7 +831,7 @@ int symlinkat(const char *target, int dirfd, const char *linkpath)
strcat(real_path, linkpath);

clerror(status);
return (shimpost(real_path, status));
return (shimpost(real_path, status, 0));

}

Expand All @@ -850,6 +847,7 @@ int unlinkat(int dirfd, const char *path, int flags)
char fdpath[PATH_MAX + 1];
char real_path[PATH_MAX + 1];
char *real_return;
bool isdir = false;

sr_shimdebug_msg(1, "unlinkat %s dirfd=%i\n", path, dirfd);
if (!unlinkat_init_done) {
Expand All @@ -859,7 +857,13 @@ int unlinkat(int dirfd, const char *path, int flags)
}

stat_failed = fstatat(dirfd, path, &sb, 0);
sr_shimdebug_msg(1, "unlinkat %s dirfd=%i stat returned: %d\n", path, dirfd, stat_failed);

if (!stat_failed) {
isdir = S_ISDIR(sb.st_mode);
}

sr_shimdebug_msg(1, "unlinkat %s dirfd=%i stat returned: %d isdir: %d\n",
path, dirfd, stat_failed, isdir);

status = unlinkat_fn_ptr(dirfd, path, flags);
if (shim_disabled)
Expand All @@ -868,7 +872,7 @@ int unlinkat(int dirfd, const char *path, int flags)
return status;

if (dirfd == AT_FDCWD)
return (shimpost(path, status));
return (shimpost(path, status, 0));

snprintf(fdpath, 32, "/proc/self/fd/%d", dirfd);
real_return = realpath(fdpath, real_path);
Expand All @@ -881,9 +885,9 @@ int unlinkat(int dirfd, const char *path, int flags)
if (!real_return)
return (status);

sr_shimdebug_msg(1, " unlinkat realpath %s\n", real_path);
sr_shimdebug_msg(1, " unlinkat realpath %s, isdir=%d\n", real_path, isdir);

return (shimpost(real_path, status));
return (shimpost(real_path, status, isdir?2:1));
}

static int unlink_init_done = 0;
Expand Down Expand Up @@ -914,7 +918,7 @@ int unlink(const char *path)
return (status);
}

return (shimpost(path, status));
return (shimpost(path, status, 0));
}

static int link_init_done = 0;
Expand Down Expand Up @@ -1223,7 +1227,7 @@ int dup3(int oldfd, int newfd, int flags)
// because shimpost posts when: if (!status)
// we use a tmpstatus and call shimpost with status=0

shimpost(real_path, 0);
shimpost(real_path, 0, 0);

clerror(status);
return status;
Expand Down Expand Up @@ -1327,7 +1331,7 @@ void exit_cleanup_posts()

sr_shimdebug_msg(8, "exit_cleanup_posts posting %s\n", real_path);

shimpost(real_path, 0);
shimpost(real_path, 0, 0);
}
closedir(fddir);
}
Expand All @@ -1347,24 +1351,26 @@ void exit_cleanup_posts()
if (!srshim_connect())
continue;

sr_shimdebug_msg(8, "exit_cleanup_post, looking at: %s\n",
(*remembered_filenames)[i].name);
statres = lstat((*remembered_filenames)[i].name, &sb);
char *name = (*remembered_filenames)[i].name;

sr_shimdebug_msg(8, "exit_cleanup_post, looking at: %s\n", name);
statres = lstat(name, &sb);

sr_shimdebug_msg(8, "exit_cleanup_post, name: %s stat: %d\n", name, statres);

if (statres) {
sr_post(sr_c, (*remembered_filenames)[i].name, NULL);
sr_post(sr_c, name, NULL, 0);
} else {
if (S_ISLNK(sb.st_mode)) {
sr_shimdebug_msg(8, "exit_cleanup_post reading link: %s\n",
(*remembered_filenames)[i].name);
sr_shimdebug_msg(8, "exit_cleanup_post reading link: %s\n", name);
statres =
readlink((*remembered_filenames)[i].name, real_path, PATH_MAX);
readlink(name, real_path, PATH_MAX);
if (statres) {
real_path[statres] = '\0';
sr_post(sr_c, real_path, &sb);
sr_post(sr_c, real_path, &sb, 0);
}
}
sr_post(sr_c, (*remembered_filenames)[i].name, &sb);
sr_post(sr_c, name, &sb, 0);
}
}
sr_shimdebug_msg(1, "exit_cleanup_posting closing context sr_c=%p\n", sr_c);
Expand Down Expand Up @@ -1511,7 +1517,7 @@ ssize_t sendfile(int out_fd, int in_fd, off_t * offset, size_t count)
if (!strncmp(real_path, "/proc/", 6))
return (status);

shimpost(real_path, 0);
shimpost(real_path, 0, 0);

clerror(status);
return (status);
Expand Down Expand Up @@ -1591,7 +1597,7 @@ int close(int fd)
return (status);
}

return shimpost(real_path, status);
return shimpost(real_path, status, 0);
}

static int fclose_init_done = 0;
Expand Down Expand Up @@ -1679,7 +1685,7 @@ int fclose(FILE * f)
sr_shimdebug_msg(2, "fclose %p %s status=%d\n", f, real_path, status);

errno=saved_errno;
return shimpost(real_path, status);
return shimpost(real_path, status, 0);
}

static int fopen_init_done = 0;
Expand Down
6 changes: 3 additions & 3 deletions shim_post_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ mkdir sub_dir1
echo "#test 1 rename 050 rename directory"
mv sub_dir1 sub_dir2

echo "#test 1 rmdir 060 remove directory"
echo "#test 1 remove 060 remove directory"
rmdir sub_dir2


Expand Down Expand Up @@ -80,15 +80,15 @@ cp "dirone/filetwo copy with spaces in the name" "dirone/second spaced file"

echo "#test 1 rename 190 renaming subdirs should cause file rename events."
mv dirone dirthree
echo "#test 4 remove 200 removing a whole tree events."
echo "#test 6 remove 200 removing a whole tree events."
rm -rf dirthree
echo "#test 2 remove 210 removing two files"
rm hoho hoohoo

echo "#test 1 directory 220 make directory for remove test"
mkdir dir_to_remove1

echo "#test 1 rmdir 230 remove directory using remove"
echo "#test 1 remove 230 remove directory using remove"
./call_remove dir_to_remove1

echo "#test 1 sha512 240 make file for remove test"
Expand Down
8 changes: 4 additions & 4 deletions sr3_cpost.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ void do1file(struct sr_context *sr_c, char *fn)
}

if (lstat(fn, &sb) < 0) {
if (match_post) sr_post(sr_c, fn, NULL); /* post file remove */
if (match_post) sr_post(sr_c, fn, NULL, 1); /* post file remove */
return;
}

Expand All @@ -298,7 +298,7 @@ void do1file(struct sr_context *sr_c, char *fn)
if (!match_post) return;

//if (ts_newer( sb.st_mtim, latest_min_mtim ))
sr_post(sr_c, fn, &sb); // post the link itself.
sr_post(sr_c, fn, &sb, 0); // post the link itself.

/* FIXME: INOT - necessary? I think symlinks can be skipped?
*/
Expand All @@ -315,7 +315,7 @@ void do1file(struct sr_context *sr_c, char *fn)

} else if (S_ISDIR(sb.st_mode)) // process a directory.
{
if (match_post) sr_post(sr_c, fn, &sb); /* post mkdir */
if (match_post) sr_post(sr_c, fn, &sb, 0); /* post mkdir */

if (sr_c->cfg->debug)
sr_log_msg(sr_c->cfg->logctx,LOG_DEBUG,
Expand Down Expand Up @@ -371,7 +371,7 @@ void do1file(struct sr_context *sr_c, char *fn)

} else {
//if (ts_newer( sb.st_mtim, latest_min_mtim ))
if (match_post) sr_post(sr_c, fn, &sb); // process a file
if (match_post) sr_post(sr_c, fn, &sb, 0); // process a file
}

}
Expand Down
Loading