Merge pull request #1270 from safing/fix/default-query-db

Do not query the history database by default

netquery/manager.go

@@ -2,8 +2,6 @@ package netquery
 
 import (
 	"context"
-	"crypto/sha256"
-	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"time"
@@ -268,7 +266,5 @@ func convertConnection(conn *network.Connection) (*Conn, error) {
 }
 
 func genConnID(conn *network.Connection) string {
-	data := conn.ID + "-" + conn.Process().GetID()
+	return conn.ID + "-" + conn.Process().GetID()
-	hash := sha256.Sum256([]byte(data))
-	return hex.EncodeToString(hash[:])
 }

netquery/module_api.go

@@ -115,8 +115,8 @@ func (m *module) prepare() error {
 	if err := api.RegisterEndpoint(api.Endpoint{
 		Path:      "netquery/history/clear",
 		MimeType:  "application/json",
-		Read:      api.PermitUser,
 		Write:     api.PermitUser,
+		Read:      api.PermitUser,
 		BelongsTo: m.Module,
 		HandlerFunc: func(w http.ResponseWriter, r *http.Request) {
 			var body struct {

netquery/query_handler.go

@@ -189,8 +189,9 @@ func (req *QueryRequestPayload) generateSQL(ctx context.Context, schema *orm.Tab
 		whereClause = "WHERE " + whereClause
 	}
 
+	// if no database is specified we default to LiveDatabase only.
 	if len(req.Databases) == 0 {
-		req.Databases = []DatabaseName{LiveDatabase, HistoryDatabase}
+		req.Databases = []DatabaseName{LiveDatabase}
 	}
 
 	sources := make([]string, len(req.Databases))