moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2024-12-04 14:52:24 -05:00
Code Issues Releases Wiki Activity

EWS: Avoid /owa form request in direct EWS mode

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2229 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2014-02-03 21:45:37 +00:00
parent e9591b72c9
commit ef80812111
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/java/davmail/exchange/ExchangeSession.java
View File

@ -207,7 +207,7 @@ public abstract class ExchangeSession {
// manually follow redirect
HttpMethod method = DavGatewayHttpClientFacade.executeFollowRedirects(httpClient, url);
if (!this.isAuthenticated()) {
if (!this.isAuthenticated(method)) {
if (isBasicAuthentication) {
int status = method.getStatusCode();
@ -531,7 +531,7 @@ public abstract class ExchangeSession {
checkFormLoginQueryString(logonMethod);
// workaround for post logon script redirect
if (!isAuthenticated()) {
if (!isAuthenticated(logonMethod)) {
// try to get new method from script based redirection
logonMethod = buildLogonMethod(httpClient, logonMethod);
@ -548,7 +548,7 @@ public abstract class ExchangeSession {
logonMethod = DavGatewayHttpClientFacade.executeFollowRedirects(httpClient, logonMethod);
checkFormLoginQueryString(logonMethod);
// also check cookies
if (!isAuthenticated()) {
if (!isAuthenticated(logonMethod)) {
throwAuthenticationFailed();
}
} else {
@ -686,18 +686,25 @@ public abstract class ExchangeSession {
*
* @return true if session cookies are available
*/
protected boolean isAuthenticated() {
protected boolean isAuthenticated(HttpMethod method) {
boolean authenticated = false;
for (Cookie cookie : httpClient.getState().getCookies()) {
// Exchange 2003 cookies
if (cookie.getName().startsWith("cadata") || "sessionid".equals(cookie.getName())
// Exchange 2007 cookie
|| "UserContext".equals(cookie.getName())
// Direct EWS access
|| "exchangecookie".equals(cookie.getName())
) {
authenticated = true;
break;
if (method.getStatusCode() == HttpStatus.SC_OK
&& "/ews/services.wsdl".equalsIgnoreCase(method.getPath())) {
// direct EWS access returned wsdl
authenticated = true;
} else {
// check cookies
for (Cookie cookie : httpClient.getState().getCookies()) {
// Exchange 2003 cookies
if (cookie.getName().startsWith("cadata") || "sessionid".equals(cookie.getName())
// Exchange 2007 cookie
|| "UserContext".equals(cookie.getName())
// Direct EWS access
|| "exchangecookie".equals(cookie.getName())
) {
authenticated = true;
break;
}
}
}
return authenticated;