Merge branch 'main' into docs/update-sda-cmd-docs

Author: yasinmiran

charts/sda-db/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: sda-db
-version: 0.8.56
-appVersion: v0.3.114
+version: 0.8.57
+appVersion: v0.3.119
 kubeVersion: '>= 1.26.0'
 description: Database component for Sensitive Data Archive (SDA) installation
 home: https://neic-sda.readthedocs.io

charts/sda-mq/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: sda-mq
-version: 0.7.57
-appVersion: v0.3.114
+version: 0.7.58
+appVersion: v0.3.119
 kubeVersion: '>= 1.26.0'
 description: RabbitMQ component for Sensitive Data Archive (SDA) installation
 home: https://neic-sda.readthedocs.io

charts/sda-svc/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: sda-svc
-version: 0.28.0
-appVersion: v0.3.114
+version: 0.28.1
+appVersion: v0.3.119
 kubeVersion: '>= 1.26.0'
 description: Components for Sensitive Data Archive (SDA) installation
 home: https://neic-sda.readthedocs.io

sda-download/api/sda/sda_test.go

@@ -7,6 +7,7 @@ import (
 	"encoding/binary"
 	"errors"
 	"io"
+	"math"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -677,7 +678,8 @@ func (f *fakeGRPC) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	_, err = w.Write([]byte{0})
 	assert.NoError(f.t, err, "Could not write response flag")
 
-	err = binary.Write(w, binary.BigEndian, int32(len(response)))
+	assert.LessOrEqual(f.t, len(response), math.MaxInt32, "Response too long")
+	err = binary.Write(w, binary.BigEndian, int32(len(response))) //nolint:gosec // we're checking the length above
 	assert.NoError(f.t, err, "Could not write response length")
 
 	_, err = w.Write(response)

sda/cmd/reencrypt/reencrypt.go

@@ -7,6 +7,7 @@ import (
 	"crypto/x509"
 	"encoding/base64"
 	"fmt"
+	"math"
 	"net"
 	"os"
 	"os/signal"
@@ -55,10 +56,15 @@ func (s *server) ReencryptHeader(_ context.Context, in *re.ReencryptRequest) (*r
 
 	if len(dataEditList) > 0 { // linter doesn't like checking for nil before len
 
-		// Only do this if we're passed a data edit list
+		// Check that G115: integer overflow conversion int -> uint32 is satisfied
+		if len(dataEditList) > int(math.MaxUint32) {
+			return nil, status.Error(400, "data edit list too long")
+		}
+
+		// Only do this if we're passed a data edit whose length fits in a uint32
 		dataEditListPacket := headers.DataEditListHeaderPacket{
 			PacketType:    headers.PacketType{PacketType: headers.DataEditList},
-			NumberLengths: uint32(len(dataEditList)),
+			NumberLengths: uint32(len(dataEditList)), //nolint:gosec // we're checking the length above
 			Lengths:       dataEditList,
 		}
 		extraHeaderPackets = append(extraHeaderPackets, dataEditListPacket)