* add more module handlers:
[citadel.git] / webcit / context_loop.c
index b5ccd4fde3e8c903521348f8648b4cb3efad4d18..208521386eb318cefe76e92a27da39b1a5a6462c 100644 (file)
 
 #include "webcit.h"
 #include "webserver.h"
+#include "modules_init.h"
 
 /* Only one thread may manipulate SessionList at a time... */
 pthread_mutex_t SessionListMutex;
 
-struct wcsession *SessionList = NULL;
+wcsession *SessionList = NULL; /**< our sessions ????*/
 
-pthread_key_t MyConKey;                         /* TSD key for MySession() */
+pthread_key_t MyConKey;         /**< TSD key for MySession() */
 
 
-void free_attachments(struct wcsession *sess) {
-       struct wc_attachment *att;
 
-       while (sess->first_attachment != NULL) {
-               att = sess->first_attachment;
-               sess->first_attachment = sess->first_attachment->next;
-               free(att->data);
-               free(att);
+void DestroySession(wcsession **sessions_to_kill)
+{
+       close((*sessions_to_kill)->serv_sock);
+       close((*sessions_to_kill)->chat_sock);
+/*
+//             if ((*sessions_to_kill)->preferences != NULL) {
+//                     free((*sessions_to_kill)->preferences);
+//             }
+*/
+       if ((*sessions_to_kill)->cache_fold != NULL) {
+               free((*sessions_to_kill)->cache_fold);
        }
+       DeleteServInfo(&((*sessions_to_kill)->serv_info));
+       free_march_list((*sessions_to_kill));
+       
+       session_destroy_modules(*sessions_to_kill);
+
+       free((*sessions_to_kill));
+       (*sessions_to_kill) = NULL;
 }
 
+void shutdown_sessions(void)
+{
+       wcsession *sptr;
+       
+       for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
+                       sptr->killthis = 1;
+       }
+}
 
 void do_housekeeping(void)
 {
-       struct wcsession *sptr, *ss;
-       struct wcsession *sessions_to_kill = NULL;
+       wcsession *sptr, *ss;
+       wcsession *sessions_to_kill = NULL;
        int num_sessions = 0;
        static int num_threads = MIN_WORKER_THREADS;
 
-       /*
+       /**
         * Lock the session list, moving any candidates for euthanasia into
         * a separate list.
         */
@@ -47,16 +67,16 @@ void do_housekeeping(void)
        for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
                ++num_sessions;
 
-               /* Kill idle sessions */
+               /** Kill idle sessions */
                if ((time(NULL) - (sptr->lastreq)) >
                   (time_t) WEBCIT_TIMEOUT) {
                        sptr->killthis = 1;
                }
 
-               /* Remove sessions flagged for kill */
+               /** Remove sessions flagged for kill */
                if (sptr->killthis) {
 
-                       /* remove session from linked list */
+                       /** remove session from linked list */
                        if (sptr == SessionList) {
                                SessionList = SessionList->next;
                        }
@@ -72,26 +92,21 @@ void do_housekeeping(void)
        }
        pthread_mutex_unlock(&SessionListMutex);
 
-       /*
+       /**
         * Now free up and destroy the culled sessions.
         */
        while (sessions_to_kill != NULL) {
                lprintf(3, "Destroying session %d\n", sessions_to_kill->wc_session);
                pthread_mutex_lock(&sessions_to_kill->SessionMutex);
-               close(sessions_to_kill->serv_sock);
-               close(sessions_to_kill->chat_sock);
-               if (sessions_to_kill->preferences != NULL) {
-                       free(sessions_to_kill->preferences);
-               }
-               free_attachments(sessions_to_kill);
                pthread_mutex_unlock(&sessions_to_kill->SessionMutex);
                sptr = sessions_to_kill->next;
-               free(sessions_to_kill);
+
+               DestroySession(&sessions_to_kill);
                sessions_to_kill = sptr;
                --num_sessions;
        }
 
-       /*
+       /**
         * If there are more sessions than threads, then we should spawn
         * more threads ... up to a predefined maximum.
         */
@@ -105,7 +120,7 @@ void do_housekeeping(void)
 }
 
 
-/* 
+/*
  * Wake up occasionally and clean house
  */
 void housekeeping_loop(void)
@@ -118,11 +133,9 @@ void housekeeping_loop(void)
 
 
 /*
+ * Create a Session id
  * Generate a unique WebCit session ID (which is not the same thing as the
  * Citadel session ID).
- *
- * FIXME ... ensure that session number is truly unique
- *
  */
 int GenerateSessionID(void)
 {
@@ -136,41 +149,10 @@ int GenerateSessionID(void)
 }
 
 
-/*
- * Collapse multiple cookies on one line
- */
-int req_gets(int sock, char *buf, char *hold)
-{
-       int a;
-
-       if (strlen(hold) == 0) {
-               strcpy(buf, "");
-               a = client_getln(sock, buf, SIZ);
-               if (a<1) return(-1);
-       } else {
-               safestrncpy(buf, hold, SIZ);
-       }
-       strcpy(hold, "");
-
-       if (!strncasecmp(buf, "Cookie: ", 8)) {
-               for (a = 0; a < strlen(buf); ++a)
-                       if (buf[a] == ';') {
-                               sprintf(hold, "Cookie: %s", &buf[a + 1]);
-                               buf[a] = 0;
-                               while (isspace(hold[8]))
-                                       strcpy(&hold[8], &hold[9]);
-                               return(0);
-                       }
-       }
-
-       return(0);
-}
-
 /*
  * lingering_close() a`la Apache. see
  * http://www.apache.org/docs/misc/fin_wait_2.html for rationale
  */
-
 int lingering_close(int fd)
 {
        char buf[SIZ];
@@ -206,23 +188,42 @@ int lingering_close(int fd)
 
 
 /*
- * Check for bogus requests coming from (for example) brain-dead
- * Windoze boxes that are infected with the latest worm-of-the-week.
- * If we detect one of these, bail out without bothering our Citadel
- * server.
+ * Look for commonly-found probes of malware such as worms, viruses, trojans, and Microsoft Office.
+ * Short-circuit these requests so we don't have to send them through the full processing loop.
  */
-int is_bogus(char *http_cmd) {
-
-       if (!strncasecmp(http_cmd, "GET /scripts/root.exe", 21)) return(1);
-       if (!strncasecmp(http_cmd, "GET /c/winnt", 12)) return(2);
-       if (!strncasecmp(http_cmd, "GET /MSADC/", 11)) return(3);
+int is_bogus(StrBuf *http_cmd) {
+       const char *url;
+       int i, max;
+       const char *bogus_prefixes[] = {
+               "/scripts/root.exe",    /* Worms and trojans and viruses, oh my! */
+               "/c/winnt",
+               "/MSADC/",
+               "/_vti",                /* Broken Microsoft DAV implementation */
+               "/MSOffice",            /* Stoopid MSOffice thinks everyone is IIS */
+               "/nonexistenshit"       /* Exploit found in the wild January 2009 */
+       };
+
+       url = ChrPtr(http_cmd);
+       if (IsEmptyStr(url)) return(1);
+       ++url;
+
+       max = sizeof(bogus_prefixes) / sizeof(char *);
+
+       for (i=0; i<max; ++i) {
+               if (!strncasecmp(url, bogus_prefixes[i], strlen(bogus_prefixes[i]))) {
+                       return(2);
+               }
+       }
 
        return(0);      /* probably ok */
 }
 
 
+/*const char *nix(void *vptr) {return ChrPtr( (StrBuf*)vptr);}*/
 
 /*
+ * handle one request
+ *
  * This loop gets called once for every HTTP connection made to WebCit.  At
  * this entry point we have an HTTP socket with a browser allegedly on the
  * other end, but we have not yet bound to a WebCit session.
@@ -233,19 +234,24 @@ int is_bogus(char *http_cmd) {
  * function returns, the worker thread is then free to handle another
  * transaction.
  */
-void context_loop(int sock)
+void context_loop(int *sock)
 {
-       struct httprequest *req = NULL;
-       struct httprequest *last = NULL;
-       struct httprequest *hptr;
-       char buf[SIZ], hold[SIZ];
+       const char *Pos = NULL;
+       const char *buf;
        int desired_session = 0;
        int got_cookie = 0;
        int gzip_ok = 0;
-       struct wcsession *TheSession, *sptr;
-       char httpauth_string[SIZ];
-       char httpauth_user[SIZ];
-       char httpauth_pass[SIZ];
+       wcsession *TheSession, *sptr;
+       char httpauth_string[1024];
+       char httpauth_user[1024];
+       char httpauth_pass[1024];
+       int session_is_new = 0;
+       int nLine = 0;
+       int LineLen;
+       void *vLine;
+       StrBuf *Buf, *Line, *LastLine, *HeaderName, *ReqLine, *ReqType, *HTTPVersion;
+       const char *pch, *pchs, *pche;
+       HashList *HTTPHeaders;
 
        strcpy(httpauth_string, "");
        strcpy(httpauth_user, DEFAULT_HTTPAUTH_USER);
@@ -254,116 +260,200 @@ void context_loop(int sock)
        /*
         * Find out what it is that the web browser is asking for
         */
-       memset(hold, 0, sizeof(hold));
+       HeaderName = NewStrBuf();
+       Buf = NewStrBuf();
+       LastLine = NULL;
+       HTTPHeaders = NewHash(1, NULL);
+
+       /*
+        * Read in the request
+        */
        do {
-               if (req_gets(sock, buf, hold) < 0) return;
-
-               /*
-                * Can we compress?
-                */
-               if (!strncasecmp(buf, "Accept-encoding:", 16)) {
-                       if (strstr(&buf[16], "gzip")) {
-                               gzip_ok = 1;
-                       }
-               }
+               nLine ++;
+               Line = NewStrBuf();
 
-               /*
-                * Browser-based sessions use cookies for session authentication
-                */
-               if (!strncasecmp(buf, "Cookie: webcit=", 15)) {
-                       cookie_to_stuff(&buf[15], &desired_session,
-                               NULL, 0, NULL, 0, NULL, 0);
-                       got_cookie = 1;
-               }
 
-               /*
-                * GroupDAV-based sessions use HTTP authentication
-                */
-               if (!strncasecmp(buf, "Authorization: Basic ", 21)) {
-                       CtdlDecodeBase64(httpauth_string, &buf[21], strlen(&buf[21]));
-                       extract_token(httpauth_user, httpauth_string, 0, ':', sizeof httpauth_user);
-                       extract_token(httpauth_pass, httpauth_string, 1, ':', sizeof httpauth_pass);
+               if (ClientGetLine(sock, Line, Buf, &Pos) < 0) return;
+
+               LineLen = StrLength(Line);
+
+               if (nLine == 1) {
+                       ReqLine = Line;
+                       continue;
+               }
+               if (LineLen == 0) {
+                       FreeStrBuf(&Line);
+                       continue;
                }
 
-               if (!strncasecmp(buf, "If-Modified-Since: ", 19)) {
-                       if_modified_since = httpdate_to_timestamp(&buf[19]);
+               /* Do we need to Unfold? */
+               if ((LastLine != NULL) && 
+                   (isspace(*ChrPtr(Line)))) {
+                       pch = pchs = ChrPtr(Line);
+                       pche = pchs + StrLength(Line);
+                       while (isspace(*pch) && (pch < pche))
+                               pch ++;
+                       StrBufCutLeft(Line, pch - pchs);
+                       StrBufAppendBuf(LastLine, Line, 0);
+                       FreeStrBuf(&Line);
+                       continue;
                }
 
-               /*
-                * Read in the request
-                */
-               hptr = (struct httprequest *)
-                       malloc(sizeof(struct httprequest));
-               if (req == NULL)
-                       req = hptr;
-               else
-                       last->next = hptr;
-               hptr->next = NULL;
-               last = hptr;
+               StrBufSanitizeAscii(Line, 'ยง');
+               StrBufExtract_token(HeaderName, Line, 0, ':');
 
-               safestrncpy(hptr->line, buf, sizeof hptr->line);
+               pchs = ChrPtr(Line);
+               pch = pchs + StrLength(HeaderName) + 1;
+               pche = pchs + StrLength(Line);
+               while (isspace(*pch) && (pch < pche))
+                       pch ++;
+               StrBufCutLeft(Line, pch - pchs);
 
-       } while (strlen(buf) > 0);
+               StrBufUpCase(HeaderName);
+               Put(HTTPHeaders, SKEY(HeaderName), Line, HFreeStrBuf);
+               LastLine = Line;
+       } while (LineLen > 0);
+       FreeStrBuf(&HeaderName);
 
-       safestrncpy(buf, req->line, sizeof buf);
-       lprintf(5, "HTTP: %s\n", buf);
+/*     dbg_PrintHash(HTTPHeaders, nix, NULL);  */
+
+
+       /*
+        * Can we compress?
+        */
+       if (GetHash(HTTPHeaders, HKEY("ACCEPT-ENCODING"), &vLine) && 
+           (vLine != NULL)) {
+               buf = ChrPtr((StrBuf*)vLine);
+               if (strstr(&buf[16], "gzip")) {
+                       gzip_ok = 1;
+               }
+       }
 
-       /* Check for bogus requests */
-       if (is_bogus(buf)) goto bail;
+       /*
+        * Browser-based sessions use cookies for session authentication
+        */
+       if (GetHash(HTTPHeaders, HKEY("COOKIE"), &vLine) && 
+           (vLine != NULL)) {
+               cookie_to_stuff(vLine, &desired_session,
+                               NULL, NULL, NULL);
+               got_cookie = 1;
+       }
 
        /*
-        * If requesting a non-root page, there should already be a cookie
-        * set.  If there isn't, the client browser has cookies turned off
-        * (or doesn't support them) and we have to barf & bail.
+        * GroupDAV-based sessions use HTTP authentication
         */
-       remove_token(buf, 0, ' ');
-       if (buf[1]==' ') buf[1]=0;
+       if (GetHash(HTTPHeaders, HKEY("AUTHORIZATION"), &vLine) && 
+           (vLine != NULL)) {
+               Line = (StrBuf*)vLine;
+               if (strncasecmp(ChrPtr(Line), "Basic", 5) == 0) {
+                       StrBufCutLeft(Line, 6);
+                       CtdlDecodeBase64(httpauth_string, ChrPtr(Line), StrLength(Line));
+                       extract_token(httpauth_user, httpauth_string, 0, ':', sizeof httpauth_user);
+                       extract_token(httpauth_pass, httpauth_string, 1, ':', sizeof httpauth_pass);
+               }
+               else 
+                       lprintf(1, "Authentication scheme not supported! [%s]\n", ChrPtr(Line));
+       }
+
+       if (GetHash(HTTPHeaders, HKEY("IF-MODIFIED-SINCE"), &vLine) && 
+           (vLine != NULL)) {
+               if_modified_since = httpdate_to_timestamp((StrBuf*)vLine);
+       }
+
+
+
+       ReqType = NewStrBuf();
+       HTTPVersion = NewStrBuf();
+       StrBufExtract_token(HTTPVersion, ReqLine, 2, ' ');
+       StrBufExtract_token(ReqType, ReqLine, 0, ' ');
+       StrBufCutLeft(ReqLine, StrLength(ReqType) + 1);
+       StrBufCutRight(ReqLine, StrLength(HTTPVersion) + 1);
 
        /*
+        * If the request is prefixed by "/webcit" then chop that off.  This
+        * allows a front end web server to forward all /webcit requests to us
+        * while still using the same web server port for other things.
+        */
+       if ( (StrLength(ReqLine) >= 8) && (strstr(ChrPtr(ReqLine), "/webcit/")) ) {
+               StrBufCutLeft(ReqLine, 7);
+       }
+
+       /* 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 %s\n", ChrPtr(ReqType), ChrPtr(ReqLine), ChrPtr(HTTPVersion));
+#ifdef TECH_PREVIEW
+       }
+#endif
+
+       /** Check for bogus requests */
+       if ((StrLength(HTTPVersion) == 0) ||
+           (StrLength(ReqType) == 0) || 
+           is_bogus(ReqLine)) {
+               StrBufPlain(ReqLine, HKEY("/404 HTTP/1.1"));
+               StrBufPlain(ReqType, HKEY("GET"));
+       }
+       FreeStrBuf(&HTTPVersion);
+
+       /**
         * While we're at it, gracefully handle requests for the
         * robots.txt and favicon.ico files.
         */
-       if (!strncasecmp(buf, "/robots.txt", 11)) {
-               strcpy(req->line, "GET /static/robots.txt"
-                               "?force_close_session=yes HTTP/1.1");
+       if (!strncasecmp(ChrPtr(ReqLine), "/robots.txt", 11)) {
+               StrBufPlain(ReqLine, 
+                           HKEY("/static/robots.txt"
+                                "?force_close_session=yes HTTP/1.1"));
+               StrBufPlain(ReqType, HKEY("GET"));
        }
-       else if (!strncasecmp(buf, "/favicon.ico", 12)) {
-               strcpy(req->line, "GET /static/favicon.ico");
+       else if (!strncasecmp(ChrPtr(ReqLine), "/favicon.ico", 12)) {
+               StrBufPlain(ReqLine, HKEY("/static/favicon.ico"));
+               StrBufPlain(ReqType, HKEY("GET"));
        }
 
-       /* These are the URL's which may be executed without a
+       /**
+        * These are the URL's which may be executed without a
         * session cookie already set.  If it's not one of these,
         * force the session to close because cookies are
         * probably disabled on the client browser.
         */
-       else if ( (strcmp(buf, "/"))
-               && (strncasecmp(buf, "/listsub", 8))
-               && (strncasecmp(buf, "/freebusy", 9))
-               && (strncasecmp(buf, "/do_logout", 10))
-               && (strncasecmp(buf, "/groupdav", 9))
-               && (strncasecmp(buf, "/rss", 4))
+       else if ( (StrLength(ReqLine) > 1 )
+               && (strncasecmp(ChrPtr(ReqLine), "/listsub", 8))
+               && (strncasecmp(ChrPtr(ReqLine), "/freebusy", 9))
+               && (strncasecmp(ChrPtr(ReqLine), "/do_logout", 10))
+               && (strncasecmp(ChrPtr(ReqLine), "/groupdav", 9))
+               && (strncasecmp(ChrPtr(ReqLine), "/static", 7))
+               && (strncasecmp(ChrPtr(ReqLine), "/rss", 4))
+               && (strncasecmp(ChrPtr(ReqLine), "/404", 4))
                && (got_cookie == 0)) {
-               strcpy(req->line, "GET /static/nocookies.html"
-                               "?force_close_session=yes HTTP/1.1");
+               StrBufPlain(ReqLine, 
+                           HKEY("/static/nocookies.html"
+                                "?force_close_session=yes"));
        }
 
-       /*
+       /**
         * 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; sptr = sptr->next) {
-
-                       /* If HTTP-AUTH, look for a session with matching credentials */
-                       if ( (strlen(httpauth_user) > 0)
-                          &&(!strcasecmp(sptr->httpauth_user, httpauth_user))
-                          &&(!strcasecmp(sptr->httpauth_pass, httpauth_pass)) ) {
+               for (sptr = SessionList; 
+                    ((sptr != NULL) && (TheSession == NULL)); 
+                     sptr = sptr->next) {
+
+                       /** If HTTP-AUTH, look for a session with matching credentials */
+                       if ( (!IsEmptyStr(httpauth_user))
+                            &&(!strcasecmp(ChrPtr(sptr->httpauth_user), httpauth_user))
+                            &&(!strcasecmp(ChrPtr(sptr->httpauth_pass), httpauth_pass)) ) {
                                TheSession = sptr;
                        }
 
-                       /* If cookie-session, look for a session with matching session ID */
+                       /** If cookie-session, look for a session with matching session ID */
                        if ( (desired_session != 0) && (sptr->wc_session == desired_session)) {
                                TheSession = sptr;
                        }
@@ -372,26 +462,47 @@ void context_loop(int sock)
                pthread_mutex_unlock(&SessionListMutex);
        }
 
-       /*
+       /**
         * Create a new session if we have to
         */
        if (TheSession == NULL) {
                lprintf(3, "Creating a new session\n");
-               TheSession = (struct wcsession *)
-                       malloc(sizeof(struct wcsession));
-               memset(TheSession, 0, sizeof(struct wcsession));
+               TheSession = (wcsession *)
+                       malloc(sizeof(wcsession));
+               memset(TheSession, 0, sizeof(wcsession));
+               TheSession->headers = HTTPHeaders;
                TheSession->serv_sock = (-1);
                TheSession->chat_sock = (-1);
-               TheSession->wc_session = GenerateSessionID();
-               strcpy(TheSession->httpauth_user, httpauth_user);
-               strcpy(TheSession->httpauth_pass, httpauth_pass);
-               pthread_mutex_init(&TheSession->SessionMutex, NULL);
+       
+               /* 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 (desired_session == 0) {
+                       TheSession->wc_session = GenerateSessionID();
+               }
+               else {
+                       TheSession->wc_session = desired_session;
+               }
+
+               TheSession->httpauth_user = NewStrBufPlain(httpauth_user, -1);
+               TheSession->httpauth_pass = NewStrBufPlain(httpauth_user, -1);
 
+               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);
+               session_is_new = 1;
        }
+       TheSession->headers = HTTPHeaders;
 
        /*
         * A future improvement might be to check the session integrity
@@ -403,21 +514,50 @@ void context_loop(int sock)
         */
        pthread_mutex_lock(&TheSession->SessionMutex);          /* bind */
        pthread_setspecific(MyConKey, (void *)TheSession);
-       TheSession->http_sock = sock;
+       
        TheSession->lastreq = time(NULL);                       /* log */
+       TheSession->http_sock = *sock;
        TheSession->gzip_ok = gzip_ok;
-       session_loop(req);                              /* do transaction */
+
+       session_attach_modules(TheSession);
+
+       session_loop(ReqLine, ReqType, Buf, &Pos);                              /* do transaction */
+       session_detach_modules(TheSession);
+
+       TheSession->headers = NULL;
        pthread_mutex_unlock(&TheSession->SessionMutex);        /* unbind */
 
        /* Free the request buffer */
-bail:  while (req != NULL) {
-               hptr = req->next;
-               free(req);
-               req = hptr;
-       }
+       DeleteHash(&HTTPHeaders);
+       FreeStrBuf(&ReqLine);
+       FreeStrBuf(&ReqType);
+       FreeStrBuf(&Buf);
+}
 
-       /* Free up any session-local substitution variables which
-        * were set during this transaction
-        */
-       clear_local_substs();
+void tmplput_nonce(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       StrBufAppendPrintf(Target, "%ld",
+                          (WCC != NULL)? WCC->nonce:0);                   
+}
+
+void tmplput_current_user(StrBuf *Target, WCTemplputParams *TP)
+{
+       StrBufAppendTemplate(Target, TP, WC->wc_fullname, 0);
+}
+
+void tmplput_current_room(StrBuf *Target, WCTemplputParams *TP)
+{
+       StrBufAppendTemplate(Target, TP, WC->wc_roomname, 0); 
+}
+
+
+
+void 
+InitModule_CONTEXT
+(void)
+{
+       RegisterNamespace("CURRENT_USER", 0, 1, tmplput_current_user, CTX_NONE);
+       RegisterNamespace("CURRENT_ROOM", 0, 1, tmplput_current_room, CTX_NONE);
+       RegisterNamespace("NONCE", 0, 0, tmplput_nonce, 0);
 }