Switch to cli/browser (#86)

mbilski · web-flow · commit b9fe101bba1e · 2023-11-02T12:51:42.000+01:00
diff --git a/Makefile b/Makefile
@@ -8,6 +8,6 @@ test:
 	go test ./...
 
 lint:
-	docker run --rm -v $(shell pwd):/app -w /app golangci/golangci-lint:v1.50.1 golangci-lint run
+	docker run --rm -v $(shell pwd):/app -w /app golangci/golangci-lint:v1.55.1 golangci-lint run
 
 all: build test lint
diff --git a/cmd/docs.go b/cmd/docs.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/pkg/browser"
+	"github.com/cli/browser"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/oauth2.go b/cmd/oauth2.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/cloudentity/oauth2c/internal/oauth2"
 	"github.com/imdario/mergo"
-	"github.com/pkg/browser"
+	"github.com/cli/browser"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/oauth2_authorize_code.go b/cmd/oauth2_authorize_code.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	"github.com/cloudentity/oauth2c/internal/oauth2"
-	"github.com/pkg/browser"
+	"github.com/cli/browser"
 )
 
 func (c *OAuth2Cmd) AuthorizationCodeGrantFlow(clientConfig oauth2.ClientConfig, serverConfig oauth2.ServerConfig, hc *http.Client) error {
diff --git a/cmd/oauth2_device.go b/cmd/oauth2_device.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/cloudentity/oauth2c/internal/oauth2"
-	"github.com/pkg/browser"
+	"github.com/cli/browser"
 )
 
 func (c *OAuth2Cmd) DeviceGrantFlow(clientConfig oauth2.ClientConfig, serverConfig oauth2.ServerConfig, hc *http.Client) error {
diff --git a/cmd/oauth2_implicit.go b/cmd/oauth2_implicit.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/cloudentity/oauth2c/internal/oauth2"
-	"github.com/pkg/browser"
+	"github.com/cli/browser"
 )
 
 func (c *OAuth2Cmd) ImplicitGrantFlow(clientConfig oauth2.ClientConfig, serverConfig oauth2.ServerConfig, hc *http.Client) error {
diff --git a/go.mod b/go.mod
@@ -1,8 +1,9 @@
 module github.com/cloudentity/oauth2c
 
-go 1.19
+go 1.21
 
 require (
+	github.com/cli/browser v1.3.1-0.20231006085632-b393df5d7bfa
 	github.com/go-jose/go-jose/v3 v3.0.0
 	github.com/golang-jwt/jwt/v4 v4.4.3
 	github.com/google/uuid v1.3.0
@@ -11,7 +12,6 @@ require (
 	github.com/imdario/mergo v0.3.13
 	github.com/itchyny/gojq v0.12.10
 	github.com/lithammer/shortuuid/v4 v4.0.0
-	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
 	github.com/pkg/errors v0.9.1
 	github.com/pterm/pterm v0.12.42
 	github.com/spf13/cobra v1.5.0
@@ -35,7 +35,7 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
 	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
-	golang.org/x/sys v0.2.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/text v0.3.8 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
diff --git a/go.sum b/go.sum
@@ -11,6 +11,8 @@ github.com/MarvinJWendt/testza v0.3.0/go.mod h1:eFcL4I0idjtIx8P9C6KkAuLgATNKpX4/
 github.com/MarvinJWendt/testza v0.4.2 h1:Vbw9GkSB5erJI2BPnBL9SVGV9myE+XmUSFahBGUhW2Q=
 github.com/MarvinJWendt/testza v0.4.2/go.mod h1:mSdhXiKH8sg/gQehJ63bINcCKp7RtYewEjXsvsVUPbE=
 github.com/atomicgo/cursor v0.0.1/go.mod h1:cBON2QmmrysudxNBFthvMtN32r3jxVRIvzkUiF/RuIk=
+github.com/cli/browser v1.3.1-0.20231006085632-b393df5d7bfa h1:TwQMqyL9qyLKVLfsx7bVC1JxMcFjGxdfio4Ttsp2pEc=
+github.com/cli/browser v1.3.1-0.20231006085632-b393df5d7bfa/go.mod h1:HH8s+fOAxjhQoBUAsKuPCbqUuxZDhQ2/aD+SzsEfBTk=
 github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw=
 github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
@@ -23,6 +25,7 @@ github.com/golang-jwt/jwt/v4 v4.4.3 h1:Hxl6lhQFj4AnOX6MLrsCb/+7tCj7DxP7VA+2rDIq5
 github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M=
+github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gookit/color v1.4.2/go.mod h1:fqRyamkC1W8uxl+lxCQxOT09l/vYfZ+QeiX3rKQHCoQ=
@@ -58,8 +61,6 @@ github.com/lithammer/shortuuid/v4 v4.0.0/go.mod h1:Zs8puNcrvf2rV9rTH51ZLLcj7ZXqQ
 github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
 github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
-github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -105,11 +106,10 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
-golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
diff --git a/internal/oauth2/crypto.go b/internal/oauth2/crypto.go
@@ -5,8 +5,10 @@ import (
 	"time"
 )
 
+var r *rand.Rand
+
 func init() {
-	rand.Seed(time.Now().UnixNano())
+	r = rand.New(rand.NewSource(time.Now().UnixNano()))
 }
 
 var letter = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
@@ -15,7 +17,7 @@ func RandomString(n int) string {
 	b := make([]rune, n)
 
 	for i := range b {
-		b[i] = letter[rand.Intn(len(letter))]
+		b[i] = letter[r.Intn(len(letter))]
 	}
 
 	return string(b)

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package cmd`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/pkg/browser"`
	`4`	`+ "github.com/cli/browser"`
`5`	`5`	`"github.com/spf13/cobra"`
`6`	`6`	`)`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`
`15`	`15`	`"github.com/cloudentity/oauth2c/internal/oauth2"`
`16`	`16`	`"github.com/imdario/mergo"`
`17`		`- "github.com/pkg/browser"`
	`17`	`+ "github.com/cli/browser"`
`18`	`18`	`"github.com/spf13/cobra"`
`19`	`19`	`)`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"net/http"`
`6`	`6`
`7`	`7`	`"github.com/cloudentity/oauth2c/internal/oauth2"`
`8`		`- "github.com/pkg/browser"`
	`8`	`+ "github.com/cli/browser"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func (c OAuth2Cmd) AuthorizationCodeGrantFlow(clientConfig oauth2.ClientConfig, serverConfig oauth2.ServerConfig, hc http.Client) error {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"time"`
`8`	`8`
`9`	`9`	`"github.com/cloudentity/oauth2c/internal/oauth2"`
`10`		`- "github.com/pkg/browser"`
	`10`	`+ "github.com/cli/browser"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func (c OAuth2Cmd) DeviceGrantFlow(clientConfig oauth2.ClientConfig, serverConfig oauth2.ServerConfig, hc http.Client) error {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"net/http"`
`5`	`5`
`6`	`6`	`"github.com/cloudentity/oauth2c/internal/oauth2"`
`7`		`- "github.com/pkg/browser"`
	`7`	`+ "github.com/cli/browser"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func (c OAuth2Cmd) ImplicitGrantFlow(clientConfig oauth2.ClientConfig, serverConfig oauth2.ServerConfig, hc http.Client) error {`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,10 @@ import (`
`5`	`5`	`"time"`
`6`	`6`	`)`
`7`	`7`
	`8`	`+var r *rand.Rand`
	`9`	`+`
`8`	`10`	`func init() {`
`9`		`- rand.Seed(time.Now().UnixNano())`
	`11`	`+ r = rand.New(rand.NewSource(time.Now().UnixNano()))`
`10`	`12`	`}`
`11`	`13`
`12`	`14`	`var letter = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")`
`@@ -15,7 +17,7 @@ func RandomString(n int) string {`
`15`	`17`	`b := make([]rune, n)`
`16`	`18`
`17`	`19`	`for i := range b {`
`18`		`- b[i] = letter[rand.Intn(len(letter))]`
	`20`	`+ b[i] = letter[r.Intn(len(letter))]`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`return string(b)`