summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjwijenbergh <jeroenwijenbergh@protonmail.com>2023-05-17 11:26:13 +0200
committerJeroen Wijenbergh <46386452+jwijenbergh@users.noreply.github.com>2023-09-25 09:43:37 +0200
commitdc7425beb85ea7d35e860a5df2bc0d8ddda8c28a (patch)
treea089193e5d0ae4b1410386daa5e5b145a362504e
parent7202dd59b1806e3f84b826f3f38349295bff099b (diff)
Client: Disable identifier conversion for secure internet
-rw-r--r--client/client.go24
1 files changed, 15 insertions, 9 deletions
diff --git a/client/client.go b/client/client.go
index f17bf67..adc66d0 100644
--- a/client/client.go
+++ b/client/client.go
@@ -468,9 +468,11 @@ func (c *Client) AddServer(ck *cookie.Cookie, identifier string, _type srvtypes.
}
}
- identifier, err = http.EnsureValidURL(identifier, _type != srvtypes.TypeSecureInternet)
- if err != nil {
- return err
+ if _type != srvtypes.TypeSecureInternet {
+ identifier, err = http.EnsureValidURL(identifier, true)
+ if err != nil {
+ return err
+ }
}
var srv server.Server
@@ -583,9 +585,11 @@ func (c *Client) GetConfig(ck *cookie.Cookie, identifier string, _type srvtypes.
c.FSM.GoTransition(StateNoServer)
}
}()
- identifier, err = http.EnsureValidURL(identifier, _type != srvtypes.TypeSecureInternet)
- if err != nil {
- return nil, err
+ if _type != srvtypes.TypeSecureInternet {
+ identifier, err = http.EnsureValidURL(identifier, true)
+ if err != nil {
+ return nil, err
+ }
}
t := c.FSM.GoTransition(StateLoadingServer)
if !t {
@@ -637,9 +641,11 @@ func (c *Client) GetConfig(ck *cookie.Cookie, identifier string, _type srvtypes.
}
func (c *Client) RemoveServer(identifier string, _type srvtypes.Type) (err error) {
- identifier, err = http.EnsureValidURL(identifier, _type != srvtypes.TypeSecureInternet)
- if err != nil {
- return err
+ if _type != srvtypes.TypeSecureInternet {
+ identifier, err = http.EnsureValidURL(identifier, true)
+ if err != nil {
+ return err
+ }
}
switch _type {
case srvtypes.TypeInstituteAccess: