Merge pull request #154 from weslambert/filestream_processedDir

Add option to move files to processed directory after submission

docs/README.md

@@ -281,6 +281,7 @@ For the options below, only one response setting may be configured.
 * "files.chunk": size of file chunks that will be sent to the frontend server (defaults to 32768b / 32kb)
 * "files.patterns": list of glob patterns that determine which files will be sent for scanning (defaults to example glob pattern)
 * "files.delete": boolean that determines if files should be deleted after being sent for scanning (defaults to false -- does not delete files)
+* "files.processed": directory where files will be moved after being submitted for scanning (defaults to "", and files stay in staging directory)
 * "response.log": location where worker scan results are logged to (defaults to /var/log/strelka/strelka.log)
 * "response.report": frequency at which the frontend reports the number of files processed (no default)
 * "delta": time value that determines how much time must pass since a file was last modified before it is sent for scanning (defaults to 5 seconds)

src/go/cmd/strelka-filestream/main.go

@@ -141,6 +141,7 @@ func main() {
 				Chunk:  conf.Throughput.Chunk,
 				Delay:  conf.Throughput.Delay,
 				Delete: conf.Files.Delete,
+				Processed:   conf.Files.Processed,
 			}
 
 			sem <- 1
@@ -197,6 +198,7 @@ func main() {
 					Chunk:  conf.Throughput.Chunk,
 					Delay:  conf.Throughput.Delay,
 					Delete: conf.Files.Delete,
+					Processed:   conf.Files.Processed,
 				}
 
 				sem <- 1

src/go/pkg/rpc/rpc.go

@@ -8,6 +8,7 @@ import (
 	"os"
 	"runtime"
 	"time"
+	"path/filepath"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
@@ -127,7 +128,16 @@ func ScanFile(client strelka.FrontendClient, timeout time.Duration, req structs.
 	}
 	if req.Delete {
 		defer os.Remove(req.Attributes.Filename)
-	}
+	} else if req.Processed != "" {
+                defer func() {
+                        _, name := filepath.Split(req.Attributes.Filename)
+                        m := filepath.Join(req.Processed, name)
+                        err := os.Rename(req.Attributes.Filename, m)
+                        if err != nil {
+                                log.Printf("failed to move file %s to directory %s: %v", name, req.Processed, err)
+                        }
+                }()
+        }
 	defer file.Close()
 
 	scanFile, err := client.ScanFile(ctx, grpc.WaitForReady(true))

src/go/pkg/structs/structs.go

@@ -30,6 +30,7 @@ type ConfFiles struct {
 	Patterns   []string // required
 	Delete     bool     // optional
 	Gatekeeper bool     // required
+	Processed string // optional
 }
 
 type ConfCoordinator struct {
@@ -96,4 +97,5 @@ type ScanFileRequest struct {
 	Chunk      int                 // required
 	Delay      time.Duration       // optional
 	Delete     bool                // optional, only use if files must be deleted!
+	Processed  string              // optional
 }