Skip to content

for #174... squash ln -sf into one event #212

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
petersilva wants to merge 3 commits into
base: development
Choose a base branch
from
Open

for #174... squash ln -sf into one event #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a088809
for #174... squash ln -sf into one event
petersilva Apr 17, 2025
0835332
update changelog for 3.25.03 (same code as 3.25.03rc3)
reidsunderland Apr 17, 2025
bd47625
increment dev version
reidsunderland Apr 17, 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
18 changes: 7 additions & 11 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@
metpx-sr3c (3.25.03rc3) unstable; urgency=medium
metpx-sr3c (3.25.05rc1) UNRELEASED; urgency=medium

* fix #208 directory removals with trailing slashes are not posted correctly
when using realpathAdjust
* nothing yet, incrementing changelog in dev branch

-- Reid Sunderland <reid.sunderland@ssc-spc.gc.ca> Wed, 02 Apr 2025 19:35:00 +0000
-- Reid Sunderland <reid.sunderland@ssc-spc.gc.ca> Thu, 17 Apr 2025 17:58:57 +0000

metpx-sr3c (3.25.03rc2) unstable; urgency=medium
metpx-sr3c (3.25.03) unstable; urgency=medium

* fix #208 directory removals with trailing slashes are not posted correctly
when using realpathAdjust
* fix #177 files written using redirection are not posted

-- Reid Sunderland <reid.sunderland@ssc-spc.gc.ca> Thu, 27 Mar 2025 21:32:06 +0000

metpx-sr3c (3.25.03rc1) unstable; urgency=medium

* fix #199 not posting when regex does not match
* fix #198 rm -rf make file remove events instead of directory ones.
* fix rmdir processing re-written, with API change to produce rmdir events
properly.
* fix shimdebug messaging priorities check was wrong.
* work on #196... core dumps occuring in process cleanup. not fixed.

-- peter <peter@bsqt.homeip.net> Fri, 14 Mar 2025 08:48:03 -0400
-- Reid Sunderland <reid.sunderland@ssc-spc.gc.ca> Thu, 17 Apr 2025 17:56:12 +0000

metpx-sr3c (3.24.12) unstable; urgency=medium

Expand Down
81 changes: 78 additions & 3 deletions libsr3shim.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ SR_POST_CONFIG -- environment variable to set configuration file name
void exit_cleanup_posts();
int exit_cleanup_posts_setup = 0;

int process_deferred_symlink(const char *source, const char* dest, bool is_rename);

void syscall_init();

int mypid = 0;
Expand Down Expand Up @@ -605,6 +607,8 @@ int truncate(const char *path, off_t length)
truncate_fn_ptr = (truncate_fn) dlsym(RTLD_NEXT, "truncate");
truncate_init_done = 1;
}
process_deferred_symlink(NULL,NULL,false);

status = truncate_fn_ptr(path, length);

if (shim_disabled)
Expand Down Expand Up @@ -637,6 +641,8 @@ int mkdir(const char *pathname, mode_t mode)
mkdir_fn_ptr = (mkdir_fn) dlsym(RTLD_NEXT, "mkdir");
mkdir_init_done = 1;
}
process_deferred_symlink(NULL,NULL,false);

status = mkdir_fn_ptr(pathname, mode);
if (shim_disabled)
return (status);
Expand Down Expand Up @@ -666,6 +672,8 @@ int mkdirat(int dirfd, const char *pathname, mode_t mode)
mkdirat_fn_ptr = (mkdirat_fn) dlsym(RTLD_NEXT, "mkdirat");
mkdirat_init_done = 1;
}
process_deferred_symlink(NULL,NULL,false);

status = mkdirat_fn_ptr(dirfd, pathname, mode);
if (shim_disabled)
return (status);
Expand Down Expand Up @@ -695,6 +703,8 @@ int rmdir(const char *pathname)
rmdir_fn_ptr = (rmdir_fn) dlsym(RTLD_NEXT, "rmdir");
rmdir_init_done = 1;
}
process_deferred_symlink(NULL,NULL,false);

status = rmdir_fn_ptr(pathname);
if (shim_disabled)
return (status);
Expand Down Expand Up @@ -727,6 +737,7 @@ int remove(const char *pathname)
remove_fn_ptr = (remove_fn) dlsym(RTLD_NEXT, "remove");
remove_init_done = 1;
}
process_deferred_symlink(NULL,NULL,false);

// before removing, need to know if pathname is a file or dir
// if stat fails, also assuming that pathname is not a dir
Expand Down Expand Up @@ -767,6 +778,8 @@ int symlink(const char *target, const char *linkpath)
symlink_fn_ptr = (symlink_fn) dlsym(RTLD_NEXT, "symlink");
symlink_init_done = 1;
}
process_deferred_symlink(NULL,NULL,false);

status = symlink_fn_ptr(target, linkpath);
if (shim_disabled)
return (status);
Expand All @@ -786,6 +799,40 @@ static int symlinkat_init_done = 0;
typedef int (*symlinkat_fn)(const char *, int, const char *);
static symlinkat_fn symlinkat_fn_ptr = symlinkat;

char *deferred_symlink_path = NULL;
int deferred_symlink_status = 0;



int process_deferred_symlink(const char *source, const char* dest, bool is_rename)
/*
* ln -sf A B -> ln -s A tmpname + mv tmpname B ... we want to squash those into just ln -s A B
* so save the last ln -s call, and if it is for tmpname, and the next rename is for tmpname, then
* great! just do a post of the dest.
* return 256+status if symlink with dest done, obviating need for rename.
*/
{
char *symlink_path;

if (!deferred_symlink_path) return(0);

symlink_path=deferred_symlink_path;
deferred_symlink_path=NULL;

if (is_rename && !strcmp(source,symlink_path)) {
/* just post the end result */
sr_shimdebug_msg(1, "smashed ln -sf to %s\n", dest);
shimpost(dest, 0, 0);
return(1);
} else {
/* post the original link */
sr_shimdebug_msg(1, "posting old ln -s to %s\n", symlink_path);
shimpost(symlink_path, 0, 0);
}
free(symlink_path);
return(0);
}

