Use xdg-go/scram

grepplabs · Feb 9, 2025 · 9ff9bec · 9ff9bec
1 parent 84c03bf
commit 9ff9bec
Show file tree

Hide file tree

Showing 34 changed files with 380 additions and 44 deletions.
diff --git a/go.mod b/go.mod
@@ -26,7 +26,7 @@ require (
 	github.com/spf13/cobra v1.6.1
 	github.com/spf13/viper v1.0.2
 	github.com/stretchr/testify v1.10.0
-	github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c
+	github.com/xdg-go/scram v1.1.2
 	golang.org/x/net v0.34.0
 	golang.org/x/oauth2 v0.24.0
 	google.golang.org/api v0.126.0
@@ -81,7 +81,8 @@ require (
 	github.com/spf13/cast v1.2.0 // indirect
 	github.com/spf13/jwalterweatherman v0.0.0-20180109140146-7c0cea34c8ec // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/xdg/stringprep v1.0.0 // indirect
+	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
+	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	golang.org/x/crypto v0.33.0 // indirect

diff --git a/go.sum b/go.sum
@@ -279,10 +279,12 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk=
-github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
-github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0=
-github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
+github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
+github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
+github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=
+github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4=
+github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
+github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM=
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=

diff --git a/proxy/sasl_scram.go b/proxy/sasl_scram.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"github.com/grepplabs/kafka-proxy/proxy/protocol"
 	"github.com/sirupsen/logrus"
-	"github.com/xdg/scram"
+	"github.com/xdg-go/scram"
 	"hash"
 	"io"
 	"time"

diff --git a/vendor/github.com/xdg-go/pbkdf2/.gitignore b/vendor/github.com/xdg-go/pbkdf2/.gitignore
diff --git a/vendor/github.com/xdg/scram/LICENSE → vendor/github.com/xdg-go/pbkdf2/LICENSE b/vendor/github.com/xdg/scram/LICENSE → vendor/github.com/xdg-go/pbkdf2/LICENSE
diff --git a/vendor/github.com/xdg-go/pbkdf2/README.md b/vendor/github.com/xdg-go/pbkdf2/README.md
diff --git a/vendor/github.com/xdg-go/pbkdf2/pbkdf2.go b/vendor/github.com/xdg-go/pbkdf2/pbkdf2.go
diff --git a/vendor/github.com/xdg/scram/.gitignore → vendor/github.com/xdg-go/scram/.gitignore b/vendor/github.com/xdg/scram/.gitignore → vendor/github.com/xdg-go/scram/.gitignore
diff --git a/vendor/github.com/xdg-go/scram/CHANGELOG.md b/vendor/github.com/xdg-go/scram/CHANGELOG.md
diff --git a/vendor/github.com/xdg/stringprep/LICENSE → vendor/github.com/xdg-go/scram/LICENSE b/vendor/github.com/xdg/stringprep/LICENSE → vendor/github.com/xdg-go/scram/LICENSE
diff --git a/vendor/github.com/xdg/scram/README.md → vendor/github.com/xdg-go/scram/README.md b/vendor/github.com/xdg/scram/README.md → vendor/github.com/xdg-go/scram/README.md
diff --git a/vendor/github.com/xdg/scram/client.go → vendor/github.com/xdg-go/scram/client.go b/vendor/github.com/xdg/scram/client.go → vendor/github.com/xdg-go/scram/client.go
diff --git a/vendor/github.com/xdg/scram/client_conv.go → ...or/github.com/xdg-go/scram/client_conv.go b/vendor/github.com/xdg/scram/client_conv.go → ...or/github.com/xdg-go/scram/client_conv.go
diff --git a/vendor/github.com/xdg/scram/common.go → vendor/github.com/xdg-go/scram/common.go b/vendor/github.com/xdg/scram/common.go → vendor/github.com/xdg-go/scram/common.go
diff --git a/vendor/github.com/xdg/scram/doc.go → vendor/github.com/xdg-go/scram/doc.go b/vendor/github.com/xdg/scram/doc.go → vendor/github.com/xdg-go/scram/doc.go
diff --git a/vendor/github.com/xdg/scram/parse.go → vendor/github.com/xdg-go/scram/parse.go b/vendor/github.com/xdg/scram/parse.go → vendor/github.com/xdg-go/scram/parse.go
diff --git a/vendor/github.com/xdg/scram/scram.go → vendor/github.com/xdg-go/scram/scram.go b/vendor/github.com/xdg/scram/scram.go → vendor/github.com/xdg-go/scram/scram.go
diff --git a/vendor/github.com/xdg/scram/server.go → vendor/github.com/xdg-go/scram/server.go b/vendor/github.com/xdg/scram/server.go → vendor/github.com/xdg-go/scram/server.go
diff --git a/vendor/github.com/xdg/scram/server_conv.go → ...or/github.com/xdg-go/scram/server_conv.go b/vendor/github.com/xdg/scram/server_conv.go → ...or/github.com/xdg-go/scram/server_conv.go
diff --git a/vendor/github.com/xdg/stringprep/.gitignore → ...r/github.com/xdg-go/stringprep/.gitignore b/vendor/github.com/xdg/stringprep/.gitignore → ...r/github.com/xdg-go/stringprep/.gitignore
diff --git a/vendor/github.com/xdg-go/stringprep/CHANGELOG.md b/vendor/github.com/xdg-go/stringprep/CHANGELOG.md