summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--client/client.go54
-rw-r--r--client/discovery.go36
-rw-r--r--exports/exports.go22
-rw-r--r--internal/discovery/discovery.go59
-rw-r--r--internal/discovery/manager.go92
-rw-r--r--internal/server/institute.go10
-rw-r--r--internal/server/secureinternet.go31
-rw-r--r--internal/server/servers.go10
-rw-r--r--wrappers/python/eduvpn_common/loader.py1
-rw-r--r--wrappers/python/eduvpn_common/main.py6
10 files changed, 72 insertions, 249 deletions
diff --git a/client/client.go b/client/client.go
index eb00a16..69664e2 100644
--- a/client/client.go
+++ b/client/client.go
@@ -81,7 +81,7 @@ type Client struct {
mu sync.Mutex
- discoMan *discovery.Manager
+ disco *discovery.Discovery
}
// GettingConfig is defined here to satisfy the server.Callbacks interface
@@ -184,23 +184,20 @@ func New(name string, version string, directory string, stateCallback func(FSMSt
// set the servers
c.Servers = server.NewServers(c.Name, c, c.cfg.V2)
- c.discoMan = discovery.NewManager(c.cfg.Discovery())
+ c.disco = c.cfg.Discovery()
if !c.hasDiscovery() {
return c, nil
}
- disco, release := c.discoMan.Discovery(true)
- defer release()
-
- err = disco.Fill()
+ err = c.disco.Fill()
if err != nil {
slog.Warn("failed filling discovery cache", "error", err)
}
- disco.MarkServersExpired()
+ c.disco.MarkServersExpired()
if !c.cfg.HasSecureInternet() {
- disco.MarkOrganizationsExpired()
+ c.disco.MarkOrganizationsExpired()
}
return c, nil
@@ -285,9 +282,6 @@ func (c *Client) Register() error {
// Deregister 'deregisters' the client, meaning saving the log file and the config and emptying out the client struct.
func (c *Client) Deregister() {
- c.discoMan.Cancel()
-
- _, release := c.discoMan.Discovery(false)
// save the config
c.TrySave()
@@ -301,7 +295,6 @@ func (c *Client) Deregister() {
if c.logr != nil {
_ = c.logr.Close()
}
- release()
// Empty out the state
*c = Client{}
@@ -327,9 +320,7 @@ func (c *Client) ExpiryTimes() (*srvtypes.Expiry, error) {
}
func (c *Client) locationCallback(ck *cookie.Cookie, orgID string) error {
- disco, release := c.discoMan.Discovery(false)
- locs := disco.SecureLocationList()
- release()
+ locs := c.disco.SecureLocationList()
errChan := make(chan error)
go func() {
err := c.FSM.GoTransitionRequired(StateAskLocation, &srvtypes.RequiredAskTransition{
@@ -408,12 +399,12 @@ func (c *Client) AddServer(ck *cookie.Cookie, identifier string, _type srvtypes.
switch _type {
case srvtypes.TypeInstituteAccess:
- err = c.Servers.AddInstitute(ck.Context(), c.discoMan, identifier, ot)
+ err = c.Servers.AddInstitute(ck.Context(), c.disco, identifier, ot)
if err != nil {
return i18nerr.Wrapf(err, "Failed to add an institute access server with URL: '%s'", identifier)
}
case srvtypes.TypeSecureInternet:
- err = c.Servers.AddSecure(ck.Context(), c.discoMan, identifier, ot)
+ err = c.Servers.AddSecure(ck.Context(), c.disco, identifier, ot)
if err != nil {
return i18nerr.Wrapf(err, "Failed to add a secure internet server with organisation ID: '%s'", identifier)
}
@@ -479,34 +470,29 @@ func (c *Client) GetConfig(ck *cookie.Cookie, identifier string, _type srvtypes.
ctx := ck.Context()
if _type != srvtypes.TypeCustom {
- disco, release := c.discoMan.Discovery(true)
- // make sure the servers are fetched fresh
- _, _, dserverr := disco.Servers(ctx, false)
+ _, _, dserverr := c.disco.Servers(ctx, false)
if dserverr != nil {
slog.Warn("failed to fetch server discovery when getting config", "error", dserverr)
}
- release()
}
var srv *server.Server
switch _type {
case srvtypes.TypeInstituteAccess:
- srv, err = c.Servers.GetInstitute(ctx, identifier, c.discoMan, tok, startup)
+ srv, err = c.Servers.GetInstitute(ctx, identifier, c.disco, tok, startup)
case srvtypes.TypeSecureInternet:
- disco, release := c.discoMan.Discovery(true)
// make sure the organizations are fetched if they need an update
- _, _, dorgerr := disco.Organizations(ctx, false)
+ _, _, dorgerr := c.disco.Organizations(ctx, false)
if dorgerr != nil {
slog.Warn("failed to fetch organization discovery when getting config", "error", dorgerr)
}
- release()
- srv, err = c.Servers.GetSecure(ctx, identifier, c.discoMan, tok, startup)
+ srv, err = c.Servers.GetSecure(ctx, identifier, c.disco, tok, startup)
var cErr *discovery.ErrCountryNotFound
if errors.As(err, &cErr) {
err = c.locationCallback(ck, identifier)
if err == nil {
- srv, err = c.Servers.GetSecure(ctx, identifier, c.discoMan, tok, startup)
+ srv, err = c.Servers.GetSecure(ctx, identifier, c.disco, tok, startup)
}
}
case srvtypes.TypeCustom:
@@ -541,10 +527,8 @@ func (c *Client) RemoveServer(identifier string, _type srvtypes.Type) (err error
if err != nil {
return i18nerr.WrapInternalf(err, "Failed to remove server: '%s'", identifier)
}
- disco, release := c.discoMan.Discovery(true)
- defer release()
if _type == srvtypes.TypeSecureInternet {
- disco.MarkOrganizationsExpired()
+ c.disco.MarkOrganizationsExpired()
}
c.TrySave()
return nil
@@ -552,7 +536,7 @@ func (c *Client) RemoveServer(identifier string, _type srvtypes.Type) (err error
// CurrentServer gets the current server that is configured
func (c *Client) CurrentServer() (*srvtypes.Current, error) {
- curr, err := c.Servers.PublicCurrent(c.discoMan)
+ curr, err := c.Servers.PublicCurrent(c.disco)
if err != nil {
return nil, i18nerr.WrapInternal(err, "The current server could not be retrieved")
}
@@ -602,7 +586,7 @@ func (c *Client) Cleanup(ck *cookie.Cookie) error {
if err != nil {
return i18nerr.WrapInternal(err, "No OAuth tokens were found when cleaning up the connection")
}
- auth, err := srv.ServerWithCallbacks(ck.Context(), c.discoMan, tok, true)
+ auth, err := srv.ServerWithCallbacks(ck.Context(), c.disco, tok, true)
if err != nil {
return i18nerr.WrapInternal(err, "The server was unable to be retrieved when cleaning up the connection")
}
@@ -653,7 +637,7 @@ func (c *Client) RenewSession(ck *cookie.Cookie) error {
previousState := c.FSM.Current
// getting a server with no tokens means re-authorize
- _, err = srv.ServerWithCallbacks(ck.Context(), c.discoMan, nil, false)
+ _, err = srv.ServerWithCallbacks(ck.Context(), c.disco, nil, false)
if err != nil {
c.FSM.GoTransition(previousState) //nolint:errcheck
return i18nerr.WrapInternal(err, "The server was unable to be retrieved when renewing the session")
@@ -675,8 +659,6 @@ func (c *Client) StartFailover(ck *cookie.Cookie, gateway string, mtu int, readR
// ServerList gets the list of servers
func (c *Client) ServerList() (*srvtypes.List, error) {
- disco, release := c.discoMan.Discovery(false)
- defer release()
- g := c.cfg.V2.PublicList(disco)
+ g := c.cfg.V2.PublicList(c.disco)
return g, nil
}
diff --git a/client/discovery.go b/client/discovery.go
index 802fe48..562315b 100644
--- a/client/discovery.go
+++ b/client/discovery.go
@@ -1,7 +1,6 @@
package client
import (
- "context"
"sort"
"strings"
@@ -26,10 +25,7 @@ func (c *Client) DiscoOrganizations(ck *cookie.Cookie, cache bool, search string
return nil, i18nerr.NewInternal("Organization discovery with this client ID is not supported")
}
- disco, release := c.discoMan.Discovery(true)
- defer release()
-
- orgs, fresh, err := disco.Organizations(ck.Context(), cache)
+ orgs, fresh, err := c.disco.Organizations(ck.Context(), cache)
if fresh {
defer c.TrySave()
}
@@ -76,9 +72,7 @@ func (c *Client) DiscoServers(ck *cookie.Cookie, cache bool, search string) (*di
return nil, i18nerr.NewInternal("Server discovery with this client ID is not supported")
}
- disco, release := c.discoMan.Discovery(true)
- defer release()
- servs, fresh, err := disco.Servers(ck.Context(), cache)
+ servs, fresh, err := c.disco.Servers(ck.Context(), cache)
if fresh {
defer c.TrySave()
}
@@ -113,29 +107,3 @@ func (c *Client) DiscoServers(ck *cookie.Cookie, cache bool, search string) (*di
List: retServs,
}, err
}
-
-// DiscoveryStartup gets the discovery when the client is just starting up
-// cb is called when discovery has finished in the background
-func (c *Client) DiscoveryStartup(cb func()) error {
- // Not supported with Let's Connect! & govVPN
- if !c.hasDiscovery() {
- return i18nerr.NewInternal("Server/organization discovery startup with this client ID is not supported")
- }
-
- fcb := func() {
- if cb == nil {
- return
- }
-
- c.mu.Lock()
- defer c.mu.Unlock()
-
- if c.FSM.Current != StateMain {
- return
- }
-
- cb()
- }
- c.discoMan.Startup(context.Background(), fcb)
- return nil
-}
diff --git a/exports/exports.go b/exports/exports.go
index 931bed5..0eae802 100644
--- a/exports/exports.go
+++ b/exports/exports.go
@@ -946,28 +946,6 @@ func getCookie(c C.uintptr_t) (*cookie.Cookie, error) {
return v, nil
}
-// DiscoveryStartup does a discovery request in the background.
-//
-// - The `refresh` argument is a callback that is called when the refreshing is done.
-//
-// When this callback is thus called, the app SHOULD refresh the server list of the already configured servers.
-// This DiscoveryStartup function MUST be called after calling `Register`.
-//
-//export DiscoveryStartup
-func DiscoveryStartup(refresh C.RefreshList) *C.char {
- state, stateErr := getVPNState()
- if stateErr != nil {
- return getCError(stateErr)
- }
- startupErr := state.DiscoveryStartup(func() {
- if refresh == nil {
- return
- }
- C.call_refresh_list(refresh)
- })
- return getCError(startupErr)
-}
-
// SetTokenHandler sets the token getters and token setters for OAuth.
//
// Because the data that is saved does not contain OAuth tokens for server, the common lib asks and sets the tokens using these callback functions.
diff --git a/internal/discovery/discovery.go b/internal/discovery/discovery.go
index 80a69eb..512756b 100644
--- a/internal/discovery/discovery.go
+++ b/internal/discovery/discovery.go
@@ -8,6 +8,7 @@ import (
"fmt"
"log/slog"
"net/http"
+ "sync"
"time"
httpw "codeberg.org/eduVPN/eduvpn-common/internal/http"
@@ -83,6 +84,8 @@ func (s *Server) Score(search string) int {
// Discovery is the main structure used for this package.
type Discovery struct {
+ // mu is the read write mutex that protects the struct from concurrent access
+ mu sync.RWMutex
// The httpClient for sending HTTP requests
httpClient *httpw.Client
@@ -174,23 +177,27 @@ func (discovery *Discovery) file(ctx context.Context, jsonFile string, previousV
// MarkOrganizationsExpired marks the organizations as expired
func (discovery *Discovery) MarkOrganizationsExpired() {
+ discovery.mu.Lock()
+ defer discovery.mu.Unlock()
// Re-initialize the timestamp to zero
discovery.OrganizationList.Timestamp = time.Time{}
}
// MarkServersExpired marks the servers as expired
func (discovery *Discovery) MarkServersExpired() {
+ discovery.mu.Lock()
+ defer discovery.mu.Unlock()
// Re-initialize the timestamp to zero
discovery.ServerList.Timestamp = time.Time{}
}
-// DetermineOrganizationsUpdate returns a boolean indicating whether or not the discovery organizations should be updated
+// determineOrganizationsUpdate returns a boolean indicating whether or not the discovery organizations should be updated
// https://github.com/eduvpn/documentation/blob/v3/SERVER_DISCOVERY.md
// - [IMPLEMENTED] on "first launch" when offering the search for "Institute Access" and "Organizations";
// - [IMPLEMENTED in client/client.go and here] when the user tries to add new server AND the user did NOT yet choose an organization before; Implemented in Register()
// - [IMPLEMENTED in client/client.go] when the authorization for the server associated with an already chosen organization is triggered, e.g. after expiry or revocation.
// - [IMPLEMENTED here] NOTE: when the org_id that the user chose previously is no longer available in organization_list.json the application should ask the user to choose their organization (again). This can occur for example when the organization replaced their identity provider, uses a different domain after rebranding or simply ceased to exist.
-func (discovery *Discovery) DetermineOrganizationsUpdate() bool {
+func (discovery *Discovery) determineOrganizationsUpdate() bool {
if discovery.OrganizationList.Timestamp.IsZero() {
return true
}
@@ -202,6 +209,8 @@ func (discovery *Discovery) DetermineOrganizationsUpdate() bool {
// SecureLocationList returns a slice of all the available locations.
func (discovery *Discovery) SecureLocationList() []string {
+ discovery.mu.RLock()
+ defer discovery.mu.RUnlock()
var loc []string
for _, srv := range discovery.ServerList.List {
if srv.Type == "secure_internet" {
@@ -217,6 +226,8 @@ func (discovery *Discovery) ServerByURL(
baseURL string,
srvType string,
) (*Server, error) {
+ discovery.mu.RLock()
+ defer discovery.mu.RUnlock()
for _, currentServer := range discovery.ServerList.List {
if currentServer.BaseURL == baseURL && currentServer.Type == srvType {
return &currentServer, nil
@@ -237,6 +248,8 @@ func (cnf *ErrCountryNotFound) Error() string {
// ServerByCountryCode returns the discovery server by the country code
// An error is returned if and only if nil is returned for the server.
func (discovery *Discovery) ServerByCountryCode(countryCode string) (*Server, error) {
+ discovery.mu.RLock()
+ defer discovery.mu.RUnlock()
for _, srv := range discovery.ServerList.List {
if srv.CountryCode == countryCode && srv.Type == "secure_internet" {
return &srv, nil
@@ -261,8 +274,10 @@ func (discovery *Discovery) orgByID(orgID string) (*Organization, error) {
// - The secure internet server itself
// An error is returned if and only if nil is returned for the organization.
func (discovery *Discovery) SecureHomeArgs(orgID string) (*Organization, *Server, error) {
+ discovery.mu.RLock()
org, err := discovery.orgByID(orgID)
if err != nil {
+ discovery.mu.RUnlock()
discovery.MarkOrganizationsExpired()
return nil, nil, err
}
@@ -270,17 +285,19 @@ func (discovery *Discovery) SecureHomeArgs(orgID string) (*Organization, *Server
// Get a server with the base url
srv, err := discovery.ServerByURL(org.SecureInternetHome, "secure_internet")
if err != nil {
+ discovery.mu.RUnlock()
discovery.MarkOrganizationsExpired()
return nil, nil, err
}
+ discovery.mu.RUnlock()
return org, srv, nil
}
-// DetermineServersUpdate returns whether or not the discovery servers should be updated by contacting the discovery server
+// determineServersUpdate returns whether or not the discovery servers should be updated by contacting the discovery server
// https://github.com/eduvpn/documentation/blob/v3/SERVER_DISCOVERY.md
// - [Implemented] The application MUST always fetch the server_list.json at application start.
// - The application MAY refresh the server_list.json periodically, e.g. once every hour.
-func (discovery *Discovery) DetermineServersUpdate() bool {
+func (discovery *Discovery) determineServersUpdate() bool {
// No servers, we should update
if discovery.ServerList.Timestamp.IsZero() {
return true
@@ -305,9 +322,14 @@ func (discovery *Discovery) cachedOrgs() *Organizations {
// If there was an error, a cached copy is returned if available.
// cache is set to true if there should be no network call done
func (discovery *Discovery) Organizations(ctx context.Context, cache bool) (*Organizations, bool, error) {
- if cache || !discovery.DetermineOrganizationsUpdate() {
+ discovery.mu.RLock()
+ if cache || !discovery.determineOrganizationsUpdate() {
+ discovery.mu.RUnlock()
return discovery.cachedOrgs(), false, nil
}
+ discovery.mu.RUnlock()
+ discovery.mu.Lock()
+ defer discovery.mu.Unlock()
file := "organization_list.json"
var jsonDecode Organizations
update, err := discovery.file(ctx, file, discovery.OrganizationList.Version, discovery.OrganizationList.UpdateHeader, &jsonDecode)
@@ -349,9 +371,14 @@ func (discovery *Discovery) cachedServers() *Servers {
// If there was an error, a cached copy is returned if available.
// cache is set to true if there should be no network call done
func (discovery *Discovery) Servers(ctx context.Context, cache bool) (*Servers, bool, error) {
- if cache || !discovery.DetermineServersUpdate() {
+ discovery.mu.RLock()
+ if cache || !discovery.determineServersUpdate() {
+ discovery.mu.RUnlock()
return discovery.cachedServers(), false, nil
}
+ discovery.mu.RUnlock()
+ discovery.mu.Lock()
+ defer discovery.mu.Unlock()
file := "server_list.json"
var jsonDecode Servers
update, err := discovery.file(ctx, file, discovery.ServerList.Version, discovery.ServerList.UpdateHeader, &jsonDecode)
@@ -397,29 +424,15 @@ func (discovery *Discovery) UpdateOrganizations(other Organizations) {
}
}
-// Copy creates a deep-copy for the discovery struct
-// It does this by marshalling and unmarshalling it as JSON
-func (discovery *Discovery) Copy() (Discovery, error) {
- var dest Discovery
- b, err := json.Marshal(discovery)
- if err != nil {
- return dest, err
- }
-
- err = json.Unmarshal(b, &dest)
- if err != nil {
- return dest, err
- }
-
- return dest, nil
-}
-
// Fill makes sure that the cache is filled with the embedded discovery
func (discovery *Discovery) Fill() error {
if !HasCache {
return nil
}
+ discovery.mu.Lock()
+ defer discovery.mu.Unlock()
+
var err error
var es Servers
err = errors.Join(err, json.Unmarshal(eServers, &es))
diff --git a/internal/discovery/manager.go b/internal/discovery/manager.go
deleted file mode 100644
index 4fb4f8e..0000000
--- a/internal/discovery/manager.go
+++ /dev/null
@@ -1,92 +0,0 @@
-package discovery
-
-import (
- "context"
- "log/slog"
- "sync"
-)
-
-// Manager is the discovery struct that is cached
-// with some bookkeeping to avoid race conditions
-type Manager struct {
- disco *Discovery
-
- cancel context.CancelFunc
- mu sync.RWMutex
- wait sync.WaitGroup
-}
-
-// NewManager creates a new Discovery manager
-func NewManager(disco *Discovery) *Manager {
- return &Manager{disco: disco}
-}
-
-func (m *Manager) lock(write bool) {
- if write {
- m.mu.Lock()
- return
- }
- m.mu.RLock()
-}
-
-func (m *Manager) unlock(write bool) {
- if write {
- m.mu.Unlock()
- return
- }
- m.mu.RUnlock()
-}
-
-// Discovery gets the cached discovery
-// `write` is true if discovery will be written to
-func (m *Manager) Discovery(write bool) (*Discovery, func()) {
- if write {
- m.wait.Wait()
- }
- m.lock(write)
- return m.disco, func() {
- m.unlock(write)
- }
-}
-
-// Cancel aborts the running discovery startup process
-func (m *Manager) Cancel() {
- if m.cancel != nil {
- m.cancel()
- }
- m.wait.Wait()
-}
-
-// Startup handles the discovery process in the background
-// It's called Startup because it's called when the lib is initialised
-func (m *Manager) Startup(ctx context.Context, cb func()) {
- ctx, cancel := context.WithCancel(ctx)
- m.cancel = cancel
- m.wait.Add(1)
- go func() {
- m.lock(false)
- discoCopy, err := m.disco.Copy()
- if err != nil {
- slog.Warn("failed to clone discovery", "error", err)
- return
- }
- m.unlock(false)
- // we already log the warning
- discoCopy.Servers(ctx, false) //nolint:errcheck
-
- m.lock(true)
- m.disco.UpdateServers(discoCopy.ServerList)
- m.unlock(true)
- m.wait.Done()
-
- select {
- case <-ctx.Done():
- return
- default:
- if cb == nil {
- return
- }
- cb()
- }
- }()
-}
diff --git a/internal/server/institute.go b/internal/server/institute.go
index 348e895..0a7ef3a 100644
--- a/internal/server/institute.go
+++ b/internal/server/institute.go
@@ -17,15 +17,12 @@ import (
// `disco` are the discovery servers
// `id` is the identifier for the server, the base url
// `ot` specifies specifies the start time OAuth was already triggered
-func (s *Servers) AddInstitute(ctx context.Context, discom *discovery.Manager, id string, ot *int64) error {
+func (s *Servers) AddInstitute(ctx context.Context, disco *discovery.Discovery, id string, ot *int64) error {
// This is basically done to double check if the server is part of the institute access section of disco
- disco, release := discom.Discovery(false)
dsrv, err := disco.ServerByURL(id, "institute_access")
if err != nil {
- release()
return err
}
- release()
sd := api.ServerData{
ID: dsrv.BaseURL,
@@ -70,15 +67,12 @@ func (s *Servers) AddInstitute(ctx context.Context, discom *discovery.Manager, i
// `disco` are the discovery servers
// `tok` are the tokens such that we do not have to trigger auth
// `disableAuth` is true when auth should never be triggered
-func (s *Servers) GetInstitute(ctx context.Context, id string, discom *discovery.Manager, tok *eduoauth.Token, disableAuth bool) (*Server, error) {
- disco, release := discom.Discovery(false)
+func (s *Servers) GetInstitute(ctx context.Context, id string, disco *discovery.Discovery, tok *eduoauth.Token, disableAuth bool) (*Server, error) {
// This is basically done to double check if the server is part of the institute access section of disco
dsrv, err := disco.ServerByURL(id, "institute_access")
if err != nil {
- release()
return nil, err
}
- release()
// Get the server from the config
_, err = s.config.GetServer(dsrv.BaseURL, server.TypeInstituteAccess)
diff --git a/internal/server/secureinternet.go b/internal/server/secureinternet.go
index 69b1e97..18a5e78 100644
--- a/internal/server/secureinternet.go
+++ b/internal/server/secureinternet.go
@@ -45,17 +45,14 @@ func ReplaceWAYF(template string, authURL string, orgID string) string {
// `disco` are the discovery servers
// `orgID` is the organiztaion ID
// `ot` specifies specifies the start time OAuth was already triggered
-func (s *Servers) AddSecure(ctx context.Context, discom *discovery.Manager, orgID string, ot *int64) error {
+func (s *Servers) AddSecure(ctx context.Context, disco *discovery.Discovery, orgID string, ot *int64) error {
if s.config.HasSecureInternet() {
return errors.New("a secure internet server already exists")
}
- disco, release := discom.Discovery(false)
dorg, dsrv, err := disco.SecureHomeArgs(orgID)
if err != nil {
- release()
return err
}
- release()
sd := api.ServerData{
ID: dorg.OrgID,
@@ -63,13 +60,11 @@ func (s *Servers) AddSecure(ctx context.Context, discom *discovery.Manager, orgI
BaseWK: dsrv.BaseURL,
BaseAuthWK: dsrv.BaseURL,
ProcessAuth: func(ctx context.Context, url string) (string, error) {
- newd, release := discom.Discovery(true)
- defer release()
// the only thing we can do is log warn
// this is already done in the functions
- newd.Servers(ctx, false) //nolint:errcheck
- newd.Organizations(ctx, false) //nolint:errcheck
- updorg, updsrv, err := newd.SecureHomeArgs(orgID)
+ disco.Servers(ctx, false) //nolint:errcheck
+ disco.Organizations(ctx, false) //nolint:errcheck
+ updorg, updsrv, err := disco.SecureHomeArgs(orgID)
if err != nil {
return "", err
}
@@ -115,25 +110,21 @@ func (s *Servers) AddSecure(ctx context.Context, discom *discovery.Manager, orgI
// `disco` are the discovery servers
// `tok` are the tokens such that the server can be found without triggering auth
// `disableAuth` is set to true when authorization should not be triggered
-func (s *Servers) GetSecure(ctx context.Context, orgID string, discom *discovery.Manager, tok *eduoauth.Token, disableAuth bool) (*Server, error) {
+func (s *Servers) GetSecure(ctx context.Context, orgID string, disco *discovery.Discovery, tok *eduoauth.Token, disableAuth bool) (*Server, error) {
srv, err := s.config.GetServer(orgID, server.TypeSecureInternet)
if err != nil {
return nil, err
}
- disco, release := discom.Discovery(false)
dorg, dhome, err := disco.SecureHomeArgs(orgID)
if err != nil {
- release()
return nil, err
}
dloc, err := disco.ServerByCountryCode(srv.CountryCode)
if err != nil {
- release()
return nil, err
}
- release()
sd := api.ServerData{
ID: dorg.OrgID,
@@ -141,15 +132,13 @@ func (s *Servers) GetSecure(ctx context.Context, orgID string, discom *discovery
BaseWK: dloc.BaseURL,
BaseAuthWK: dhome.BaseURL,
ProcessAuth: func(ctx context.Context, url string) (string, error) {
- newd, release := discom.Discovery(true)
- defer release()
// the only thing we can do is log warn
// this is already done in the functions
- newd.MarkServersExpired()
- newd.Servers(ctx, false) //nolint:errcheck
- newd.MarkOrganizationsExpired()
- newd.Organizations(ctx, false) //nolint:errcheck
- updorg, updsrv, err := newd.SecureHomeArgs(orgID)
+ disco.MarkServersExpired()
+ disco.Servers(ctx, false) //nolint:errcheck
+ disco.MarkOrganizationsExpired()
+ disco.Organizations(ctx, false) //nolint:errcheck
+ updorg, updsrv, err := disco.SecureHomeArgs(orgID)
if err != nil {
return "", err
}
diff --git a/internal/server/servers.go b/internal/server/servers.go
index d1aed97..60b9277 100644
--- a/internal/server/servers.go
+++ b/internal/server/servers.go
@@ -54,12 +54,12 @@ type CurrentServer struct {
}
// ServerWithCallbacks gets the current server as a server struct and triggers callbacks as needed
-func (cs *CurrentServer) ServerWithCallbacks(ctx context.Context, discom *discovery.Manager, tokens *eduoauth.Token, disableAuth bool) (*Server, error) {
+func (cs *CurrentServer) ServerWithCallbacks(ctx context.Context, disco *discovery.Discovery, tokens *eduoauth.Token, disableAuth bool) (*Server, error) {
switch cs.Key.T {
case srvtypes.TypeInstituteAccess:
- return cs.srvs.GetInstitute(ctx, cs.Key.ID, discom, tokens, disableAuth)
+ return cs.srvs.GetInstitute(ctx, cs.Key.ID, disco, tokens, disableAuth)
case srvtypes.TypeSecureInternet:
- return cs.srvs.GetSecure(ctx, cs.Key.ID, discom, tokens, disableAuth)
+ return cs.srvs.GetSecure(ctx, cs.Key.ID, disco, tokens, disableAuth)
case srvtypes.TypeCustom:
return cs.srvs.GetCustom(ctx, cs.Key.ID, tokens, disableAuth)
default:
@@ -89,9 +89,7 @@ func (s *Servers) CurrentServer() (*CurrentServer, error) {
}
// PublicCurrent gets the current server into a type that we can return to the client
-func (s *Servers) PublicCurrent(discom *discovery.Manager) (*srvtypes.Current, error) {
- disco, release := discom.Discovery(false)
- defer release()
+func (s *Servers) PublicCurrent(disco *discovery.Discovery) (*srvtypes.Current, error) {
return s.config.PublicCurrent(disco)
}
diff --git a/wrappers/python/eduvpn_common/loader.py b/wrappers/python/eduvpn_common/loader.py
index 870f0b4..d458cc4 100644
--- a/wrappers/python/eduvpn_common/loader.py
+++ b/wrappers/python/eduvpn_common/loader.py
@@ -90,7 +90,6 @@ def initialize_functions(lib: CDLL) -> None:
c_void_p,
)
lib.RenewSession.argtypes, lib.RenewSession.restype = [c_int], c_void_p
- lib.DiscoveryStartup.argtypes, lib.DiscoveryStartup.restype = [RefreshList], c_void_p
lib.SetTokenHandler.argtypes, lib.SetTokenHandler.restype = (
[
TokenGetter,
diff --git a/wrappers/python/eduvpn_common/main.py b/wrappers/python/eduvpn_common/main.py
index 334c8b8..827ddfc 100644
--- a/wrappers/python/eduvpn_common/main.py
+++ b/wrappers/python/eduvpn_common/main.py
@@ -316,12 +316,6 @@ class EduVPN(object):
if location_err:
forwardError(location_err)
- def discovery_startup(self, refresh: RefreshList) -> None:
- refresh_err = self.go_function(self.lib.DiscoveryStartup, refresh)
-
- if refresh_err:
- forwardError(refresh_err)
-
def set_token_handler(self, getter: Callable, setter: Callable) -> None:
self.token_setter = setter
self.token_getter = getter