Merge pull request #126 from BenB196/staging

Fixed issues with ffsUtils parsing domains
BenB196 · Feb 6, 2021 · a5472d5 · a5472d5
2 parents 49828cc + c9b8d01
commit a5472d5
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.5.1
+0.5.2
diff --git a/ffsEvent/ffsFetcher.go b/ffsEvent/ffsFetcher.go
@@ -162,31 +162,39 @@ func queryFetcher(query config.FFSQuery, inProgressQueries *[]eventOutput.InProg
 					}
 
 					//creationTimestamp
-					var createTimestamp time.Time
+					var createTimestamp *time.Time
 					if ffsEvent.CreateTimestamp != "" {
 						if len(strings.Split(ffsEvent.CreateTimestamp, ".")) != 2 {
 							ffsEvent.CreateTimestamp = ffsEvent.CreateTimestamp + ".000"
 						}
 
-						createTimestamp, err = time.Parse("2006-01-02 15:04:05.000", strings.Replace(strings.Replace(ffsEvent.CreateTimestamp, "T", " ", -1), "Z", "", -1))
+						createTimestampTime, err := time.Parse("2006-01-02 15:04:05.000", strings.Replace(strings.Replace(ffsEvent.CreateTimestamp, "T", " ", -1), "Z", "", -1))
 
 						if err != nil {
 							panic(err)
 						}
+
+						createTimestamp = &createTimestampTime
+					} else {
+						createTimestamp = nil
 					}
 
 					//modifyTimestamp
-					var modifyTimestamp time.Time
+					var modifyTimestamp *time.Time
 					if ffsEvent.ModifyTimestamp != "" {
 						if len(strings.Split(ffsEvent.ModifyTimestamp, ".")) != 2 {
 							ffsEvent.ModifyTimestamp = ffsEvent.ModifyTimestamp + ".000"
 						}
 
-						modifyTimestamp, err = time.Parse("2006-01-02 15:04:05.000", strings.Replace(strings.Replace(ffsEvent.ModifyTimestamp, "T", " ", -1), "Z", "", -1))
+						modifyTimestampTime, err := time.Parse("2006-01-02 15:04:05.000", strings.Replace(strings.Replace(ffsEvent.ModifyTimestamp, "T", " ", -1), "Z", "", -1))
 
 						if err != nil {
 							panic(err)
 						}
+
+						modifyTimestamp = &modifyTimestampTime
+					} else {
+						modifyTimestamp = nil
 					}
 
 
@@ -232,8 +240,8 @@ func queryFetcher(query config.FFSQuery, inProgressQueries *[]eventOutput.InProg
 						Size:      ffsEvent.FileSize,
 						Owner:     ffsEvent.FileOwner,
 						Hash:      hash,
-						Created:   &createTimestamp,
-						Mtime:     &modifyTimestamp,
+						Created:   createTimestamp,
+						Mtime:     modifyTimestamp,
 						Directory: ffsEvent.DirectoryId,
 						MimeType:  []string{ffsEvent.MimeTypeByBytes, ffsEvent.MimeTypeByExtension},
 					}
@@ -370,8 +378,8 @@ func queryFetcher(query config.FFSQuery, inProgressQueries *[]eventOutput.InProg
 						Size:                ffsEvent.FileSize,
 						Owner:               ffsEvent.FileOwner,
 						Hash:                hash,
-						CreateTimestamp:     &createTimestamp,
-						ModifyTimestamp:     &modifyTimestamp,
+						CreateTimestamp:     createTimestamp,
+						ModifyTimestamp:     modifyTimestamp,
 						Id:                  ffsEvent.FileId,
 						MimeTypeMismatch:    ffsEvent.MimeTypeMismatch,
 					}

diff --git a/ffsEvent/ffsUtils.go b/ffsEvent/ffsUtils.go
@@ -226,12 +226,16 @@ func getUrlInfo(urlFull string) *eventOutput.URL {
 		//set query
 		eventUrl.Query = u.RawQuery
 		//set registered domain
-		eventUrl.RegisteredDomain, err = publicsuffix.EffectiveTLDPlusOne(eventUrl.Domain)
-		if err != nil {
-			log.Println("Error getting Registered Domain; error: " + err.Error() + ", Domain: " + eventUrl.Domain)
+		if eventUrl.Domain != "" {
+			eventUrl.RegisteredDomain, err = publicsuffix.EffectiveTLDPlusOne(eventUrl.Domain)
+			if err != nil {
+				log.Println("Error getting Registered Domain; error: " + err.Error() + ", Domain: " + eventUrl.Domain)
+			}
 		}
 		//set top level domain
-		eventUrl.TopLevelDomain, _ = publicsuffix.PublicSuffix(eventUrl.Domain)
+		if eventUrl.Domain != "" {
+			eventUrl.TopLevelDomain, _ = publicsuffix.PublicSuffix(eventUrl.Domain)
+		}
 	}
 	return &eventUrl
 }