summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--client/client.go2
-rw-r--r--client/client_test.go2
-rw-r--r--client/token.go2
-rw-r--r--go.mod15
-rw-r--r--go.sum14
-rw-r--r--internal/api/api.go8
-rw-r--r--internal/api/api_test.go2
-rw-r--r--internal/server/custom.go2
-rw-r--r--internal/server/institute.go2
-rw-r--r--internal/server/secureinternet.go2
-rw-r--r--internal/server/servers.go2
11 files changed, 35 insertions, 18 deletions
diff --git a/client/client.go b/client/client.go
index e3f40aa..ae468ed 100644
--- a/client/client.go
+++ b/client/client.go
@@ -22,7 +22,7 @@ import (
"codeberg.org/eduVPN/eduvpn-common/internal/server"
"codeberg.org/eduVPN/eduvpn-common/types/cookie"
srvtypes "codeberg.org/eduVPN/eduvpn-common/types/server"
- "github.com/jwijenbergh/eduoauth-go"
+ "codeberg.org/jwijenbergh/eduoauth-go/v2"
)
// CalculateGateway takes a CIDR encoded subnet `cidr` and returns the gateway and an error
diff --git a/client/client_test.go b/client/client_test.go
index 372c6c3..dd69688 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -15,7 +15,7 @@ import (
"codeberg.org/eduVPN/eduvpn-common/types/cookie"
"codeberg.org/eduVPN/eduvpn-common/types/protocol"
srvtypes "codeberg.org/eduVPN/eduvpn-common/types/server"
- "github.com/jwijenbergh/eduoauth-go"
+ "codeberg.org/jwijenbergh/eduoauth-go/v2"
)
func TestCalculateGateway(t *testing.T) {
diff --git a/client/token.go b/client/token.go
index 250173b..f4f82e2 100644
--- a/client/token.go
+++ b/client/token.go
@@ -5,7 +5,7 @@ import (
"fmt"
srvtypes "codeberg.org/eduVPN/eduvpn-common/types/server"
- "github.com/jwijenbergh/eduoauth-go"
+ "codeberg.org/jwijenbergh/eduoauth-go/v2"
)
type cacheMap map[string]eduoauth.Token
diff --git a/go.mod b/go.mod
index a00bfc7..62a7d8d 100644
--- a/go.mod
+++ b/go.mod
@@ -1,18 +1,19 @@
module codeberg.org/eduVPN/eduvpn-common
-go 1.23.4
+go 1.24.0
require (
- codeberg.org/eduVPN/proxyguard v0.0.0-20250814100601-abc5db189743
+ codeberg.org/eduVPN/proxyguard v0.0.0-20251029080421-4c455b7d31f8
github.com/jedisct1/go-minisign v0.0.0-20241212093149-d2f9f49435c7
- github.com/jwijenbergh/eduoauth-go v1.1.2
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
- golang.org/x/text v0.28.0
+ golang.org/x/text v0.34.0
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10
)
+require codeberg.org/jwijenbergh/eduoauth-go/v2 v2.0.1
+
require (
- golang.org/x/crypto v0.41.0 // indirect
- golang.org/x/net v0.43.0
- golang.org/x/sys v0.35.0 // indirect
+ golang.org/x/crypto v0.48.0 // indirect
+ golang.org/x/net v0.50.0
+ golang.org/x/sys v0.41.0 // indirect
)
diff --git a/go.sum b/go.sum
index 15dd8fe..52d390c 100644
--- a/go.sum
+++ b/go.sum
@@ -1,21 +1,31 @@
codeberg.org/eduVPN/proxyguard v0.0.0-20250814100601-abc5db189743 h1:orR4wKonLoCeKWQz3mk268ZuYOKwrIu/pdSA5Wz44Zg=
codeberg.org/eduVPN/proxyguard v0.0.0-20250814100601-abc5db189743/go.mod h1:fc7DsdgdLmrO7DN45HNp+ekVewlRcikSOkAvUeGUvWk=
+codeberg.org/eduVPN/proxyguard v0.0.0-20251029080421-4c455b7d31f8 h1:7YLmSnIa+dA0NiI2bebGVK1myRs6lXH+E3hUBC9BFHY=
+codeberg.org/eduVPN/proxyguard v0.0.0-20251029080421-4c455b7d31f8/go.mod h1:0zawOyaLRCXjJW4nJyxowjlaKpKysO53SkubXrbhr40=
+codeberg.org/jwijenbergh/eduoauth-go/v2 v2.0.1 h1:52SRBK8MRjMKq/g3ceKOQZm5tWkDA6rHn70/cLcOI0Y=
+codeberg.org/jwijenbergh/eduoauth-go/v2 v2.0.1/go.mod h1:DWKz8WdjGpxbQdlzhAG1Gi5q0ERUnu9EDruZyAgFvio=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/jedisct1/go-minisign v0.0.0-20241212093149-d2f9f49435c7 h1:FWpSWRD8FbVkKQu8M1DM9jF5oXFLyE+XpisIYfdzbic=
github.com/jedisct1/go-minisign v0.0.0-20241212093149-d2f9f49435c7/go.mod h1:BMxO138bOokdgt4UaxZiEfypcSHX0t6SIFimVP1oRfk=
-github.com/jwijenbergh/eduoauth-go v1.1.2 h1:oNcytbMKan6KARZ/RMyje4Ax3LpCNsWogJNgyy9SucQ=
-github.com/jwijenbergh/eduoauth-go v1.1.2/go.mod h1:HidfCfBBI7U0edu2f0tNM/4/kkm4pD+nrp6IlANo214=
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
+golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
+golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
+golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60=
+golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM=
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
+golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
+golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
+golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10 h1:3GDAcqdIg1ozBNLgPy4SLT84nfcBjr6rhGtXYtrkWLU=
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10/go.mod h1:T97yPqesLiNrOYxkwmhMI0ZIlJDm+p0PMR8eRVeR5tQ=
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