Add is_tor plumbing from collector->aggregator->frontend/cli

cmd/cli/flags.go

@@ -20,6 +20,7 @@ type sharedFlags struct {
 	status    string // expression: "200", "!=200", ">=400", etc.
 	websiteRe string // RE2 regex against website
 	uriRe     string // RE2 regex against request URI
+	isTor     string // "", "1" / "!=0" (TOR only), "0" / "!=1" (non-TOR only)
 }
 
 // bindShared registers the shared flags on fs and returns a pointer to the
@@ -34,6 +35,7 @@ func bindShared(fs *flag.FlagSet) (*sharedFlags, *string) {
 	fs.StringVar(&sf.status, "status", "", "filter: HTTP status expression (200, !=200, >=400, <500, …)")
 	fs.StringVar(&sf.websiteRe, "website-re", "", "filter: RE2 regex against website")
 	fs.StringVar(&sf.uriRe, "uri-re", "", "filter: RE2 regex against request URI")
+	fs.StringVar(&sf.isTor, "is-tor", "", "filter: TOR traffic (1 or !=0 = TOR only; 0 or !=1 = non-TOR only)")
 	return sf, target
 }
 
@@ -56,7 +58,7 @@ func parseTargets(s string) []string {
 }
 
 func buildFilter(sf *sharedFlags) *pb.Filter {
-	if sf.website == "" && sf.prefix == "" && sf.uri == "" && sf.status == "" && sf.websiteRe == "" && sf.uriRe == "" {
+	if sf.website == "" && sf.prefix == "" && sf.uri == "" && sf.status == "" && sf.websiteRe == "" && sf.uriRe == "" && sf.isTor == "" {
 		return nil
 	}
 	f := &pb.Filter{}
@@ -84,6 +86,17 @@ func buildFilter(sf *sharedFlags) *pb.Filter {
 	if sf.uriRe != "" {
 		f.UriRegex = &sf.uriRe
 	}
+	switch sf.isTor {
+	case "1", "!=0":
+		f.Tor = pb.TorFilter_TOR_YES
+	case "0", "!=1":
+		f.Tor = pb.TorFilter_TOR_NO
+	case "":
+		// no filter
+	default:
+		fmt.Fprintf(os.Stderr, "--is-tor: invalid value %q; use 1, 0, !=0, or !=1\n", sf.isTor)
+		os.Exit(1)
+	}
 	return f
 }