Merge pull request #121 from BenB196/staging

Added support for new ffs fields

eventOutput/fileHandler.go

@@ -83,8 +83,10 @@ type Code42Device struct {
 }
 
 type Code42Tab struct {
-	WindowTitle string `json:"window_title,omitempty"`
-	Url         *URL   `json:"url,omitempty"`
+	WindowTitle string   `json:"window_title,omitempty"`
+	Url         *URL     `json:"url,omitempty"`
+	Titles      []string `json:"titles,omitempty"`
+	Urls        []URL    `json:"urls,omitempty"`
 }
 
 type Code42RemovableMedia struct {

ffsEvent/ffsFetcher.go

@@ -327,6 +327,26 @@ func queryFetcher(query config.FFSQuery, inProgressQueries *[]eventOutput.InProg
 						Uid:      ffsEvent.DeviceUid,
 					}
 
+					//code 42 tab fields
+					var tabURLs []eventOutput.URL
+
+					if ffsEvent.TabURLs != nil && len(ffsEvent.TabURLs) != 0 {
+						for _, tabUrl := range ffsEvent.TabURLs {
+							tabURLs = append(tabURLs, *getUrlInfo(tabUrl))
+						}
+					}
+
+					if tabURLs != nil && len(tabURLs) == 0 {
+						tabURLs = nil
+					}
+
+					code42Tab := &eventOutput.Code42Tab{
+						WindowTitle: ffsEvent.TabWindowTitle,
+						Url:         getUrlInfo(ffsEvent.TabUrl),
+						Titles:      ffsEvent.TabTitles,
+						Urls:        tabURLs,
+					}
+
 					code42 := &eventOutput.Code42{
 						Event:                code42Event,
 						InsertionTimestamp:   ffsEvent.InsertionTimestamp,
@@ -347,10 +367,7 @@ func queryFetcher(query config.FFSQuery, inProgressQueries *[]eventOutput.InProg
 						DetectionSourceAlias: ffsEvent.DetectionSourceAlias,
 						Exposure:             ffsEvent.Exposure,
 						Process:              process,
-						Tab: &eventOutput.Code42Tab{
-							WindowTitle: ffsEvent.TabWindowTitle,
-							Url:         getUrlInfo(ffsEvent.TabUrl),
-						},
+						Tab:                  code42Tab,
 						RemovableMedia: &eventOutput.Code42RemovableMedia{
 							Vendor:       ffsEvent.RemovableMediaVendor,
 							Name:         ffsEvent.RemovableMediaName,

go.mod

@@ -3,10 +3,10 @@ module github.com/BenB196/crashplan-ffs-puller
 go 1.15
 
 require (
-	github.com/BenB196/crashplan-ffs-go-pkg v0.3.0
+	github.com/BenB196/crashplan-ffs-go-pkg v0.3.1
 	github.com/BenB196/ip-api-go-pkg v0.0.9
 	github.com/VictoriaMetrics/fastcache v1.5.7
 	github.com/olivere/elastic/v7 v7.0.22
-	github.com/prometheus/client_golang v1.8.0
+	github.com/prometheus/client_golang v1.9.0
 	golang.org/x/net v0.0.0-20200625001655-4c5254603344
 )

go.sum

@@ -52,6 +52,8 @@ github.com/BenB196/crashplan-ffs-go-pkg v0.2.9 h1:HZ1KRgQD5Yll5zjWphUy48n5+vjIEJ
 github.com/BenB196/crashplan-ffs-go-pkg v0.2.9/go.mod h1:xyuyYD7cF11Qf/4lPhVcuyd/Rj+BD/ZF710qgdb7KxE=
 github.com/BenB196/crashplan-ffs-go-pkg v0.3.0 h1:6daarZ2qt8Wf7g/6uMCc+PVGI/C14WxLcSW3aFK6sLM=
 github.com/BenB196/crashplan-ffs-go-pkg v0.3.0/go.mod h1:xyuyYD7cF11Qf/4lPhVcuyd/Rj+BD/ZF710qgdb7KxE=
+github.com/BenB196/crashplan-ffs-go-pkg v0.3.1 h1:jCB30+j7VqqA0ep3MaFL1BXpck8vA0wiI7A4srujmy0=
+github.com/BenB196/crashplan-ffs-go-pkg v0.3.1/go.mod h1:xyuyYD7cF11Qf/4lPhVcuyd/Rj+BD/ZF710qgdb7KxE=
 github.com/BenB196/ip-api-go-pkg v0.0.3 h1:FWmM7FkhT1N55jd4jPW7W9LVOQrG89DLlrgwMb5fosw=
 github.com/BenB196/ip-api-go-pkg v0.0.3/go.mod h1:ccPdkBNnzf/uvuk7qXgEO06TCS/qILNJQP/KETQG4jU=
 github.com/BenB196/ip-api-go-pkg v0.0.4 h1:BbWELxooG6l2gaXQ4i4gm6NsyikdbhalF+TKg08gDPQ=
@@ -344,6 +346,8 @@ github.com/prometheus/client_golang v1.7.1 h1:NTGy1Ja9pByO+xAeH/qiWnLrKtr3hJPNja
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
 github.com/prometheus/client_golang v1.8.0 h1:zvJNkoCFAnYFNC24FV8nW4JdRJ3GIFcLbg65lL/JDcw=
 github.com/prometheus/client_golang v1.8.0/go.mod h1:O9VU6huf47PktckDQfMTX0Y8tY0/7TSWwj+ITvv0TnM=
+github.com/prometheus/client_golang v1.9.0 h1:Rrch9mh17XcxvEu9D9DEpb4isxjGBtcevQjKvxPRQIU=
+github.com/prometheus/client_golang v1.9.0/go.mod h1:FqZLKOZnGdFAhOK4nqGHa7D66IdsO+O441Eve7ptJDU=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE=
@@ -365,6 +369,8 @@ github.com/prometheus/common v0.10.0 h1:RyRA7RzGXQZiW+tGMr7sxa85G1z0yOpM1qq5c8lN
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
 github.com/prometheus/common v0.14.0 h1:RHRyE8UocrbjU+6UvRzwi6HjiDfxrrBU91TtbKzkGp4=
 github.com/prometheus/common v0.14.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
+github.com/prometheus/common v0.15.0 h1:4fgOnadei3EZvgRwxJ7RMpG1k1pOZth5Pc13tyspaKM=
+github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
@@ -509,6 +515,8 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211 h1:9UQO31fZ+0aKQOFldThf7BKPMJTiBfWycGh/u3UoO88=
 golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e h1:AyodaIpKjppX+cBfTASF2E1US3H2JFBj920Ot3rtDjs=
+golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=