mirror of
https://github.com/zeek/zeek.git
synced 2025-10-09 18:18:19 +00:00
make reading from stdout and stderr simultaneously work.
Needs a few test-cases - but seems ok...
This commit is contained in:
Bernhard Amann
parent
3aeec7ec14
commit
6fef99ee03
4 changed files with 274 additions and 26 deletions
|
|
@ -44,6 +44,7 @@ Raw::Raw(ReaderFrontend *frontend) : ReaderBackend(frontend)
|
|||
childpid = -1;
|
||||
|
||||
stdin_towrite = 0; // by default do not open stdin
|
||||
use_stderr = false;
|
||||
}
|
||||
|
||||
Raw::~Raw()
|
||||
|
|
@ -89,6 +90,12 @@ bool Raw::Execute()
|
|||
dup2(pipes[stdin_in], stdin_fileno);
|
||||
}
|
||||
|
||||
if ( use_stderr )
|
||||
{
|
||||
close(pipes[stderr_in]);
|
||||
dup2(pipes[stderr_out], stderr_fileno);
|
||||
}
|
||||
|
||||
//execv("/usr/bin/uname",test);
|
||||
execl("/bin/sh", "sh", "-c", fname.c_str(), NULL);
|
||||
fprintf(stderr, "Exec failed :(......\n");
|
||||
|
|
@ -107,13 +114,22 @@ bool Raw::Execute()
|
|||
close(pipes[stdin_in]);
|
||||
fcntl(pipes[stdin_out], F_SETFL, O_NONBLOCK);
|
||||
}
|
||||
|
||||
if ( use_stderr )
|
||||
{
|
||||
close(pipes[stderr_out]);
|
||||
fcntl(pipes[stderr_in], F_SETFL, O_NONBLOCK);
|
||||
}
|
||||
|
||||
file = fdopen(pipes[stdout_in], "r");
|
||||
if ( file == 0 )
|
||||
stderrfile = fdopen(pipes[stderr_in], "r");
|
||||
if ( file == 0 || (stderrfile == 0 && use_stderr) )
|
||||
{
|
||||
Error("Could not convert fileno to file");
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
@ -172,7 +188,17 @@ bool Raw::DoInit(const ReaderInfo& info, int num_fields, const Field* const* fie
|
|||
mtime = 0;
|
||||
execute = false;
|
||||
firstrun = true;
|
||||
int want_fields = 1;
|
||||
bool result;
|
||||
|
||||
// do Initialization
|
||||
string source = string(info.source);
|
||||
char last = info.source[source.length() - 1];
|
||||
if ( last == '|' )
|
||||
{
|
||||
execute = true;
|
||||
fname = source.substr(0, fname.length() - 1);
|
||||
}
|
||||
|
||||
if ( ! info.source || strlen(info.source) == 0 )
|
||||
{
|
||||
|
|
@ -186,38 +212,35 @@ bool Raw::DoInit(const ReaderInfo& info, int num_fields, const Field* const* fie
|
|||
stdin_string = it->second;
|
||||
stdin_towrite = stdin_string.length();
|
||||
}
|
||||
|
||||
if ( num_fields != 1 )
|
||||
|
||||
it = info.config.find("read_stderr"); // we want to read stderr
|
||||
if ( it != info.config.end() && execute )
|
||||
{
|
||||
Error("Filter for raw reader contains more than one field. "
|
||||
"Filters for the raw reader may only contain exactly one string field. "
|
||||
"Filter ignored.");
|
||||
use_stderr = true;
|
||||
want_fields = 2;
|
||||
}
|
||||
|
||||
if ( num_fields != want_fields )
|
||||
{
|
||||
Error(Fmt("Filter for raw reader contains wrong number of fields -- got %d, expected %d. "
|
||||
"Filters for the raw reader contain one field when used in normal mode and 2 fields when using execute mode with stderr capuring. "
|
||||
"Filter ignored.", num_fields, want_fields));
|
||||
return false;
|
||||
}
|
||||
|
||||
if ( fields[0]->type != TYPE_STRING )
|
||||
{
|
||||
Error("Filter for raw reader contains a field that is not of type string.");
|
||||
Error("First field for raw reader always has to be of type string.");
|
||||
return false;
|
||||
}
|
||||
|
||||
// do Initialization
|
||||
string source = string(info.source);
|
||||
char last = info.source[source.length() - 1];
|
||||
if ( last == '|' )
|
||||
if ( use_stderr && fields[1]->type != TYPE_BOOL )
|
||||
{
|
||||
execute = true;
|
||||
fname = source.substr(0, fname.length() - 1);
|
||||
|
||||
result = OpenInput();
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
execute = false;
|
||||
result = OpenInput();
|
||||
Error("Second field for raw reader always has to be of type bool.");
|
||||
}
|
||||
|
||||
|
||||
result = OpenInput();
|
||||
|
||||
if ( result == false )
|
||||
return result;
|
||||
|
||||
|
|
@ -329,7 +352,6 @@ void Raw::WriteToStdin()
|
|||
}
|
||||
|
||||
if ( stdin_towrite == 0 ) // send EOF when we are done.
|
||||
printf("Closing %d\n", pipes[stdin_out]);
|
||||
close(pipes[stdin_out]);
|
||||
}
|
||||
|
||||
|
|
@ -383,14 +405,14 @@ bool Raw::DoUpdate()
|
|||
}
|
||||
|
||||
string line;
|
||||
assert (NumFields() == 1);
|
||||
assert ( (NumFields() == 1 && !use_stderr) || (NumFields() == 2 && use_stderr));
|
||||
for ( ;; )
|
||||
{
|
||||
if ( stdin_towrite > 0 )
|
||||
WriteToStdin();
|
||||
|
||||
int64_t length = GetLine(file);
|
||||
//printf("Read %lld bytes\n", length);
|
||||
printf("Read %lld bytes\n", length);
|
||||
|
||||
if ( length == -3 )
|
||||
return false;
|
||||
|
|
@ -398,7 +420,7 @@ bool Raw::DoUpdate()
|
|||
// no data ready or eof
|
||||
break;
|
||||
|
||||
Value** fields = new Value*[1];
|
||||
Value** fields = new Value*[2]; // just always reserve 2. This means that our [] is too long by a count of 1 if not using stderr. But who cares...
|
||||
|
||||
// filter has exactly one text field. convert to it.
|
||||
Value* val = new Value(TYPE_STRING, true);
|
||||
|
|
@ -406,11 +428,42 @@ bool Raw::DoUpdate()
|
|||
val->val.string_val.length = length;
|
||||
fields[0] = val;
|
||||
|
||||
if ( use_stderr )
|
||||
{
|
||||
Value* bval = new Value(TYPE_BOOL, true);
|
||||
bval->val.int_val = 0;
|
||||
fields[1] = bval;
|
||||
}
|
||||
|
||||
Put(fields);
|
||||
|
||||
outbuf = 0;
|
||||
}
|
||||
|
||||
if ( use_stderr )
|
||||
for ( ;; )
|
||||
{
|
||||
int64_t length = GetLine(stderrfile);
|
||||
printf("Read stderr %lld bytes\n", length);
|
||||
if ( length == -3 )
|
||||
return false;
|
||||
else if ( length == -2 || length == -1 )
|
||||
break;
|
||||
|
||||
Value** fields = new Value*[2];
|
||||
Value* val = new Value(TYPE_STRING, true);
|
||||
val->val.string_val.data = outbuf;
|
||||
val->val.string_val.length = length;
|
||||
fields[0] = val;
|
||||
Value* bval = new Value(TYPE_BOOL, true);
|
||||
bval->val.int_val = 1; // yes, we are stderr
|
||||
fields[1] = bval;
|
||||
|
||||
Put(fields);
|
||||
|
||||
outbuf = 0;
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
Debug(DBG_INPUT, "DoUpdate finished successfully");
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ private:
|
|||
|
||||
string fname; // Source with a potential "|" removed.
|
||||
FILE* file;
|
||||
FILE* stderrfile;
|
||||
bool execute;
|
||||
bool firstrun;
|
||||
time_t mtime;
|
||||
|
|
@ -55,6 +56,8 @@ private:
|
|||
string stdin_string;
|
||||
uint64_t stdin_towrite;
|
||||
|
||||
bool use_stderr;
|
||||
|
||||
int pipes[6];
|
||||
pid_t childpid;
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,148 @@
|
|||
[source=ls .. ../nonexistant ../nonexistant2 ../nonexistant3 |, reader=Input::READER_RAW, mode=Input::MANUAL, name=input, fields=<no value description>, want_record=F, ev=line
|
||||
{
|
||||
print A::outfile, A::description;
|
||||
print A::outfile, A::tpe;
|
||||
print A::outfile, A::s;
|
||||
print A::outfile, A::is_stderr;
|
||||
A::try = A::try + 1;
|
||||
if (7 == A::try)
|
||||
{
|
||||
print A::outfile, done;
|
||||
close(A::outfile);
|
||||
Input::remove(input);
|
||||
terminate();
|
||||
}
|
||||
|
||||
}, config={
|
||||
[read_stderr] = 1
|
||||
}]
|
||||
Input::EVENT_NEW
|
||||
..:
|
||||
F
|
||||
[source=ls .. ../nonexistant ../nonexistant2 ../nonexistant3 |, reader=Input::READER_RAW, mode=Input::MANUAL, name=input, fields=<no value description>, want_record=F, ev=line
|
||||
{
|
||||
print A::outfile, A::description;
|
||||
print A::outfile, A::tpe;
|
||||
print A::outfile, A::s;
|
||||
print A::outfile, A::is_stderr;
|
||||
A::try = A::try + 1;
|
||||
if (7 == A::try)
|
||||
{
|
||||
print A::outfile, done;
|
||||
close(A::outfile);
|
||||
Input::remove(input);
|
||||
terminate();
|
||||
}
|
||||
|
||||
}, config={
|
||||
[read_stderr] = 1
|
||||
}]
|
||||
Input::EVENT_NEW
|
||||
bro
|
||||
F
|
||||
[source=ls .. ../nonexistant ../nonexistant2 ../nonexistant3 |, reader=Input::READER_RAW, mode=Input::MANUAL, name=input, fields=<no value description>, want_record=F, ev=line
|
||||
{
|
||||
print A::outfile, A::description;
|
||||
print A::outfile, A::tpe;
|
||||
print A::outfile, A::s;
|
||||
print A::outfile, A::is_stderr;
|
||||
A::try = A::try + 1;
|
||||
if (7 == A::try)
|
||||
{
|
||||
print A::outfile, done;
|
||||
close(A::outfile);
|
||||
Input::remove(input);
|
||||
terminate();
|
||||
}
|
||||
|
||||
}, config={
|
||||
[read_stderr] = 1
|
||||
}]
|
||||
Input::EVENT_NEW
|
||||
executestreamrawstderr.bro
|
||||
F
|
||||
[source=ls .. ../nonexistant ../nonexistant2 ../nonexistant3 |, reader=Input::READER_RAW, mode=Input::MANUAL, name=input, fields=<no value description>, want_record=F, ev=line
|
||||
{
|
||||
print A::outfile, A::description;
|
||||
print A::outfile, A::tpe;
|
||||
print A::outfile, A::s;
|
||||
print A::outfile, A::is_stderr;
|
||||
A::try = A::try + 1;
|
||||
if (7 == A::try)
|
||||
{
|
||||
print A::outfile, done;
|
||||
close(A::outfile);
|
||||
Input::remove(input);
|
||||
terminate();
|
||||
}
|
||||
|
||||
}, config={
|
||||
[read_stderr] = 1
|
||||
}]
|
||||
Input::EVENT_NEW
|
||||
out
|
||||
F
|
||||
[source=ls .. ../nonexistant ../nonexistant2 ../nonexistant3 |, reader=Input::READER_RAW, mode=Input::MANUAL, name=input, fields=<no value description>, want_record=F, ev=line
|
||||
{
|
||||
print A::outfile, A::description;
|
||||
print A::outfile, A::tpe;
|
||||
print A::outfile, A::s;
|
||||
print A::outfile, A::is_stderr;
|
||||
A::try = A::try + 1;
|
||||
if (7 == A::try)
|
||||
{
|
||||
print A::outfile, done;
|
||||
close(A::outfile);
|
||||
Input::remove(input);
|
||||
terminate();
|
||||
}
|
||||
|
||||
}, config={
|
||||
[read_stderr] = 1
|
||||
}]
|
||||
Input::EVENT_NEW
|
||||
ls: ../nonexistant: No such file or directory
|
||||
T
|
||||
[source=ls .. ../nonexistant ../nonexistant2 ../nonexistant3 |, reader=Input::READER_RAW, mode=Input::MANUAL, name=input, fields=<no value description>, want_record=F, ev=line
|
||||
{
|
||||
print A::outfile, A::description;
|
||||
print A::outfile, A::tpe;
|
||||
print A::outfile, A::s;
|
||||
print A::outfile, A::is_stderr;
|
||||
A::try = A::try + 1;
|
||||
if (7 == A::try)
|
||||
{
|
||||
print A::outfile, done;
|
||||
close(A::outfile);
|
||||
Input::remove(input);
|
||||
terminate();
|
||||
}
|
||||
|
||||
}, config={
|
||||
[read_stderr] = 1
|
||||
}]
|
||||
Input::EVENT_NEW
|
||||
ls: ../nonexistant2: No such file or directory
|
||||
T
|
||||
[source=ls .. ../nonexistant ../nonexistant2 ../nonexistant3 |, reader=Input::READER_RAW, mode=Input::MANUAL, name=input, fields=<no value description>, want_record=F, ev=line
|
||||
{
|
||||
print A::outfile, A::description;
|
||||
print A::outfile, A::tpe;
|
||||
print A::outfile, A::s;
|
||||
print A::outfile, A::is_stderr;
|
||||
A::try = A::try + 1;
|
||||
if (7 == A::try)
|
||||
{
|
||||
print A::outfile, done;
|
||||
close(A::outfile);
|
||||
Input::remove(input);
|
||||
terminate();
|
||||
}
|
||||
|
||||
}, config={
|
||||
[read_stderr] = 1
|
||||
}]
|
||||
Input::EVENT_NEW
|
||||
ls: ../nonexistant3: No such file or directory
|
||||
T
|
||||
done
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
|
||||
# @TEST-EXEC: btest-bg-wait -k 5
|
||||
# @TEST-EXEC: btest-diff out
|
||||
|
||||
redef exit_only_after_terminate = T;
|
||||
|
||||
module A;
|
||||
|
||||
type Val: record {
|
||||
s: string;
|
||||
is_stderr: bool;
|
||||
};
|
||||
|
||||
global try: count;
|
||||
global outfile: file;
|
||||
|
||||
event line(description: Input::EventDescription, tpe: Input::Event, s: string, is_stderr: bool)
|
||||
{
|
||||
print outfile, description;
|
||||
print outfile, tpe;
|
||||
print outfile, s;
|
||||
print outfile, is_stderr;
|
||||
|
||||
try = try + 1;
|
||||
if ( try == 7 )
|
||||
{
|
||||
print outfile, "done";
|
||||
close(outfile);
|
||||
Input::remove("input");
|
||||
terminate();
|
||||
}
|
||||
}
|
||||
|
||||
event bro_init()
|
||||
{
|
||||
|
||||
local config_strings: table[string] of string = {
|
||||
["read_stderr"] = "1"
|
||||
};
|
||||
|
||||
outfile = open("../out");
|
||||
try = 0;
|
||||
Input::add_event([$source="ls .. ../nonexistant ../nonexistant2 ../nonexistant3 |", $reader=Input::READER_RAW, $name="input", $fields=Val, $ev=line, $want_record=F, $config=config_strings]);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue