Update Go toolchain, deps, and vendored web assets

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21-bookworm as build
+FROM golang:1.25-bookworm as build
 
 RUN apt-get update \
  && apt-get install -y bzip2 gzip unzip curl openssh-client

core/api_v2.go

@@ -824,7 +824,7 @@ func (c *Core) v2API() *route.Router {
 
 		spec, err := timespec.Parse(in.Timespec)
 		if err != nil {
-			r.Fail(route.Bad(err, fmt.Sprintf("%s", err)))
+			r.Fail(route.Bad(err, "%s", err))
 			return
 		}
 

db/import.go

@@ -40,7 +40,7 @@ func (db *DB) importAgents(n uint, in *json.Decoder) error {
 		}
 
 		if v.Error != "" {
-			return fmt.Errorf(v.Error)
+			return fmt.Errorf("%s", v.Error)
 		}
 
 		log.Infof("IMPORT: inserting agent %s...", v.UUID)
@@ -91,7 +91,7 @@ func (db *DB) importArchives(n uint, in *json.Decoder, vlt *vault.Client) error
 		}
 
 		if v.Error != "" {
-			return fmt.Errorf(v.Error)
+			return fmt.Errorf("%s", v.Error)
 		}
 
 		log.Infof("IMPORT: inserting archive %s...", v.UUID)
@@ -140,7 +140,7 @@ func (db *DB) importFixups(n uint, in *json.Decoder) error {
 		}
 
 		if v.Error != "" {
-			return fmt.Errorf(v.Error)
+			return fmt.Errorf("%s", v.Error)
 		}
 
 		log.Infof("IMPORT: inserting fixup #%s...", v.ID)
@@ -184,7 +184,7 @@ func (db *DB) importJobs(n uint, in *json.Decoder) error {
 		}
 
 		if v.Error != "" {
-			return fmt.Errorf(v.Error)
+			return fmt.Errorf("%s", v.Error)
 		}
 
 		log.Infof("IMPORT: inserting job %s...", v.UUID)
