we can now query
This commit is contained in:
@@ -19,7 +19,7 @@ func NewRipGrep(logger *zap.Logger) *RipGrep {
|
||||
return &RipGrep{logger: logger}
|
||||
}
|
||||
|
||||
type RipGrepCommand func(ctx context.Context, victimPath string) ([]string, error)
|
||||
type RipGrepCommand func(ctx context.Context, victimPath string) ([]string, bool, error)
|
||||
|
||||
func (g *RipGrep) Build(ctx context.Context, modulePath, query string) (RipGrepCommand, error) {
|
||||
g.logger.Debug("Pulling docker image", zap.String("actiondir", modulePath), zap.String("query", query))
|
||||
@@ -54,14 +54,18 @@ func (g *RipGrep) Build(ctx context.Context, modulePath, query string) (RipGrepC
|
||||
|
||||
g.logger.Debug("Docker image pulled")
|
||||
|
||||
return func(ctx context.Context, victimPath string) ([]string, error) {
|
||||
return func(ctx context.Context, victimPath string) ([]string, bool, error) {
|
||||
g.logger.Debug("Executing script", zap.String("victim", victimPath))
|
||||
|
||||
runRipGrepCmd := fmt.Sprintf("docker run --rm -v %s/:/data:ro mbologna/docker-ripgrep rg -i '%s' || true", victimPath, query)
|
||||
|
||||
g.logger.Debug("Execute ripgrep query", zap.String("command", runRipGrepCmd))
|
||||
|
||||
cmd := exec.CommandContext(
|
||||
ctx,
|
||||
"/bin/bash",
|
||||
"-c",
|
||||
fmt.Sprintf("docker run --rm -v %s/:/data mbologna/docker-ripgrep rg -i %s", victimPath, query),
|
||||
runRipGrepCmd,
|
||||
)
|
||||
|
||||
runDockerWriter := &zapio.Writer{
|
||||
@@ -71,25 +75,32 @@ func (g *RipGrep) Build(ctx context.Context, modulePath, query string) (RipGrepC
|
||||
defer runDockerWriter.Close()
|
||||
|
||||
builder := &strings.Builder{}
|
||||
|
||||
combinedWriter := io.MultiWriter(runDockerWriter, builder)
|
||||
|
||||
cmd.Stdout = combinedWriter
|
||||
cmd.Stderr = runDockerWriter
|
||||
cmd.Stderr = combinedWriter
|
||||
|
||||
err = cmd.Start()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
return nil, false, err
|
||||
}
|
||||
|
||||
err = cmd.Wait()
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
return nil, false, err
|
||||
}
|
||||
|
||||
contents := strings.Split(builder.String(), "\n")
|
||||
validatedOutput := make([]string, 0)
|
||||
|
||||
return contents, nil
|
||||
for _, c := range contents {
|
||||
if !strings.Contains(c, "WARNING:") {
|
||||
validatedOutput = append(validatedOutput, c)
|
||||
}
|
||||
}
|
||||
|
||||
found := len(validatedOutput) > 0
|
||||
|
||||
return validatedOutput, found, nil
|
||||
}, nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user