diff options
Diffstat (limited to 'internal/server/secureinternet.go')
| -rw-r--r-- | internal/server/secureinternet.go | 31 |
1 files changed, 10 insertions, 21 deletions
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 } |