@@ -222,7 +222,7 @@ func (db *DB) importMemberships(n uint, in *json.Decoder) error {
 		}
 
 		if v.Error != "" {
-			return fmt.Errorf(v.Error)
+			return fmt.Errorf("%s", v.Error)
 		}
 
 		err := db.exec(`
@@ -263,7 +263,7 @@ func (db *DB) importStores(n uint, in *json.Decoder) error {
 		}
 
 		if v.Error != "" {
-			return fmt.Errorf(v.Error)
+			return fmt.Errorf("%s", v.Error)
 		}
 
 		log.Infof("IMPORT: inserting store %s...", v.UUID)
@@ -310,7 +310,7 @@ func (db *DB) importTargets(n uint, in *json.Decoder) error {
 		}
 
 		if v.Error != "" {
-			return fmt.Errorf(v.Error)
+			return fmt.Errorf("%s", v.Error)
 		}
 
 		log.Infof("IMPORT: inserting target %s...", v.UUID)
@@ -369,7 +369,7 @@ func (db *DB) importTasks(n uint, in *json.Decoder) error {
 		}
 
 		if v.Error != "" {
-			return fmt.Errorf(v.Error)
+			return fmt.Errorf("%s", v.Error)
 		}
 
 		if v.TargetPlugin == MetaPluginName && v.Op == "backup" && v.Status == "running" {
@@ -432,7 +432,7 @@ func (db *DB) importTenants(n uint, in *json.Decoder) error {
 		}
 
 		if v.Error != "" {
-			return fmt.Errorf(v.Error)
+			return fmt.Errorf("%s", v.Error)
 		}
 
 		log.Infof("IMPORT: inserting tenant %s...", v.UUID)
@@ -471,7 +471,7 @@ func (db *DB) importUsers(n uint, in *json.Decoder) error {
 		}
 
 		if v.Error != "" {
-			return fmt.Errorf(v.Error)
+			return fmt.Errorf("%s", v.Error)
 		}
 
 		log.Infof("IMPORT: inserting user %s...", v.UUID)
@@ -513,7 +513,7 @@ func (db *DB) importSessions(n uint, in *json.Decoder) error {
 		}
 
 		if v.Error != "" {
-			return fmt.Errorf(v.Error)
+			return fmt.Errorf("%s", v.Error)
 		}
 
 		log.Infof("IMPORT: inserting session %s...", v.UUID)
@@ -541,7 +541,7 @@ func (db *DB) importFinalizer(n uint, in *json.Decoder, restoreKey string, ctx *
 	}
 
 	if fin.Error != "" {
-		return fmt.Errorf(fin.Error)
+		return fmt.Errorf("%s", fin.Error)
 	}
 
 	log.Infof("IMPORT: finalizing progenitor backup task [%s], which was in-flight when the export was taken", fin.Task)
@@ -732,7 +732,7 @@ func (db *DB) Import(in *json.Decoder, vault *vault.Client, restoreKey, uuid str
 				}
 
 				if ctx.Finalizer.Error != "" {
-					return fmt.Errorf(ctx.Finalizer.Error)
+					return fmt.Errorf("%s", ctx.Finalizer.Error)
 				}
 
 			case "":

docker/demo/Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:1.27.3
+FROM nginx:1.27-bookworm
 COPY htdocs /var/lib/data/demo/htdocs
 COPY init /init
 COPY nginx.conf /etc/nginx/conf.d/default.conf

docker/webdav/Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:1-bullseye
+FROM nginx:1.27-bookworm
 MAINTAINER James Hunt <james@niftylogic.com>
 
 ADD nginx.conf /etc/nginx/

go.mod

@@ -1,19 +1,17 @@
 module github.com/shieldproject/shield
 
-go 1.23.0
-
-toolchain go1.24.2
+go 1.25.5
 
 replace github.com/emicklei/go-restful/v3 => github.com/emicklei/go-restful/v3 v3.8.0
 
 require (
 	github.com/ErikDubbelboer/gspt v0.0.0-20180711091504-e39e726e09cc
 	github.com/cloudfoundry-community/vaultkv v0.7.0
-	github.com/fsouza/go-dockerclient v1.12.1
-	github.com/go-sql-driver/mysql v1.5.0
-	github.com/google/go-github v0.0.0-20150605201353-af17a5fa8537
+	github.com/fsouza/go-dockerclient v1.12.4
+	github.com/go-sql-driver/mysql v1.9.3
+	github.com/google/go-github/v76 v76.0.0
 	github.com/gorilla/websocket v1.4.2
-	github.com/hashicorp/consul/api v1.18.0
+	github.com/hashicorp/consul/api v1.29.6
 	github.com/jhunt/go-ansi v0.0.0-20181127194324-5fd839f108b6
 	github.com/jhunt/go-cli v0.0.0-20180120230054-44398e595118
 	github.com/jhunt/go-envirotron v0.0.0-20191007155228-c8f2a184ad0f
@@ -25,35 +23,34 @@ require (
 	github.com/kurin/blazer v0.5.1
 	github.com/mattn/go-isatty v0.0.20
 	github.com/mattn/go-shellwords v1.0.12
-	github.com/mattn/go-sqlite3 v1.14.15
+	github.com/mattn/go-sqlite3 v1.14.42
 	github.com/ncw/swift v1.0.48-0.20190410202254-753d2090bb62
 	github.com/okta/okta-jwt-verifier-golang v1.3.1
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.24.2
 	github.com/pborman/uuid v1.2.0
-	github.com/prometheus/client_golang v1.19.1
+	github.com/prometheus/client_golang v1.23.2
 	github.com/thanhpk/randstr v1.0.4
 	go.etcd.io/etcd/client/v3 v3.5.9
-	golang.org/x/crypto v0.36.0
-	golang.org/x/oauth2 v0.30.0
+	golang.org/x/crypto v0.50.0
+	golang.org/x/oauth2 v0.36.0
 	google.golang.org/api v0.126.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
 	cloud.google.com/go/compute/metadata v0.3.0 // indirect
-	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // indirect
+	filippo.io/edwards25519 v1.2.0 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/armon/go-metrics v0.3.10 // indirect
+	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
-	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
-	github.com/docker/docker v27.5.1+incompatible // indirect
+	github.com/docker/docker v28.5.2+incompatible // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/fatih/color v1.16.0 // indirect
@@ -63,8 +60,7 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/btree v1.0.1 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/s2a-go v0.1.4 // indirect
 	github.com/google/uuid v1.3.1 // indirect
@@ -74,16 +70,15 @@ require (
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-hclog v1.6.2 // indirect
-	github.com/hashicorp/go-immutable-radix v1.3.0 // indirect
-	github.com/hashicorp/go-msgpack v0.5.5 // indirect
+	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
 	github.com/hashicorp/go-secure-stdlib/base62 v0.1.2 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/hashicorp/serf v0.10.1 // indirect
 	github.com/jhunt/go-snapshot v0.0.0-20171017043618-9ad8f5ee37a2 // indirect
-	github.com/klauspost/compress v1.16.7 // indirect
+	github.com/klauspost/compress v1.18.2 // indirect
 	github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
 	github.com/lestrrat-go/blackmagic v1.0.2 // indirect
 	github.com/lestrrat-go/httpcc v1.0.1 // indirect
@@ -94,41 +89,43 @@ require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/miekg/dns v1.1.43 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/mapstructure v1.4.3 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
+	github.com/moby/go-archive v0.2.0 // indirect
 	github.com/moby/patternmatcher v0.6.0 // indirect
-	github.com/moby/sys/sequential v0.5.0 // indirect
-	github.com/moby/sys/user v0.1.0 // indirect
+	github.com/moby/sys/sequential v0.6.0 // indirect
+	github.com/moby/sys/user v0.4.0 // indirect
 	github.com/moby/sys/userns v0.1.0 // indirect
 	github.com/moby/term v0.5.0 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_model v0.5.0 // indirect
-	github.com/prometheus/common v0.48.0 // indirect
-	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/common v0.66.1 // indirect
+	github.com/prometheus/procfs v0.16.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	go.etcd.io/etcd/api/v3 v3.5.9 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/goleak v1.2.1 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	go.uber.org/zap v1.19.0 // indirect
-	golang.org/x/net v0.38.0 // indirect
-	golang.org/x/sys v0.31.0 // indirect
-	golang.org/x/term v0.30.0 // indirect
-	golang.org/x/text v0.23.0 // indirect
+	go.yaml.in/yaml/v2 v2.4.2 // indirect
+	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
+	golang.org/x/net v0.53.0 // indirect
+	golang.org/x/sys v0.43.0 // indirect
+	golang.org/x/term v0.42.0 // indirect
+	golang.org/x/text v0.36.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
 	google.golang.org/grpc v1.59.0 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/protobuf v1.36.8 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	gotest.tools/v3 v3.5.2 // indirect
 )