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

plugins/carddav: sanity check URL on startup

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

24
plugins/carddav/plugin.go
View file

@ -11,6 +11,25 @@ import (
"github.com/emersion/go-webdav/carddav" "github.com/emersion/go-webdav/carddav"
) )
func sanityCheckURL(u *url.URL) error {
req, err := http.NewRequest(http.MethodOptions, u.String(), nil)
if err != nil {
return err
}
resp, err := http.DefaultClient.Do(req)
if err != nil {
return err
}
resp.Body.Close()
// Servers might require authentication to perform an OPTIONS request
if resp.StatusCode/100 != 2 && resp.StatusCode != http.StatusUnauthorized {
return fmt.Errorf("HTTP request failed: %v %v", resp.StatusCode, resp.Status)
}
return nil
}
type authRoundTripper struct { type authRoundTripper struct {
upstream http.RoundTripper upstream http.RoundTripper
session *koushin.Session session *koushin.Session
@ -43,6 +62,11 @@ func newPlugin(srv *koushin.Server) (koushin.Plugin, error) {
return nil, fmt.Errorf("carddav: Discover returned an invalid URL: %v", err) return nil, fmt.Errorf("carddav: Discover returned an invalid URL: %v", err)
} }
} }
if err := sanityCheckURL(u); err != nil {
return nil, fmt.Errorf("carddav: failed to connect to CardDAV server %q: %v", u, err)
}
srv.Logger().Printf("Configured upstream CardDAV server: %v", u) srv.Logger().Printf("Configured upstream CardDAV server: %v", u)
p := koushin.GoPlugin{Name: "carddav"} p := koushin.GoPlugin{Name: "carddav"}