int symlinkat(const char *target, int dirfd, const char *linkpath)
{
int status;
Expand Down Expand Up @@ -813,8 +860,12 @@ int symlinkat(const char *target, int dirfd, const char *linkpath)
return (status);

if (dirfd == AT_FDCWD) {
sr_shimdebug_msg( 1, "symlinkat AT_FDCWD %s\n", linkpath );
clerror(status);
return (shimpost(linkpath, status, 0));
deferred_symlink_path=strdup(linkpath);
deferred_symlink_status=status;
return(status);
//return (shimpost(linkpath, status, 0));
}

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

sr_shimdebug_msg( 1, "symlinkat not AT_FDCWD %s\n", linkpath );
clerror(status);
return (shimpost(real_path, status, 0));
deferred_symlink_path=strdup(linkpath);
deferred_symlink_status=status;
return(status);
//return (shimpost(real_path, status, 0));

}

Expand All @@ -854,7 +909,8 @@ int unlinkat(int dirfd, const char *path, int flags)
setup_exit();
unlinkat_fn_ptr = (unlinkat_fn) dlsym(RTLD_NEXT, "unlinkat");
unlinkat_init_done = 1;
}
}
process_deferred_symlink(NULL,NULL,false);

stat_failed = fstatat(dirfd, path, &sb, 0);

Expand Down Expand Up @@ -904,6 +960,8 @@ int unlink(const char *path)
unlink_fn_ptr = (unlink_fn) dlsym(RTLD_NEXT, "unlink");
unlink_init_done = 1;
}
process_deferred_symlink(NULL,NULL,false);

status = unlink_fn_ptr(path);
if (shim_disabled)
return (status);
Expand Down Expand Up @@ -1060,6 +1118,9 @@ int renameorlink(int olddirfd, const char *oldpath, int newdirfd,
if (!srshim_connect())
return (status);

if (process_deferred_symlink(oldpath,newpath,true))
return(0);

sr_post_rename(sr_c, oreal_path, real_path, link);

clerror(status);
Expand Down Expand Up @@ -1087,6 +1148,7 @@ int dup2(int oldfd, int newfd)
dup2_init_done = 1;
srshim_initialize("shim");
}
process_deferred_symlink(NULL,NULL,false);

errno = 0;

Expand Down Expand Up @@ -1175,6 +1237,7 @@ int dup3(int oldfd, int newfd, int flags)
errno = 0;
return dup3_fn_ptr(oldfd, newfd, flags);
}
process_deferred_symlink(NULL,NULL,false);

fdstat = fcntl(newfd, F_GETFL);

Expand Down Expand Up @@ -1256,6 +1319,8 @@ void exit_cleanup_posts()

exit_cleanup_posts_ran = 1;

process_deferred_symlink(NULL,NULL,false);

sr_shimdebug_msg(4, "exit_cleanup_posts, scan /proc/self/fd\n");
// In the current process, find files which are not opened by the parent
// that need posting.
Expand Down Expand Up @@ -1407,6 +1472,8 @@ void exit(int status)
if (exit_cleanup_posts_ran)
_exit(status);

process_deferred_symlink(NULL,NULL,false);

exit_fn_ptr = (exit_fn) dlsym(RTLD_NEXT, "exit");

exit_cleanup_posts();
Expand All @@ -1428,9 +1495,11 @@ void exit_group(int status)

exit_group_fn_ptr = (exit_fn) dlsym(RTLD_NEXT, "exit_group");


if (!getenv("SR_POST_CONFIG") || shim_disabled)
exit_group_fn_ptr(status);

process_deferred_symlink(NULL,NULL,false);
exit_cleanup_posts();

// do it for real.
Expand Down Expand Up @@ -1504,6 +1573,8 @@ ssize_t sendfile(int out_fd, int in_fd, off_t * offset, size_t count)
if (shim_disabled)
return (status);

process_deferred_symlink(NULL,NULL,false);

snprintf(fdpath, 32, "/proc/self/fd/%d", out_fd);
real_return = realpath(fdpath, real_path);

Expand Down Expand Up @@ -1545,6 +1616,7 @@ int close(int fd)
sr_shimdebug_msg(8, " close fd=%d shim_disabled, passing to built-in.\n", fd);
return close_fn_ptr(fd);
}
process_deferred_symlink(NULL,NULL,false);
fdstat = fcntl(fd, F_GETFL);

if (fdstat == -1) {
Expand Down Expand Up @@ -1625,6 +1697,7 @@ int fclose(FILE * f)
if (shim_disabled)
return fclose_fn_ptr(f);

process_deferred_symlink(NULL,NULL,false);
fd = fileno(f);
if (fd == -1) {
clerror(fd);
Expand Down Expand Up @@ -1706,6 +1779,7 @@ FILE *fopen(const char *pathname, const char *mode)
setup_exit();
}
sr_shimdebug_msg(2, "fopen %s %s\n", pathname, mode);
process_deferred_symlink(NULL,NULL,false);

return (fopen_fn_ptr(pathname, mode));
}
Expand All @@ -1721,6 +1795,7 @@ long int syscall(long int __sysno, ...)
if (!syscall_init_done) {
syscall_init();
}
process_deferred_symlink(NULL,NULL,false);

// start of file/directory related syscalls that we need to intercept and post a message for

Expand Down