Christof
/
CalAnonSync
forked from aksdb/CalAnonSync
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplified authentication negotiation

This commit is contained in:
Andreas Schneider 2018-04-03 12:12:50 +02:00
parent a739a9b4bb
commit 7ca7675a85
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/calanonsync/ews.go
View File

@ -66,13 +66,11 @@ type EWSRoundTripper struct {
} }
func (er EWSRoundTripper) RoundTrip(r *http.Request) (*http.Response, error) { func (er EWSRoundTripper) RoundTrip(r *http.Request) (*http.Response, error) {
if er.authType == authTypeBasic {
r.SetBasicAuth(er.username, er.password)
}
er.initMutex.Lock() er.initMutex.Lock()
resp, err := er.delegate.RoundTrip(r) if er.authType == authTypeUnknown {
if err == nil && resp.StatusCode == http.StatusUnauthorized && er.authType == authTypeUnknown { // Find authentication scheme.
resp, err := http.DefaultClient.Get(r.URL.String())
if err == nil && resp.StatusCode == http.StatusUnauthorized {
// This is a good time to find out what the server prefers. // This is a good time to find out what the server prefers.
authHeaders := resp.Header["Www-Authenticate"] authHeaders := resp.Header["Www-Authenticate"]
if authHeaders != nil { if authHeaders != nil {
@ -86,8 +84,6 @@ func (er EWSRoundTripper) RoundTrip(r *http.Request) (*http.Response, error) {
} }
} }
// So, do we know more than before? If so, try again.
if er.authType > authTypeUnknown {
if er.authType == authTypeNTLM { if er.authType == authTypeNTLM {
// We need to replace the delegator. // We need to replace the delegator.
er.delegate = &httpntlm.NtlmTransport{ er.delegate = &httpntlm.NtlmTransport{
@ -96,13 +92,15 @@ func (er EWSRoundTripper) RoundTrip(r *http.Request) (*http.Response, error) {
Password: er.password, Password: er.password,
} }
} }
er.initMutex.Unlock()
return er.RoundTrip(r)
} }
} }
er.initMutex.Unlock()
if er.authType == authTypeBasic {
r.SetBasicAuth(er.username, er.password)
}
er.initMutex.Unlock() return er.delegate.RoundTrip(r)
return resp, err
} }
func NewEWSCalendar(url, username, password string) *EWSCalendar { func NewEWSCalendar(url, username, password string) *EWSCalendar {