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
|
package server
import (
"context"
"log/slog"
"time"
"codeberg.org/eduVPN/eduvpn-common/internal/config/v2"
"codeberg.org/eduVPN/eduvpn-common/internal/eduvpnapi"
"codeberg.org/eduVPN/eduvpn-common/types/server"
"codeberg.org/jwijenbergh/eduoauth-go/v2"
)
// AddCustom adds a custom server to the internal server list
// `ctx` is the context used for cancellation
// `id` is the identifier of the server, the base URL
// `ot` specifies specifies the start time OAuth was already triggered
func (s *Servers) AddCustom(ctx context.Context, id string, ot *int64) error {
sd := eduvpnapi.ServerData{
ID: id,
Type: server.TypeCustom,
BaseWK: id,
BaseAuthWK: id,
}
auth := time.Time{}
if ot != nil {
auth = time.Unix(*ot, 0)
}
err := s.config.AddServer(id, server.TypeCustom, v2.Server{
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 = eduvpnapi.NewAPI(ctx, s.clientID, sd, s.cb, nil)
if err != nil {
// authorization has failed, remove the server again
rerr := s.config.RemoveServer(id, server.TypeCustom)
if rerr != nil {
slog.Warn("could not remove custom server after failing authorization", "server", id, "error", rerr)
}
return err
}
return nil
}
// GetCustom gets a custom server
// `ctx` is the context for cancellation
// `id` is the identifier of the server
// `tok` are the tokens such that we can initialize the API
// `disableAuth` is set to True when authorization should not be triggered
func (s *Servers) GetCustom(ctx context.Context, id string, tok *eduoauth.Token, disableAuth bool) (*Server, error) {
sd := eduvpnapi.ServerData{
ID: id,
Type: server.TypeCustom,
BaseWK: id,
BaseAuthWK: id,
DisableAuthorize: disableAuth,
}
// Get the server from the config
_, err := s.config.GetServer(id, server.TypeCustom)
if err != nil {
return nil, err
}
a, err := eduvpnapi.NewAPI(ctx, s.clientID, sd, s.cb, tok)
if err != nil {
return nil, err
}
cust := s.NewServer(id, server.TypeCustom, a)
return &cust, nil
}
|
