return ++seq;
}
+wcsession *FindSession(wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t *ListMutex)
+{
+ wcsession *sptr, *TheSession = NULL;
+
+ pthread_mutex_lock(ListMutex);
+ for (sptr = *wclist;
+ ((sptr != NULL) && (TheSession == NULL));
+ sptr = sptr->next) {
+
+ /** If HTTP-AUTH, look for a session with matching credentials */
+ switch (Hdr->HR.got_auth)
+ {
+ case AUTH_BASIC:
+ if ( (Hdr->HR.SessionKey != sptr->SessionKey))
+ continue;
+ GetAuthBasic(Hdr);
+ if ((!strcasecmp(ChrPtr(Hdr->c_username), ChrPtr(sptr->wc_username))) &&
+ (!strcasecmp(ChrPtr(Hdr->c_password), ChrPtr(sptr->wc_password))) )
+ TheSession = sptr;
+ break;
+ case AUTH_COOKIE:
+ /** If cookie-session, look for a session with matching session ID */
+ if ( (Hdr->HR.desired_session != 0) &&
+ (sptr->wc_session == Hdr->HR.desired_session))
+ TheSession = sptr;
+ break;
+ case NO_AUTH:
+ break;
+ }
+ }
+ pthread_mutex_unlock(ListMutex);
+ return TheSession;
+}
+wcsession *CreateSession(int Lockable, wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t *ListMutex)
+{
+ wcsession *TheSession;
+ lprintf(3, "Creating a new session\n");
+ TheSession = (wcsession *)
+ malloc(sizeof(wcsession));
+ memset(TheSession, 0, sizeof(wcsession));
+ TheSession->Hdr = Hdr;
+ TheSession->SessionKey = Hdr->HR.SessionKey;
+ TheSession->serv_sock = (-1);
+ TheSession->chat_sock = (-1);
+ TheSession->is_mobile = -1;
+ pthread_setspecific(MyConKey, (void *)TheSession);
+
+ /* If we're recreating a session that expired, it's best to give it the same
+ * session number that it had before. The client browser ought to pick up
+ * the new session number and start using it, but in some rare situations it
+ * doesn't, and that's a Bad Thing because it causes lots of spurious sessions
+ * to get created.
+ */
+ if (Hdr->HR.desired_session == 0) {
+ TheSession->wc_session = GenerateSessionID();
+ }
+ else {
+ TheSession->wc_session = Hdr->HR.desired_session;
+ }
+
+ session_new_modules(TheSession);
+
+ if (Lockable) {
+ pthread_mutex_init(&TheSession->SessionMutex, NULL);
+
+ if (ListMutex != NULL)
+ pthread_mutex_lock(ListMutex);
+
+ if (wclist != NULL) {
+ TheSession->nonce = rand();
+ TheSession->next = *wclist;
+ *wclist = TheSession;
+ }
+ if (ListMutex != NULL)
+ pthread_mutex_unlock(ListMutex);
+ }
+ return TheSession;
+}
/**
return 1;
}
- Hdr->this_page = NewStrBufDup(Hdr->HR.ReqLine);
+ StrBufAppendBuf(Hdr->this_page, Hdr->HR.ReqLine, 0);
/* chop Filename / query arguments */
Args = strchr(ChrPtr(Hdr->HR.ReqLine), '?');
if (Args == NULL) /* whe're not that picky about params... TODO: this will spoil '&' in filenames.*/
Args = strchr(ChrPtr(Hdr->HR.ReqLine), '&');
if (Args != NULL) {
Args ++; /* skip the ? */
- Hdr->PlainArgs = NewStrBufPlain(
- Args,
- StrLength(Hdr->HR.ReqLine) -
- (Args - ChrPtr(Hdr->HR.ReqLine)));
+ StrBufPlain(Hdr->PlainArgs,
+ Args,
+ StrLength(Hdr->HR.ReqLine) -
+ (Args - ChrPtr(Hdr->HR.ReqLine)));
StrBufCutAt(Hdr->HR.ReqLine, 0, Args - 1);
} /* don't parse them yet, maybe we don't even care... */
Hdr->HR.DontNeedAuth = (Hdr->HR.Handler->Flags & ISSTATIC) != 0;
}
- Hdr->HTTPHeaders = NewHash(1, NULL);
return 0;
}
int isbogus = 0;
HeaderName = NewStrBuf();
- Hdr->ReadBuf = NewStrBuf();
LastLine = NULL;
do {
nLine ++;
continue;
}
if (nLine == 1) {
+ Hdr->HTTPHeaders = NewHash(1, NULL);
pHdr = (OneHttpHeader*) malloc(sizeof(OneHttpHeader));
memset(pHdr, 0, sizeof(OneHttpHeader));
pHdr->Val = Line;
void context_loop(ParsedHttpHdrs *Hdr)
{
int isbogus = 0;
- wcsession *TheSession, *sptr;
+ wcsession *TheSession;
struct timeval tx_start;
struct timeval tx_finish;
((Hdr->HR.Handler->Flags & BOGUS) != 0)))
{
wcsession *Bogus;
- Bogus = (wcsession *)
- malloc(sizeof(wcsession));
- memset(Bogus, 0, sizeof(wcsession));
- pthread_setspecific(MyConKey, (void *)Bogus);
- Bogus->Hdr = Hdr;
- session_new_modules(Bogus);
+
+ Bogus = CreateSession(0, NULL, Hdr, NULL);
+
do_404();
+
+ lprintf(9, "HTTP: 404 [%ld.%06ld] %s %s \n",
+ ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) / 1000000,
+ ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) % 1000000,
+ ReqStrs[Hdr->HR.eReqType],
+ ChrPtr(Hdr->this_page)
+ );
session_detach_modules(Bogus);
- http_destroy_modules(Hdr);
session_destroy_modules(&Bogus);
return;
}
((Hdr->HR.Handler->Flags & ISSTATIC) != 0))
{
wcsession *Static;
-
- Static = (wcsession *)
- malloc(sizeof(wcsession));
- memset(Static, 0, sizeof(wcsession));
- pthread_setspecific(MyConKey, (void *)Static);
- Static->Hdr = Hdr;
- Static->serv_sock = (-1);
- Static->chat_sock = (-1);
- Static->is_mobile = -1;
- session_new_modules(Static);
+ Static = CreateSession(0, NULL, Hdr, NULL);
Hdr->HR.Handler->F();
/* How long did this transaction take? */
gettimeofday(&tx_finish, NULL);
- lprintf(9, "SL: Transaction [%s] completed in %ld.%06ld seconds.\n",
- ChrPtr(Hdr->this_page),
- ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) / 1000000,
- ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) % 1000000
- );
-
+#ifdef TECH_PREVIEW
+ if ((Hdr->HR.Handler == NULL) ||
+ ((Hdr->HR.Handler->Flags & LOGCHATTY) == 0))
+#endif
+ lprintf(9, "HTTP: 200 [%ld.%06ld] %s %s \n",
+ ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) / 1000000,
+ ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) % 1000000,
+ ReqStrs[Hdr->HR.eReqType],
+ ChrPtr(Hdr->this_page)
+ );
session_detach_modules(Static);
- http_destroy_modules(Hdr);
session_destroy_modules(&Static);
return;
}
/* dbg_PrintHash(HTTPHeaders, nix, NULL); */
-
- /* Begin parsing the request. * /
-#ifdef TECH_PREVIEW
- if ((strncmp(ChrPtr(ReqLine), "/sslg", 5) != 0) &&
- (strncmp(ChrPtr(ReqLine), "/static/", 8) != 0) &&
- (strncmp(ChrPtr(ReqLine), "/tiny_mce/", 10) != 0) &&
- (strncmp(ChrPtr(ReqLine), "/wholist_section", 16) != 0) &&
- (strstr(ChrPtr(ReqLine), "wholist_section") == NULL)) {
-#endif
- lprintf(5, "HTTP: %s %s\n", ReqStrs[Hdr.eReqType], ChrPtr(ReqLine));
-#ifdef TECH_PREVIEW
- }
-#endif
-
-*/
-
/**
* See if there's an existing session open with the desired ID or user/pass
*/
TheSession = NULL;
if (TheSession == NULL) {
- pthread_mutex_lock(&SessionListMutex);
- for (sptr = SessionList;
- ((sptr != NULL) && (TheSession == NULL));
- sptr = sptr->next) {
-
- /** If HTTP-AUTH, look for a session with matching credentials */
- switch (Hdr->HR.got_auth)
- {
- case AUTH_BASIC:
- if ( (Hdr->HR.SessionKey != sptr->SessionKey))
- continue;
- GetAuthBasic(Hdr);
- if ((!strcasecmp(ChrPtr(Hdr->c_username), ChrPtr(sptr->wc_username))) &&
- (!strcasecmp(ChrPtr(Hdr->c_password), ChrPtr(sptr->wc_password))) )
- TheSession = sptr;
- break;
- case AUTH_COOKIE:
- /** If cookie-session, look for a session with matching session ID */
- if ( (Hdr->HR.desired_session != 0) &&
- (sptr->wc_session == Hdr->HR.desired_session))
- TheSession = sptr;
- break;
- case NO_AUTH:
- break;
- }
- }
- pthread_mutex_unlock(&SessionListMutex);
+ TheSession = FindSession(&SessionList, Hdr, &SessionListMutex);
}
/**
* Create a new session if we have to
*/
if (TheSession == NULL) {
- lprintf(3, "Creating a new session\n");
- TheSession = (wcsession *)
- malloc(sizeof(wcsession));
- memset(TheSession, 0, sizeof(wcsession));
- TheSession->Hdr = Hdr;
- TheSession->SessionKey = Hdr->HR.SessionKey;
- TheSession->serv_sock = (-1);
- TheSession->chat_sock = (-1);
-
- /* If we're recreating a session that expired, it's best to give it the same
- * session number that it had before. The client browser ought to pick up
- * the new session number and start using it, but in some rare situations it
- * doesn't, and that's a Bad Thing because it causes lots of spurious sessions
- * to get created.
- */
- if (Hdr->HR.desired_session == 0) {
- TheSession->wc_session = GenerateSessionID();
- }
- else {
- TheSession->wc_session = Hdr->HR.desired_session;
- }
-
- pthread_setspecific(MyConKey, (void *)TheSession);
- session_new_modules(TheSession);
-
- pthread_mutex_init(&TheSession->SessionMutex, NULL);
- pthread_mutex_lock(&SessionListMutex);
- TheSession->nonce = rand();
- TheSession->next = SessionList;
- TheSession->is_mobile = -1;
- SessionList = TheSession;
- pthread_mutex_unlock(&SessionListMutex);
+ TheSession = CreateSession(1, &SessionList, Hdr, &SessionListMutex);
if (StrLength(Hdr->c_language) > 0) {
lprintf(9, "Session cookie requests language '%s'\n", ChrPtr(Hdr->c_language));
/* How long did this transaction take? */
gettimeofday(&tx_finish, NULL);
- lprintf(9, "Transaction [%s] completed in %ld.%06ld seconds.\n",
- ChrPtr(Hdr->this_page),
- ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) / 1000000,
- ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) % 1000000
- );
+
+ if ((Hdr->HR.Handler == NULL) ||
+ ((Hdr->HR.Handler->Flags & LOGCHATTY) == 0))
+ lprintf(9, "HTTP: 200 [%ld.%06ld] %s %s \n",
+ ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) / 1000000,
+ ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) % 1000000,
+ ReqStrs[Hdr->HR.eReqType],
+ ChrPtr(Hdr->this_page)
+ );
session_detach_modules(TheSession);
TheSession->Hdr = NULL;
pthread_mutex_unlock(&TheSession->SessionMutex); /* unbind */
-
- http_destroy_modules(Hdr);
}
void tmplput_nonce(StrBuf *Target, WCTemplputParams *TP)
}
+void
+HttpNewModule_CONTEXT
+(ParsedHttpHdrs *httpreq)
+{
+ httpreq->PlainArgs = NewStrBuf();
+ httpreq->this_page = NewStrBuf();
+}
+
+void
+HttpDetachModule_CONTEXT
+(ParsedHttpHdrs *httpreq)
+{
+ FlushStrBuf(httpreq->ReadBuf);
+ FlushStrBuf(httpreq->PlainArgs);
+ FlushStrBuf(httpreq->this_page);
+ FlushStrBuf(httpreq->PlainArgs);
+ DeleteHash(&httpreq->HTTPHeaders);
+ memset(&httpreq->HR, 0, sizeof(HdrRefs));
+}
void
HttpDestroyModule_CONTEXT
(ParsedHttpHdrs *httpreq)
{
+ FreeStrBuf(&httpreq->this_page);
FreeStrBuf(&httpreq->ReadBuf);
FreeStrBuf(&httpreq->PlainArgs);
FreeStrBuf(&httpreq->this_page);
+ FreeStrBuf(&httpreq->PlainArgs);
DeleteHash(&httpreq->HTTPHeaders);
}
projects / citadel.git / blobdiff