Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Downgrade internal errors to reporter warnings in file/directory BiFs

Browse source 
This allows Zeek execution to continue gracefully in the presence of such
errors, particularly at zeek_init() time. Includes a tweak to expand the
bifs.directory_operations test to check continuation after errors.

Resolves #3595.
This commit is contained in:
Christian Kreibich 2025-02-05 17:36:02 -08:00
parent 4ee7bde05e
commit 1f3d13a371
4 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -42,6 +42,10 @@ Changed Functionality
Furthermore, the script now supports and logs IPv6 results. Furthermore, the script now supports and logs IPv6 results.
- The mkdir(), rmdir(), unlink(), and rename() functions now trigger reporter
warnings instead of builtin errors when hitting trouble. This allows Zeek to
continue gracefully in case of such problems, particularly during zeek_init().
Removed Functionality Removed Functionality
--------------------- ---------------------

12
src/zeek.bif
View file

@ -4494,8 +4494,7 @@ function mkdir%(f: string%): bool
&& S_ISDIR(filestat.st_mode) ) && S_ISDIR(filestat.st_mode) )
return zeek::val_mgr->True(); return zeek::val_mgr->True();
zeek::emit_builtin_error(zeek::util::fmt("cannot create directory '%s': %s", filename, zeek::reporter->Warning("cannot create directory '%s': %s", filename, strerror(error));
strerror(error)));
return zeek::val_mgr->False(); return zeek::val_mgr->False();
} }
else else
@ -4519,8 +4518,7 @@ function rmdir%(d: string%): bool
if ( rmdir(dirname) < 0 ) if ( rmdir(dirname) < 0 )
{ {
zeek::emit_builtin_error(zeek::util::fmt("cannot remove directory '%s': %s", dirname, zeek::reporter->Warning("cannot remove directory '%s': %s", dirname, strerror(errno));
strerror(errno)));
return zeek::val_mgr->False(); return zeek::val_mgr->False();
} }
else else
@ -4543,8 +4541,7 @@ function unlink%(f: string%): bool
if ( unlink(filename) < 0 ) if ( unlink(filename) < 0 )
{ {
zeek::emit_builtin_error(zeek::util::fmt("cannot unlink file '%s': %s", filename, zeek::reporter->Warning("cannot unlink file '%s': %s", filename, strerror(errno));
strerror(errno)));
return zeek::val_mgr->False(); return zeek::val_mgr->False();
} }
else else
@ -4569,8 +4566,7 @@ function rename%(src_f: string, dst_f: string%): bool
if ( rename(src_filename, dst_filename) < 0 ) if ( rename(src_filename, dst_filename) < 0 )
{ {
zeek::emit_builtin_error(zeek::util::fmt("cannot rename file '%s' to '%s': %s", src_filename, zeek::reporter->Warning("cannot rename file '%s' to '%s': %s", src_filename, dst_filename, strerror(errno));
dst_filename, strerror(errno)));
return zeek::val_mgr->False(); return zeek::val_mgr->False();
} }
else else

1
testing/btest/Baseline/bifs.directory_operations/out
View file

@ -9,3 +9,4 @@ F
F F
F F
F F
Shutting down.

10
testing/btest/bifs/directory_operations.zeek
View file

@ -4,7 +4,7 @@
event zeek_init() event zeek_init()
{ {
# Test succesful operations... # Test successful operations...
print mkdir("testdir"); print mkdir("testdir");
print mkdir("testdir"); print mkdir("testdir");
local a = open("testdir/testfile"); local a = open("testdir/testfile");
@ -14,7 +14,7 @@ event zeek_init()
print unlink("testdir2/testfile2"); print unlink("testdir2/testfile2");
print rmdir("testdir2"); print rmdir("testdir2");
# ... and failing ones.
print unlink("nonexisting"); print unlink("nonexisting");
print rename("a", "b"); print rename("a", "b");
print rmdir("nonexisting"); print rmdir("nonexisting");
@ -22,3 +22,9 @@ event zeek_init()
close(a); close(a);
print mkdir("testfile"); print mkdir("testfile");
} }
event zeek_done()
{
# Only reached when above failures don't cause Zeek to exit.
print "Shutting down.";
}