Deuxfleurs/alps
24
1
Fork 0
Code Issues Pull requests 1 Projects Releases Wiki Activity

plugins/carddav: accept "carddavs" and "carddav+insecure" URL schemes

Browse source
This commit is contained in:
Simon Ser 2020-02-05 13:56:18 +01:00
parent ad256906e0
commit 3263a89185
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/carddav/plugin.go
View file

@ -41,14 +41,17 @@ func (rt *authRoundTripper) RoundTrip(req *http.Request) (*http.Response, error)
} }
func newPlugin(srv *koushin.Server) (koushin.Plugin, error) { func newPlugin(srv *koushin.Server) (koushin.Plugin, error) {
u, err := srv.Upstream("https", "http+insecure") u, err := srv.Upstream("carddavs", "carddav+insecure", "https", "http+insecure")
if _, ok := err.(*koushin.NoUpstreamError); ok { if _, ok := err.(*koushin.NoUpstreamError); ok {
srv.Logger().Print("carddav: no upstream server provided") srv.Logger().Print("carddav: no upstream server provided")
return nil, nil return nil, nil
} else if err != nil { } else if err != nil {
return nil, fmt.Errorf("carddav: failed to parse upstream CardDAV server: %v", err) return nil, fmt.Errorf("carddav: failed to parse upstream CardDAV server: %v", err)
} }
if u.Scheme == "http+insecure" { switch u.Scheme {
case "carddavs":
u.Scheme = "https"
case "carddav+insecure", "http+insecure":
u.Scheme = "http" u.Scheme = "http"
} }
if u.Scheme == "" { if u.Scheme == "" {