projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7b7be3d
)
* http-auth was not binding in time, causing the first authenticated request to alway...
author
Art Cancro
<ajc@citadel.org>
Thu, 6 Aug 2009 05:31:36 +0000
(
05:31
+0000)
committer
Art Cancro
<ajc@citadel.org>
Thu, 6 Aug 2009 05:31:36 +0000
(
05:31
+0000)
webcit/context_loop.c
patch
|
blob
|
history
diff --git
a/webcit/context_loop.c
b/webcit/context_loop.c
index e0c8072b0947471fffa405ed017f4ab19cf5eb8d..78e4a6cbd7c748563b2c7756a04e2b41c51049b8 100644
(file)
--- a/
webcit/context_loop.c
+++ b/
webcit/context_loop.c
@@
-138,14
+138,13
@@
int GenerateSessionID(void)
wcsession *FindSession(wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t *ListMutex)
{
wcsession *FindSession(wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t *ListMutex)
{
- wcsession *sptr, *TheSession = NULL;
+ wcsession *sptr = NULL;
+ wcsession *TheSession = NULL;
pthread_mutex_lock(ListMutex);
pthread_mutex_lock(ListMutex);
- for (sptr = *wclist;
- ((sptr != NULL) && (TheSession == NULL));
- sptr = sptr->next) {
+ for (sptr = *wclist; ((sptr != NULL) && (TheSession == NULL)); sptr = sptr->next) {
- /*
*
If HTTP-AUTH, look for a session with matching credentials */
+ /* If HTTP-AUTH, look for a session with matching credentials */
switch (Hdr->HR.got_auth)
{
case AUTH_BASIC:
switch (Hdr->HR.got_auth)
{
case AUTH_BASIC:
@@
-153,14
+152,16
@@
wcsession *FindSession(wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t
continue;
GetAuthBasic(Hdr);
if ((!strcasecmp(ChrPtr(Hdr->c_username), ChrPtr(sptr->wc_username))) &&
continue;
GetAuthBasic(Hdr);
if ((!strcasecmp(ChrPtr(Hdr->c_username), ChrPtr(sptr->wc_username))) &&
- (!strcasecmp(ChrPtr(Hdr->c_password), ChrPtr(sptr->wc_password))) )
+ (!strcasecmp(ChrPtr(Hdr->c_password), ChrPtr(sptr->wc_password))) )
{
TheSession = sptr;
TheSession = sptr;
+ }
break;
case AUTH_COOKIE:
break;
case AUTH_COOKIE:
- /*
*
If cookie-session, look for a session with matching session ID */
+ /* If cookie-session, look for a session with matching session ID */
if ( (Hdr->HR.desired_session != 0) &&
if ( (Hdr->HR.desired_session != 0) &&
- (sptr->wc_session == Hdr->HR.desired_session))
+ (sptr->wc_session == Hdr->HR.desired_session))
{
TheSession = sptr;
TheSession = sptr;
+ }
break;
case NO_AUTH:
break;
break;
case NO_AUTH:
break;
@@
-495,8
+496,7
@@
void context_loop(ParsedHttpHdrs *Hdr)
return;
}
return;
}
- if ((Hdr->HR.Handler != NULL) &&
- ((Hdr->HR.Handler->Flags & ISSTATIC) != 0))
+ if ((Hdr->HR.Handler != NULL) && ((Hdr->HR.Handler->Flags & ISSTATIC) != 0))
{
wcsession *Static;
Static = CreateSession(0, NULL, Hdr, NULL);
{
wcsession *Static;
Static = CreateSession(0, NULL, Hdr, NULL);
@@
-521,29
+521,27
@@
void context_loop(ParsedHttpHdrs *Hdr)
return;
}
return;
}
- if (Hdr->HR.got_auth == AUTH_BASIC)
+ if (Hdr->HR.got_auth == AUTH_BASIC)
{
CheckAuthBasic(Hdr);
CheckAuthBasic(Hdr);
+ }
-
-/* dbg_PrintHash(HTTPHeaders, nix, NULL); */
-
- /**
+ /*
* See if there's an existing session open with the desired ID or user/pass
*/
* See if there's an existing session open with the desired ID or user/pass
*/
- TheSession =
NULL
;
+ TheSession =
FindSession(&SessionList, Hdr, &SessionListMutex)
;
- if (TheSession == NULL) {
- TheSession = FindSession(&SessionList, Hdr, &SessionListMutex);
- }
-
- /**
+ /*
* Create a new session if we have to
*/
if (TheSession == NULL) {
TheSession = CreateSession(1, &SessionList, Hdr, &SessionListMutex);
* Create a new session if we have to
*/
if (TheSession == NULL) {
TheSession = CreateSession(1, &SessionList, Hdr, &SessionListMutex);
- if ((StrLength(Hdr->c_username) == 0) &&
- (!Hdr->HR.DontNeedAuth)) {
+ /* Yes, theoretically we did this already, but for some reason c_username and c_password
+ * are already gone by now, so we fetch them again.
+ */
+ GetAuthBasic(Hdr);
+
+ if ((StrLength(Hdr->c_username) == 0) && (!Hdr->HR.DontNeedAuth)) {
if ((Hdr->HR.Handler != NULL) &&
(XHTTP_COMMANDS & Hdr->HR.Handler->Flags) == XHTTP_COMMANDS) {
if ((Hdr->HR.Handler != NULL) &&
(XHTTP_COMMANDS & Hdr->HR.Handler->Flags) == XHTTP_COMMANDS) {