octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-11 18:38:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do scheme validation in the client

Browse Source
This commit is contained in:
Audrius Butkevicius 2015-06-28 20:34:28 +01:00
parent b72d31f87f
commit c68c78d412
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/client.go
View File

@ -52,6 +52,10 @@ type ProtocolClient struct {
} }
func (c *ProtocolClient) connect() error { func (c *ProtocolClient) connect() error {
if c.URI.Scheme != "relay" {
return fmt.Errorf("Unsupported relay schema:", c.URI.Scheme)
}
conn, err := tls.Dial("tcp", c.URI.Host, c.config) conn, err := tls.Dial("tcp", c.URI.Host, c.config)
if err != nil { if err != nil {
return err return err

4
client/methods.go
View File

@ -15,6 +15,10 @@ import (
) )
func GetInvitationFromRelay(uri *url.URL, id syncthingprotocol.DeviceID, certs []tls.Certificate) (protocol.SessionInvitation, error) { func GetInvitationFromRelay(uri *url.URL, id syncthingprotocol.DeviceID, certs []tls.Certificate) (protocol.SessionInvitation, error) {
if uri.Scheme != "relay" {
return protocol.SessionInvitation{}, fmt.Errorf("Unsupported relay schema:", uri.Scheme)
}
conn, err := tls.Dial("tcp", uri.Host, configForCerts(certs)) conn, err := tls.Dial("tcp", uri.Host, configForCerts(certs))
conn.SetDeadline(time.Now().Add(10 * time.Second)) conn.SetDeadline(time.Now().Add(10 * time.Second))
if err != nil { if err != nil {