1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
|
package server
import (
"context"
"errors"
"time"
"github.com/eduvpn/eduvpn-common/internal/api"
"github.com/eduvpn/eduvpn-common/internal/config/v2"
"github.com/eduvpn/eduvpn-common/internal/discovery"
"github.com/eduvpn/eduvpn-common/internal/log"
"github.com/eduvpn/eduvpn-common/internal/util"
"github.com/eduvpn/eduvpn-common/types/server"
"github.com/jwijenbergh/eduoauth-go"
)
// AddSecure adds a secure internet server
// `ctx` is the context used for cancellation
// `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, disco *discovery.Discovery, orgID string, ot *int64) error {
if s.config.HasSecureInternet() {
return errors.New("a secure internet server already exists")
}
dorg, dsrv, err := disco.SecureHomeArgs(orgID)
if err != nil {
return err
}
sd := api.ServerData{
ID: dorg.OrgID,
Type: server.TypeSecureInternet,
BaseWK: dsrv.BaseURL,
BaseAuthWK: dsrv.BaseURL,
ProcessAuth: func(ctx context.Context, url string) (string, error) {
disco.Servers(ctx)
disco.Organizations(ctx)
updorg, updsrv, err := disco.SecureHomeArgs(orgID)
if err != nil {
return "", err
}
ret := util.ReplaceWAYF(updsrv.AuthenticationURLTemplate, url, updorg.OrgID)
return ret, nil
},
}
auth := time.Time{}
if ot != nil {
auth = time.Unix(*ot, 0)
}
err = s.config.AddServer(orgID, server.TypeSecureInternet, v2.Server{
CountryCode: dsrv.CountryCode,
LastAuthorizeTime: auth,
})
if err != nil {
return err
}
// no authorization should be triggered, return
if ot != nil {
return nil
}
// Authorize by creating the API object
_, err = api.NewAPI(ctx, s.clientID, sd, s.cb, nil)
if err != nil {
// authorization has failed, remove the server again
rerr := s.config.RemoveServer(orgID, server.TypeSecureInternet)
if rerr != nil {
log.Logger.Warningf("could not remove secure internet server: '%s' after failing authorization: %v", orgID, rerr)
}
return err
}
return nil
}
// GetSecure gets a secure internet server
// `ctx` is the context used for cancellation
// `orgID` is the organization ID that identifies the server
// `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, disco *discovery.Discovery, tok *eduoauth.Token, disableAuth bool) (*Server, error) {
srv, err := s.config.GetServer(orgID, server.TypeSecureInternet)
if err != nil {
return nil, err
}
dorg, dhome, err := disco.SecureHomeArgs(orgID)
if err != nil {
return nil, err
}
dloc, err := disco.ServerByCountryCode(srv.CountryCode)
if err != nil {
return nil, err
}
sd := api.ServerData{
ID: dorg.OrgID,
Type: server.TypeSecureInternet,
BaseWK: dloc.BaseURL,
BaseAuthWK: dhome.BaseURL,
ProcessAuth: func(ctx context.Context, url string) (string, error) {
disco.MarkServersExpired()
disco.Servers(ctx)
disco.MarkOrganizationsExpired()
disco.Organizations(ctx)
updorg, updsrv, err := disco.SecureHomeArgs(orgID)
if err != nil {
return "", err
}
ret := util.ReplaceWAYF(updsrv.AuthenticationURLTemplate, url, updorg.OrgID)
return ret, nil
},
DisableAuthorize: disableAuth,
}
a, err := api.NewAPI(ctx, s.clientID, sd, s.cb, tok)
if err != nil {
return nil, err
}
sec := s.NewServer(orgID, server.TypeSecureInternet, a)
return &sec, nil
}
|
