diff options
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/api/api.go | 8 | ||||
| -rw-r--r-- | internal/api/api_test.go | 2 | ||||
| -rw-r--r-- | internal/server/custom.go | 2 | ||||
| -rw-r--r-- | internal/server/institute.go | 2 | ||||
| -rw-r--r-- | internal/server/secureinternet.go | 2 | ||||
| -rw-r--r-- | internal/server/servers.go | 2 |
6 files changed, 12 insertions, 6 deletions
diff --git a/internal/api/api.go b/internal/api/api.go index c34a0b0..0d8e03c 100644 --- a/internal/api/api.go +++ b/internal/api/api.go @@ -11,7 +11,7 @@ import ( "net/url" "time" - "github.com/jwijenbergh/eduoauth-go" + "codeberg.org/jwijenbergh/eduoauth-go/v2" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "codeberg.org/eduVPN/eduvpn-common/internal/api/endpoints" @@ -75,6 +75,11 @@ func NewAPI(ctx context.Context, clientID string, sd ServerData, cb Callbacks, t // Construct OAuth transp := sd.Transport() + post := true + // we do not support non-loopback clients with response_mode form_post + if cr != "" { + post = false + } o := eduoauth.OAuth{ ClientID: clientID, EndpointFunc: func(ctx context.Context) (*eduoauth.EndpointResponse, error) { @@ -88,6 +93,7 @@ func NewAPI(ctx context.Context, clientID string, sd ServerData, cb Callbacks, t }, nil }, CustomRedirect: cr, + FormPost: post, RedirectPath: "/callback", TokensUpdated: func(tok eduoauth.Token) { cb.TokensUpdated(sd.ID, sd.Type, tok) diff --git a/internal/api/api_test.go b/internal/api/api_test.go index 6ad70f6..e88e816 100644 --- a/internal/api/api_test.go +++ b/internal/api/api_test.go @@ -20,7 +20,7 @@ import ( "codeberg.org/eduVPN/eduvpn-common/internal/test" "codeberg.org/eduVPN/eduvpn-common/types/protocol" "codeberg.org/eduVPN/eduvpn-common/types/server" - "github.com/jwijenbergh/eduoauth-go" + "codeberg.org/jwijenbergh/eduoauth-go/v2" ) func tokenHandler(t *testing.T, gt []string) func(http.ResponseWriter, *http.Request) { diff --git a/internal/server/custom.go b/internal/server/custom.go index 0940084..a9a26b9 100644 --- a/internal/server/custom.go +++ b/internal/server/custom.go @@ -8,7 +8,7 @@ import ( "codeberg.org/eduVPN/eduvpn-common/internal/api" "codeberg.org/eduVPN/eduvpn-common/internal/config/v2" "codeberg.org/eduVPN/eduvpn-common/types/server" - "github.com/jwijenbergh/eduoauth-go" + "codeberg.org/jwijenbergh/eduoauth-go/v2" ) // AddCustom adds a custom server to the internal server list diff --git a/internal/server/institute.go b/internal/server/institute.go index 0a7ef3a..c357a4d 100644 --- a/internal/server/institute.go +++ b/internal/server/institute.go @@ -9,7 +9,7 @@ import ( "codeberg.org/eduVPN/eduvpn-common/internal/config/v2" "codeberg.org/eduVPN/eduvpn-common/internal/discovery" "codeberg.org/eduVPN/eduvpn-common/types/server" - "github.com/jwijenbergh/eduoauth-go" + "codeberg.org/jwijenbergh/eduoauth-go/v2" ) // AddInstitute adds an institute access server diff --git a/internal/server/secureinternet.go b/internal/server/secureinternet.go index 18a5e78..d25750f 100644 --- a/internal/server/secureinternet.go +++ b/internal/server/secureinternet.go @@ -12,7 +12,7 @@ import ( "codeberg.org/eduVPN/eduvpn-common/internal/config/v2" "codeberg.org/eduVPN/eduvpn-common/internal/discovery" "codeberg.org/eduVPN/eduvpn-common/types/server" - "github.com/jwijenbergh/eduoauth-go" + "codeberg.org/jwijenbergh/eduoauth-go/v2" ) // ReplaceWAYF replaces an authorization template containing of @RETURN_TO@ and @ORG_ID@ with the authorization URL and the organization ID diff --git a/internal/server/servers.go b/internal/server/servers.go index 60b9277..bd22ffd 100644 --- a/internal/server/servers.go +++ b/internal/server/servers.go @@ -9,7 +9,7 @@ import ( "codeberg.org/eduVPN/eduvpn-common/internal/config/v2" "codeberg.org/eduVPN/eduvpn-common/internal/discovery" srvtypes "codeberg.org/eduVPN/eduvpn-common/types/server" - "github.com/jwijenbergh/eduoauth-go" + "codeberg.org/jwijenbergh/eduoauth-go/v2" ) // Callbacks defines the interface for doing certain callback operations |