Merge pull request #70 from DCSO/rest-improvements

Improvements to the REST API

Author: satta

db/db_dummy.go

@@ -1,5 +1,5 @@
 // balboa
-// Copyright (c) 2020, DCSO GmbH
+// Copyright (c) 2020, 2025, DCSO GmbH
 
 package db
 
@@ -51,13 +51,8 @@ func (m *MockDB) TotalCount() (int, error) {
 func (m *MockDB) Search(qrdata, qrrname, qrrtype, qsensorID *string, limit int) ([]observation.Observation, error) {
 	retObs := make([]observation.Observation, 0)
 	for _, o := range m.obs {
-		if qrdata != nil {
-			if *qrdata == o.RData {
-				retObs = append(retObs, o)
-			}
-		}
-		if qrrname != nil {
-			if *qrrname == o.RRName {
+		if (qrdata == nil || *qrdata == o.RData) && (qrrname == nil || *qrrname == o.RRName) {
+			if (qsensorID == nil || *qsensorID == o.SensorID) && (qrrtype == nil || *qrrtype == o.RRType) {
 				retObs = append(retObs, o)
 			}
 		}

go.mod

@@ -1,29 +1,62 @@
 module github.com/DCSO/balboa
 
-go 1.13
+go 1.23
+
+toolchain go1.23.4
 
 require (
 	github.com/NeowayLabs/wabbit v0.0.0-20210927194032-73ad61d1620e
-	github.com/containerd/containerd v1.6.38 // indirect
 	github.com/farsightsec/go-nmsg v0.2.0
-	github.com/fsouza/go-dockerclient v1.7.8 // indirect
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/protobuf v1.5.4
 	github.com/graph-gophers/graphql-go v1.3.0
 	github.com/machinebox/graphql v0.2.2
-	github.com/matryer/is v1.2.0 // indirect
-	github.com/moby/sys/mount v0.3.1 // indirect
-	github.com/opentracing/opentracing-go v1.2.0 // indirect
-	github.com/pborman/uuid v1.2.0 // indirect
-	github.com/rabbitmq/amqp091-go v1.3.0 // indirect
 	github.com/satori/go.uuid v1.2.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.3.0
 	github.com/spf13/viper v1.10.1
 	github.com/streadway/amqp v1.0.0
-	github.com/tiago4orion/conjure v0.0.0-20150908101743-93cb30b9d218 // indirect
 	github.com/ugorji/go/codec v1.2.6
 	github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9
-	gopkg.in/ini.v1 v1.66.4 // indirect
 	gopkg.in/yaml.v2 v2.4.0
 )
+
+require (
+	github.com/Microsoft/go-winio v0.5.3 // indirect
+	github.com/containerd/containerd v1.6.38 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
+	github.com/fsnotify/fsnotify v1.5.1 // indirect
+	github.com/fsouza/go-dockerclient v1.7.8 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/uuid v1.3.1 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/klauspost/compress v1.15.9 // indirect
+	github.com/kr/pretty v0.3.0 // indirect
+	github.com/magiconair/properties v1.8.5 // indirect
+	github.com/matryer/is v1.2.0 // indirect
+	github.com/mitchellh/mapstructure v1.4.3 // indirect
+	github.com/moby/sys/mount v0.3.1 // indirect
+	github.com/opencontainers/image-spec v1.1.0 // indirect
+	github.com/opencontainers/runc v1.1.5 // indirect
+	github.com/opentracing/opentracing-go v1.2.0 // indirect
+	github.com/pborman/uuid v1.2.0 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/rabbitmq/amqp091-go v1.3.0 // indirect
+	github.com/rogpeppe/go-internal v1.9.0 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/spf13/afero v1.9.2 // indirect
+	github.com/spf13/cast v1.4.1 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/stretchr/testify v1.8.4 // indirect
+	github.com/subosito/gotenv v1.2.0 // indirect
+	github.com/tiago4orion/conjure v0.0.0-20150908101743-93cb30b9d218 // indirect
+	golang.org/x/net v0.35.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	gopkg.in/ini.v1 v1.66.4 // indirect
+)