moparisthebest
/
davmail
mirror of https://github.com/moparisthebest/davmail
1
0
Fork 0
Code Issues Releases Wiki Activity

Caldav: need to check session on each request, credentials may have changed or session expired 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@770 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2009-10-07 19:58:29 +00:00
parent db4b9d5a94
commit cb1efbe973
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/java/davmail/caldav/CaldavConnection.java
View File

@ -155,16 +155,12 @@ public class CaldavConnection extends AbstractConnection {
sendUnauthorized();
} else {
decodeCredentials(headers.get("authorization"));
// authenticate only once, but check credentials
if (session == null || !session.checkCredentials(userName, password)) {
try {
session = ExchangeSessionFactory.getInstance(userName, password);
} catch (DavMailAuthenticationException e) {
sendUnauthorized();
}
}
if (session != null) {
// need to check session on each request, credentials may have changed or session expired
try {
session = ExchangeSessionFactory.getInstance(userName, password);
handleRequest(command, path, headers, content);
} catch (DavMailAuthenticationException e) {
sendUnauthorized();
}
}
@ -1322,7 +1318,7 @@ public class CaldavConnection extends AbstractConnection {
return session.buildCalendarPath(getPathElement(2), calendarPath.toString());
} else {
StringBuilder calendarPath = new StringBuilder();
for (int i=0;i<endIndex;i++) {
for (int i = 0; i < endIndex; i++) {
calendarPath.append('/').append(getPathElement(i));
}
return calendarPath.toString();