arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2024-11-22 16:08:13 +00:00
Code Issues Releases Wiki Activity

Support Basic and Digest auth

Browse Source
This commit is contained in:
Ricki Hirner 2015-10-16 19:29:33 +02:00
parent 7fc01503d5
commit 410a04dc11
No known key found for this signature in database
GPG Key ID: C4A212CF0B2B4566
2 changed files with 4 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/src/main/java/at/bitfire/davdroid/HttpClient.java
View File

@ -33,12 +33,12 @@ import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;
import javax.net.ssl.X509TrustManager; import javax.net.ssl.X509TrustManager;
import at.bitfire.dav4android.BasicDigestAuthenticator;
import at.bitfire.dav4android.HttpUtils; import at.bitfire.dav4android.HttpUtils;
import de.duenndns.ssl.MemorizingTrustManager; import de.duenndns.ssl.MemorizingTrustManager;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
public class HttpClient extends OkHttpClient { public class HttpClient extends OkHttpClient {
protected static final String HEADER_AUTHORIZATION = "Authorization"; protected static final String HEADER_AUTHORIZATION = "Authorization";
final static UserAgentInterceptor userAgentInterceptor = new UserAgentInterceptor(); final static UserAgentInterceptor userAgentInterceptor = new UserAgentInterceptor();
@ -80,7 +80,7 @@ public class HttpClient extends OkHttpClient {
if (preemptive) if (preemptive)
networkInterceptors().add(new PreemptiveAuthenticationInterceptor(username, password)); networkInterceptors().add(new PreemptiveAuthenticationInterceptor(username, password));
else else
setAuthenticator(new DavAuthenticator(null, username, password)); setAuthenticator(new BasicDigestAuthenticator(null, username, password));
} }
/** /**
@ -98,7 +98,7 @@ public class HttpClient extends OkHttpClient {
username = client.username; username = client.username;
password = client.password; password = client.password;
setAuthenticator(new DavAuthenticator(host, username, password)); setAuthenticator(new BasicDigestAuthenticator(host, username, password));
} }
@ -160,38 +160,4 @@ public class HttpClient extends OkHttpClient {
} }
} }
@RequiredArgsConstructor
public static class DavAuthenticator implements Authenticator {
final String host, username, password;
@Override
public Request authenticate(Proxy proxy, Response response) throws IOException {
Request request = response.request();
if (host != null && !request.httpUrl().host().equalsIgnoreCase(host)) {
Constants.log.warn("Not authenticating against " + host + " for security reasons!");
return null;
}
// check whether this is the first authentication try with our credentials
Response priorResponse = response.priorResponse();
boolean triedBefore = priorResponse != null ? priorResponse.request().header(HEADER_AUTHORIZATION) != null : false;
if (triedBefore)
// credentials didn't work last time, and they won't work now → stop here
return null;
//List<HttpUtils.AuthScheme> schemes = HttpUtils.parseWwwAuthenticate(response.headers("WWW-Authenticate"));
// TODO Digest auth
return request.newBuilder()
.header(HEADER_AUTHORIZATION, Credentials.basic(username, password))
.build();
}
@Override
public Request authenticateProxy(Proxy proxy, Response response) throws IOException {
return null;
}
}
} }

2
dav4android

@ -1 +1 @@
Subproject commit b1ca2ff7383381a407baffd05a6b3532e4cd1690 Subproject commit 9f722654e355e6e82b8b6e39a515b250feb111a9