Skip to content

Commit

Permalink
Merge pull request #144 from stlaz/secret_compare
Browse files Browse the repository at this point in the history 
[4.12] OCPBUGS-27478: bump osin deps
  • Loading branch information
@openshift-merge-bot
openshift-merge-bot[bot] committed Apr 24, 2024
2 parents 0f83669 + d713613 commit 0c434f4
Show file tree
Hide file tree
Showing 36 changed files with 182 additions and 102 deletions.
10 changes: 3 additions & 7 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module github.com/openshift/oauth-server
go 1.19

require (
github.com/RangelReale/osincli v0.0.0
github.com/davecgh/go-spew v1.1.1
github.com/go-ldap/ldap/v3 v3.4.3
github.com/gophercloud/gophercloud v0.24.0
Expand All @@ -12,7 +11,8 @@ require (
github.com/openshift/build-machinery-go v0.0.0-20220720161851-9b4f0386f6b0
github.com/openshift/client-go v0.0.0-20220831193253-4950ae70c8ea
github.com/openshift/library-go v0.0.0-20230502133115-201a09f8bb93
github.com/openshift/osin v1.0.1-0.20180202150137-2dc1b4316769
github.com/openshift/osin v1.0.2-0.20220317075346-0f4d38c6e53f
github.com/openshift/osincli v0.0.0-20160924135400-fababb0555f2
github.com/spf13/cobra v1.4.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.1
Expand Down Expand Up @@ -113,8 +113,4 @@ require (
sigs.k8s.io/yaml v1.2.0 // indirect
)

replace (
github.com/RangelReale/osin => github.com/openshift/osin v1.0.1-0.20180202150137-2dc1b4316769
github.com/RangelReale/osincli => github.com/openshift/osincli v0.0.0-20160924135400-fababb0555f2
k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20221007080208-eb103c661ea4 // points to openshift-apiserver-4.12-kubernetes-1.25.0
)
replace k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20221007080208-eb103c661ea4 // points to openshift-apiserver-4.12-kubernetes-1.25.0
7 changes: 5 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
Expand Down Expand Up @@ -263,6 +264,7 @@ github.com/onsi/ginkgo/v2 v2.1.6 h1:Fx2POJZfKRQcM1pH49qSZiYeu319wji004qX+GDovrU=
github.com/onsi/gomega v1.20.1 h1:PA/3qinGoukvymdIDV8pii6tiZgC8kbmJO6Z5+b002Q=
github.com/openshift/api v0.0.0-20220831183848-09c070622e2c h1:7Ar64e7somcImBRqyOLJINqirHeNwB9QdBR2AUNrnPw=
github.com/openshift/api v0.0.0-20220831183848-09c070622e2c/go.mod h1:9JWn+H7X8wEPPc9D63krigXl8r3F1Mt6/lC98brUyhQ=
github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/build-machinery-go v0.0.0-20220720161851-9b4f0386f6b0 h1:ucmy9vO5mJToDExXpfBZ80XOufC9g919NsYFvO6D6CY=
github.com/openshift/build-machinery-go v0.0.0-20220720161851-9b4f0386f6b0/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/client-go v0.0.0-20220831193253-4950ae70c8ea h1:7JbjIzWt3Q75ErY1PAZ+gCA+bErI6HSlpffHFmMMzqM=
Expand All @@ -271,8 +273,8 @@ github.com/openshift/kubernetes-apiserver v0.0.0-20221007080208-eb103c661ea4 h1:
github.com/openshift/kubernetes-apiserver v0.0.0-20221007080208-eb103c661ea4/go.mod h1:30r7xyQTREWCkG2uSjgjhQcKVvAAlqoD+YyrqR6Cn+I=
github.com/openshift/library-go v0.0.0-20230502133115-201a09f8bb93 h1:vDp16mfmXyS0pterCWvWULSpG5GyOxfBvzxYyT8XZ/8=
github.com/openshift/library-go v0.0.0-20230502133115-201a09f8bb93/go.mod h1:KPBAXGaq7pPmA+1wUVtKr5Axg3R68IomWDkzaOxIhxM=
github.com/openshift/osin v1.0.1-0.20180202150137-2dc1b4316769 h1:jTaxjdXcD89WEuNXU/R+ByAMhcI3ETa6Y/o4V9v0s9Q=
github.com/openshift/osin v1.0.1-0.20180202150137-2dc1b4316769/go.mod h1:/gGuqQHvGNST0GB+Pomi3398FTdcM+9UaXafpqHvfDM=
github.com/openshift/osin v1.0.2-0.20220317075346-0f4d38c6e53f h1:4da9vH8eDlJo58703cADj3FlsdnFRgsnfuwj/4lYXfY=
github.com/openshift/osin v1.0.2-0.20220317075346-0f4d38c6e53f/go.mod h1:DoYehsADYGKlXTIvqyZVnopfJbWgT6UsQYf8ETt1vjw=
github.com/openshift/osincli v0.0.0-20160924135400-fababb0555f2 h1:9oADVMmPa4G60MQtoSjD26aD/vZreqbIAfiUiO220eY=
github.com/openshift/osincli v0.0.0-20160924135400-fababb0555f2/go.mod h1:Riv9DbfKiX3y9ebcS4PHU4zLhVXu971+4jCVwKIue5M=
github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=
Expand Down Expand Up @@ -706,6 +708,7 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
gopkg.in/square/go-jose.v1 v1.1.2/go.mod h1:QpYS+a4WhS+DTlyQIi6Ka7MS3SuR9a055rgXNEe6EiA=
gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI=
gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
Expand Down
2 changes: 1 addition & 1 deletion pkg/oauth/external/github/github.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"k8s.io/apimachinery/pkg/util/sets"

"github.com/RangelReale/osincli"
"github.com/openshift/osincli"
"k8s.io/klog/v2"

"github.com/openshift/oauth-server/pkg/api"
Expand Down
2 changes: 1 addition & 1 deletion pkg/oauth/external/github/github_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"net/http"
"testing"

"github.com/RangelReale/osincli"
"github.com/openshift/oauth-server/pkg/api"
"github.com/openshift/osincli"
)

func TestGetUserIdentity(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/oauth/external/gitlab/gitlab_oauth.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"net/http"
"net/url"

"github.com/RangelReale/osincli"
"github.com/openshift/osincli"
"k8s.io/klog/v2"

authapi "github.com/openshift/oauth-server/pkg/api"
Expand Down
2 changes: 1 addition & 1 deletion pkg/oauth/external/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"net/http"
"net/url"

"github.com/RangelReale/osincli"
"github.com/openshift/osincli"
"k8s.io/klog/v2"

"k8s.io/apiserver/pkg/authentication/authenticator"
Expand Down
2 changes: 1 addition & 1 deletion pkg/oauth/external/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"testing"
"time"

"github.com/RangelReale/osincli"
"github.com/openshift/oauth-server/pkg/api"
"github.com/openshift/oauth-server/pkg/oauth/handlers"
"github.com/openshift/oauth-server/pkg/server/csrf"
"github.com/openshift/osincli"
auditapi "k8s.io/apiserver/pkg/apis/audit"
"k8s.io/apiserver/pkg/audit"
"k8s.io/apiserver/pkg/authentication/user"
Expand Down
2 changes: 1 addition & 1 deletion pkg/oauth/external/interfaces.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ package external
import (
"net/http"

"github.com/RangelReale/osincli"
authapi "github.com/openshift/oauth-server/pkg/api"
"github.com/openshift/osincli"
)

// Provider encapsulates the URLs, configuration, any custom authorize request parameters, and
Expand Down
2 changes: 1 addition & 1 deletion pkg/oauth/external/openid/openid.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"net/url"
"strings"

"github.com/RangelReale/osincli"
"github.com/openshift/osincli"
"k8s.io/klog/v2"

"k8s.io/apimachinery/pkg/util/sets"
Expand Down
2 changes: 1 addition & 1 deletion pkg/oauth/registry/registry_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"net/http/httptest"
"testing"

"github.com/RangelReale/osincli"
"github.com/openshift/osin"
"github.com/openshift/osincli"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion pkg/oauthserver/auth.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"net/url"
"path"

"github.com/RangelReale/osincli"
"github.com/openshift/osin"
"github.com/openshift/osincli"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
knet "k8s.io/apimachinery/pkg/util/net"
Expand Down
2 changes: 1 addition & 1 deletion pkg/osinserver/osinserver_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"net/http/httptest"
"testing"

"github.com/RangelReale/osincli"
"github.com/openshift/osin"
"github.com/openshift/osincli"
"golang.org/x/oauth2"

"github.com/openshift/oauth-server/pkg/osinserver/teststorage"
Expand Down
5 changes: 3 additions & 2 deletions pkg/server/logout/logout.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"k8s.io/apiserver/pkg/authentication/user"

"github.com/openshift/oauth-server/pkg"
oauthserver "github.com/openshift/oauth-server/pkg"
"github.com/openshift/oauth-server/pkg/server/redirect"
"github.com/openshift/oauth-server/pkg/server/session"
)
Expand Down Expand Up @@ -62,5 +62,6 @@ func (l *logout) isValidRedirect(then string) bool {
return true
}

return osin.ValidateUri(l.redirect, then) == nil
_, err := osin.ValidateUri(l.redirect, then)
return err == nil
}
2 changes: 1 addition & 1 deletion pkg/server/tokenrequest/tokenrequest.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"net/url"
"path"

"github.com/RangelReale/osincli"
"github.com/openshift/osincli"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
Expand Down
5 changes: 5 additions & 0 deletions vendor/github.com/openshift/osin/CHANGELOG
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions vendor/github.com/openshift/osin/Makefile
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions vendor/github.com/openshift/osin/OWNERS
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions vendor/github.com/openshift/osin/README.md
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 18 additions & 16 deletions vendor/github.com/openshift/osin/access.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 0c434f4

Please sign in to comment.