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
|
package server
import (
"github.com/eduvpn/eduvpn-common/types"
"github.com/go-errors/errors"
)
type Servers struct {
// A custom server is just an institute access server under the hood
CustomServers InstituteAccessServers `json:"custom_servers"`
InstituteServers InstituteAccessServers `json:"institute_servers"`
SecureInternetHomeServer SecureInternetHomeServer `json:"secure_internet_home"`
IsType Type `json:"is_secure_internet"`
}
func (ss *Servers) AddSecureInternet(
secureOrg *types.DiscoveryOrganization,
secureServer *types.DiscoveryServer,
) (Server, error) {
// If we have specified an organization ID
// We also need to get an authorization template
err := ss.SecureInternetHomeServer.init(secureOrg, secureServer)
if err != nil {
return nil, err
}
ss.IsType = SecureInternetServerType
return &ss.SecureInternetHomeServer, nil
}
func (ss *Servers) GetCurrentServer() (Server, error) {
//TODO(jwijenbergh): Almost certainly the return type should be pointer (*Server)
if ss.IsType == SecureInternetServerType {
if !ss.HasSecureLocation() {
return nil, errors.Errorf("ss.IsType = %v; ss.HasSecureLocation() = false", ss.IsType)
}
return &ss.SecureInternetHomeServer, nil
}
srvs := &ss.InstituteServers
if ss.IsType == CustomServerType {
srvs = &ss.CustomServers
}
bs := srvs.Map
if bs == nil {
return nil, errors.Errorf("srvs.Map is nil")
}
if srv, ok := bs[srvs.CurrentURL]; !ok || srv == nil {
return nil, errors.Errorf("server not found")
} else {
return srv, nil
}
}
func (ss *Servers) addInstituteAndCustom(
discoServer *types.DiscoveryServer,
isCustom bool,
) (Server, error) {
url := discoServer.BaseURL
srvs := &ss.InstituteServers
srvType := InstituteAccessServerType
if isCustom {
srvs = &ss.CustomServers
srvType = CustomServerType
}
if srvs.Map == nil {
srvs.Map = make(map[string]*InstituteAccessServer)
}
srv, ok := srvs.Map[url]
// initialize the server if it doesn't exist yet
if !ok {
srv = &InstituteAccessServer{}
}
if err := srv.init(url, discoServer.DisplayName, discoServer.Type, discoServer.SupportContact); err != nil {
return nil, err
}
srvs.Map[url] = srv
ss.IsType = srvType
return srv, nil
}
func (ss *Servers) AddInstituteAccessServer(
instituteServer *types.DiscoveryServer,
) (Server, error) {
return ss.addInstituteAndCustom(instituteServer, false)
}
func (ss *Servers) AddCustomServer(
customServer *types.DiscoveryServer,
) (Server, error) {
return ss.addInstituteAndCustom(customServer, true)
}
func (ss *Servers) GetSecureLocation() string {
return ss.SecureInternetHomeServer.CurrentLocation
}
func (ss *Servers) SetSecureLocation(
chosenLocationServer *types.DiscoveryServer,
) error {
// Make sure to add the current location
if _, err := ss.SecureInternetHomeServer.addLocation(chosenLocationServer); err != nil {
return err
}
ss.SecureInternetHomeServer.CurrentLocation = chosenLocationServer.CountryCode
return nil
}
|
