Bump deps.

- htmx v2.0.3
- hyperscript v0.9.13
- fiber v2.52.5
- fiber storage/memory v2.0.1
- fiber storage/redis v3.1.2
- fiber storage/sqlite3 v2.1.1
- essentialkaos/branca v2.0.5

Author: aebruno

go.mod

@@ -5,30 +5,30 @@ require (
 	github.com/coreos/go-oidc v2.2.1+incompatible
 	github.com/dchest/captcha v1.0.0
 	github.com/dustin/go-humanize v1.0.1
-	github.com/essentialkaos/branca v1.3.4
-	github.com/gofiber/fiber/v2 v2.52.4
-	github.com/gofiber/storage/memory v1.3.4
-	github.com/gofiber/storage/redis v1.3.4
-	github.com/gofiber/storage/sqlite3 v1.3.8
-	github.com/gorilla/mux v1.8.0
-	github.com/mileusna/useragent v1.3.4
+	github.com/essentialkaos/branca/v2 v2.0.5
+	github.com/gofiber/fiber/v2 v2.52.5
+	github.com/gofiber/storage/memory/v2 v2.0.1
+	github.com/gofiber/storage/redis/v3 v3.1.2
+	github.com/gofiber/storage/sqlite3/v2 v2.1.1
+	github.com/gorilla/mux v1.8.1
+	github.com/mileusna/useragent v1.3.5
 	github.com/ory/hydra-client-go v1.10.6
 	github.com/pkg/errors v0.9.1
 	github.com/pquerna/otp v1.4.0
 	github.com/prometheus/client_golang v1.19.1
 	github.com/sirupsen/logrus v1.9.3
-	github.com/spf13/cobra v1.8.0
-	github.com/spf13/viper v1.18.2
+	github.com/spf13/cobra v1.8.1
+	github.com/spf13/viper v1.19.0
 	github.com/stretchr/testify v1.9.0
 	github.com/ubccr/goipa v0.0.7
 	github.com/urfave/negroni v1.0.0
-	github.com/valyala/fasthttp v1.53.0
-	golang.org/x/net v0.25.0
+	github.com/valyala/fasthttp v1.56.0
+	golang.org/x/net v0.29.0
 	golang.org/x/oauth2 v0.18.0
 )
 
 require (
-	github.com/andybalholm/brotli v1.1.0 // indirect
+	github.com/andybalholm/brotli v1.1.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/boombuler/barcode v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -60,30 +60,30 @@ require (
 	github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
 	github.com/jcmturner/rpc/v2 v2.0.3 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
-	github.com/klauspost/compress v1.17.8 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-runewidth v0.0.15 // indirect
-	github.com/mattn/go-sqlite3 v1.14.22 // indirect
+	github.com/mattn/go-runewidth v0.0.16 // indirect
+	github.com/mattn/go-sqlite3 v1.14.24 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
 	github.com/philhofer/fwd v1.1.2 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/pquerna/cachecontrol v0.1.0 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.53.0 // indirect
 	github.com/prometheus/procfs v0.15.0 // indirect
-	github.com/redis/go-redis/v9 v9.5.1 // indirect
+	github.com/redis/go-redis/v9 v9.7.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
-	github.com/sagikazarmark/locafero v0.4.0 // indirect
+	github.com/sagikazarmark/locafero v0.6.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
-	github.com/spf13/cast v1.6.0 // indirect
+	github.com/spf13/cast v1.7.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/tidwall/gjson v1.17.1 // indirect
@@ -97,18 +97,18 @@ require (
 	go.opentelemetry.io/otel/metric v1.26.0 // indirect
 	go.opentelemetry.io/otel/trace v1.26.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.23.0 // indirect
-	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
-	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
+	golang.org/x/crypto v0.28.0 // indirect
+	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-go 1.21
+go 1.22.0
 
-toolchain go1.22.3
+toolchain go1.23.2

go.sum

@@ -15,9 +15,9 @@ import (
 	"github.com/gofiber/fiber/v2/middleware/filesystem"
 	"github.com/gofiber/fiber/v2/middleware/limiter"
 	frecover "github.com/gofiber/fiber/v2/middleware/recover"
-	"github.com/gofiber/storage/memory"
-	"github.com/gofiber/storage/redis"
-	"github.com/gofiber/storage/sqlite3"
+	"github.com/gofiber/storage/memory/v2"
+	"github.com/gofiber/storage/redis/v3"
+	"github.com/gofiber/storage/sqlite3/v2"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 )

server/server.go

@@ -18,8 +18,8 @@
 </div>
 
 <script src="/static/js/sweetalert2.min.js" integrity="sha384-MFQHLECN7JsqezT2nLwWieqtG6G9yQWxkJh31QjDyO2dhpkHSo6vQYGDcjMVgDlc" crossorigin="anonymous"></script>
-<script src="/static/js/htmx.min.js" integrity="sha384-cZuAZ+ZbwkNRnrKi05G/fjBX+azI9DNOkNYysZ0I/X5ZFgsmMiBXgDZof30F5ofc" crossorigin="anonymous"></script>
-<script src="/static/js/hyperscript_w9y.min.js" integrity="sha384-eXB1x9yjPqWLBStIhzPmuHalCO17P5Uf/ahLI7RovcRyPGbCUgvpeodAdh0FxVA2" crossorigin="anonymous"></script>
+<script src="/static/js/htmx.min.js" integrity="sha384-0895/pl2MU10Hqc6jd4RvrthNlDiE9U1tWmX7WRESftEDRosgxNsQG/Ze9YMRzHq" crossorigin="anonymous"></script>
+<script src="/static/js/hyperscript.min.js" integrity="sha384-5yQ5JTatiFEgeiEB4mfkRI3oTGtaNpbJGdcciZ4IEYFpLGt8yDsGAd7tKiMwnX9b" crossorigin="anonymous"></script>
 <script src="/static/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
 <script src="/static/js/site.js"></script>
 </script>

server/templates/footer.html

@@ -12,7 +12,7 @@ import (
 	"math/big"
 	"time"
 
-	"github.com/essentialkaos/branca"
+	"github.com/essentialkaos/branca/v2"
 	"github.com/gofiber/fiber/v2"
 	"github.com/spf13/viper"
 )
@@ -73,8 +73,6 @@ func NewToken(username, email, prefix string, storage fiber.Storage) (string, er
 		return "", err
 	}
 
-	b.SetTTL(viper.GetUint32("email.token_max_age"))
-
 	token, err := b.EncodeToString(jsonBytes)
 	if err != nil {
 		return "", err
@@ -101,14 +99,12 @@ func ParseToken(token, prefix string, storage fiber.Storage) (*Token, error) {
 		return nil, err
 	}
 
-	b.SetTTL(viper.GetUint32("email.token_max_age"))
-
 	brancaToken, err := b.DecodeString(token)
 	if err != nil {
 		return nil, err
 	}
 
-	if b.IsExpired(brancaToken) {
+	if brancaToken.IsExpired(viper.GetUint32("email.token_max_age")) {
 		return nil, errors.New("Token expired")
 	}
 

server/templates/static/js/htmx.min.js

@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gofiber/storage/memory"
+	"github.com/gofiber/storage/memory/v2"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 )