Fixing wildcard interactions retrieval (#536)

projectdiscovery · Apr 21, 2023 · 770429e · 770429e
1 parent 2a09d86
commit 770429e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/pkg/server/http_server.go b/pkg/server/http_server.go
@@ -190,7 +190,6 @@ func (h *HTTPServer) logger(handler http.Handler) http.HandlerFunc {
 func (h *HTTPServer) handleInteraction(uniqueID, fullID, reqString, respString, hostPort string) {
 	correlationID := uniqueID[:h.options.CorrelationIdLength]
 
-	// host, _, _ := net.SplitHostPort(hostPort)
 	interaction := &Interaction{
 		Protocol:      "http",
 		UniqueID:      uniqueID,
@@ -402,10 +401,13 @@ func (h *HTTPServer) pollHandler(w http.ResponseWriter, req *http.Request) {
 	var tlddata, extradata []string
 	if h.options.RootTLD {
 		for _, domain := range h.options.Domains {
-			tlddata, _ = h.options.Storage.GetInteractionsWithId(domain)
+			interactions, _ := h.options.Storage.GetInteractionsWithId(domain)
+			// root domains interaction are not encrypted
+			tlddata = append(tlddata, interactions...)
 		}
 	}
 	if h.options.Token != "" {
+		// auth token interactions are not encrypted
 		extradata, _ = h.options.Storage.GetInteractionsWithId(h.options.Token)
 	}
 	response := &PollResponse{Data: data, AESKey: aesKey, TLDData: tlddata, Extra: extradata}

diff --git a/pkg/storage/storagedb.go b/pkg/storage/storagedb.go
@@ -280,9 +280,10 @@ func (s *StorageDB) getInteractions(correlationData *CorrelationData, id string)
 			encryptedDataItem, err := AESEncrypt(correlationData.AESKey, []byte(dataItem))
 			if err != nil {
 				errs = append(errs, errors.Wrap(err, "could not encrypt event data"))
-				continue
+				data[i] = dataItem
+			} else {
+				data[i] = encryptedDataItem
 			}
-			data[i] = encryptedDataItem
 		}
 		return data, multierr.Combine(errs...)
 	}