diff options
| author | jwijenbergh <jeroenwijenbergh@protonmail.com> | 2022-10-19 17:55:53 +0200 |
|---|---|---|
| committer | jwijenbergh <jeroenwijenbergh@protonmail.com> | 2022-10-19 17:55:53 +0200 |
| commit | 8fa80e56e014d9a77cfb337b2a2b641f1532ff8e (patch) | |
| tree | e7a406a0b8cb05c3b232dd828dc6a5d974ca2fcb /internal/oauth | |
| parent | 7260aa0cd70195a4679ca3c94204d9e618f947f2 (diff) | |
OAuth + Server: Fix ISS for secure internet
The wrong base url was used. Use the one from the home server NOT the
current location
Diffstat (limited to 'internal/oauth')
| -rw-r--r-- | internal/oauth/oauth.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/internal/oauth/oauth.go b/internal/oauth/oauth.go index df29a9c..4bccdf5 100644 --- a/internal/oauth/oauth.go +++ b/internal/oauth/oauth.go @@ -71,6 +71,7 @@ func genVerifier() (string, error) { } type OAuth struct { + ISS string `json:"iss"` Session OAuthExchangeSession `json:"-"` Token OAuthToken `json:"token"` BaseAuthorizationURL string `json:"base_authorization_url"` @@ -363,7 +364,8 @@ func (oauth *OAuth) Callback(w http.ResponseWriter, req *http.Request) { } } -func (oauth *OAuth) Init(baseAuthorizationURL string, tokenURL string) { +func (oauth *OAuth) Init(iss string, baseAuthorizationURL string, tokenURL string) { + oauth.ISS = iss oauth.BaseAuthorizationURL = baseAuthorizationURL oauth.TokenURL = tokenURL } @@ -378,7 +380,7 @@ func (oauth OAuth) GetListenerPort() (int, error) { } // Starts the OAuth exchange for eduvpn. -func (oauth *OAuth) GetAuthURL(name string, iss string, postProcessAuth func(string) string) (string, error) { +func (oauth *OAuth) GetAuthURL(name string, postProcessAuth func(string) string) (string, error) { errorMessage := "failed starting OAuth exchange" // Generate the verifier and challenge @@ -395,7 +397,7 @@ func (oauth *OAuth) GetAuthURL(name string, iss string, postProcessAuth func(str } // Fill the struct with the necessary fields filled for the next call to getting the HTTP client - oauthSession := OAuthExchangeSession{ClientID: name, ISS: iss, State: state, Verifier: verifier} + oauthSession := OAuthExchangeSession{ClientID: name, ISS: oauth.ISS, State: state, Verifier: verifier} oauth.Session = oauthSession // set up the listener to get the redirect URI |