merged authentication branch

Author: Koen Deforche

.gitignore

@@ -1,7 +1,9 @@
 *~
+.DS_Store
+*.db
 build*/*
 doc/reference
 doc/examples
-CVS
-.DS_Store
 examples/*/resources
+resources/tiny_mce
+test/interactive

CMakeLists.txt

@@ -23,6 +23,7 @@ SET(WTISAPI_SOVERSION 7)
 SET(WTDBO_SOVERSION 30)
 SET(WTDBOSQLITE3_SOVERSION 30)
 SET(WTDBOPOSTGRES_SOVERSION 30)
+SET(WTTEST_SOVERSION 1)
 
 IF(NOT SHARED_LIBS)
   IF(WIN32)
@@ -86,6 +87,7 @@ ENDIF(GCC_COMPILER_VERSION MATCHES ".*4\\.4\\.4\\-14ubuntu5.*")
 OPTION(BUILD_EXAMPLES "Build examples" ON)
 OPTION(INSTALL_EXAMPLES "Install examples (binaries and source)" OFF)
 OPTION(INSTALL_RESOURCES "Install resources directory" ON)
+OPTION(ENABLE_SSL "Enable cryptography functions, using OpenSSL" ON)
 OPTION(ENABLE_GM "Enable GraphicsMagick, for supporting painting to raster images (PNG, GIF, ...) (WRasterImage)" ON)
 OPTION(ENABLE_HARU "Enable Haru Free PDF Library, which is used to provide support for painting to PDF (WPdfImage)" ON)
 OPTION(ENABLE_PANGO "Enable Pango Library, which is used for improved font support (WPdfImage and WRasterImage)" ON)
@@ -105,6 +107,9 @@ IF(NOT EXAMPLES_DESTINATION)
 ENDIF(NOT EXAMPLES_DESTINATION)
 
 IF(WIN32)
+  # required for all that uses boost.asio
+  ADD_DEFINITIONS(-D_WIN32_WINNT=0x0501)
+
   IF(SHARED_LIBS)
     # See http://svn.boost.org/trac/boost/ticket/3465
     SET(WT_NO_BOOST_INTRUSIVE true)
@@ -227,7 +232,7 @@ SET(SSL_PREFIX ${USERLIB_PREFIX} CACHE PATH
 SET(ZLIB_PREFIX ${USERLIB_PREFIX} CACHE PATH
   "Installation prefix of zlib library (overrides USERLIB_PREFIX)")
 SET(GM_PREFIX ${USERLIB_PREFIX} CACHE PATH
-  "Installation prefix of GraphicsMgick library (overrides GM_PREFIX)")
+  "Installation prefix of GraphicsMagick library (overrides USERLIB_PREFIX)")
 
 OPTION(DEBUG "Support for debugging, must be enabled also in wt_config.xml" OFF)
 IF(CYGWIN)
@@ -336,6 +341,8 @@ ELSE(BOOST_WT_MT_FOUND)
   ADD_DEFINITIONS(-DBOOST_DISABLE_THREADS -DSQLITE_THREADSAFE=0)
 ENDIF(BOOST_WT_MT_FOUND)
 
+
+
 FIND_PACKAGE(Doxygen)
 
 # Boost is used nearly everywhere, so we can put these here
@@ -436,6 +443,11 @@ IF(ENABLE_HARU AND HARU_FOUND)
   SET(WT_HAS_WPDFIMAGE true)
 ENDIF(ENABLE_HARU AND HARU_FOUND)
 
+IF(ENABLE_SSL AND SSL_FOUND)
+  SET(HAVE_SSL ON)
+  SET(WT_WITH_SSL true)  
+ENDIF(ENABLE_SSL AND SSL_FOUND)
+
 IF(ENABLE_GM AND GM_FOUND)
   SET(HAVE_GM ON)
   SET(WT_HAS_WRASTERIMAGE true)

Changelog

@@ -1,8 +1,47 @@
+07-11-2011:
+	* WException: new, public exception class (was previously an internal
+	one)
+
+	* WIOService: new, public service class for async I/O, and its
+	thread pool
+
+	* WStringStream: new, public fast stringstream implementation (was
+	previously an internal class)
+
+	* Wt/Auth: new, authentication module
+
+	* Wt/Json: new, JSON library
+
+	* Wt/Mail: new, mail client
+
+	* Wt/Http/Client: new, http client (former Client renamed to WtClient)
+
+	* Wt/Test/WTestEnvironment: has moved to a "wttest" pseudo-connector
+	library
+
+	* WFormWidget: added a valueText() that returns the textual
+	representation of the current value
+
+	* WApplication: added deferRendering() and resumeRendering() API,
+	useful for asynchronous client operations
+
+	* Wt::log(): global logging method, similar to but more useful
+	than WApplication::log()
+
+	* WTemplate: added support for functions, and two standard functions
+	id() and tr()
+
+	* WTemplate: implemented arguments parsing and use ("class")
+
+	* WebSession: added DoS meausures: ajax puzzle and plain session
+	rate limitation
+
 19-10-2011:
 	* WAbstractItemView: reimplemented and simplified header item rendering
 
-	* Wt.js: workaround browser bugs in scrollLeft reading in RTL mode,		fixing WAbstractItemView column resizing in RTL layouts.
-	
+	* Wt.js: workaround browser bugs in scrollLeft reading in RTL mode,
+	fixing WAbstractItemView column resizing in RTL layouts.
+
 12-10-2011:
 	* WRectF: fix isEmpty() to be more restrictive: only a rect with
 	width = 0 and height = 0 is now empty

Doxyfile

@@ -324,7 +324,7 @@ HIDE_UNDOC_CLASSES     = YES
 # If set to NO (the default) these declarations will be included in the 
 # documentation.
 
-HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_FRIEND_COMPOUNDS  = YES
 
 # If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
 # documentation blocks found inside the body of a function. 

WConfig.h.in

@@ -29,21 +29,13 @@
 
 #cmakedefine WT_HAS_WRASTERIMAGE
 #cmakedefine WT_HAS_WPDFIMAGE
+#cmakedefine WT_WITH_SSL
 
 #cmakedefine WT_NO_BOOST_INTRUSIVE
 #cmakedefine WT_NO_BOOST_RANDOM
 #cmakedefine WT_NO_STD_LOCALE
 #cmakedefine WT_NO_STD_WSTRING
-
-#if ${WT_DEBUG_ENABLED}
-#ifndef WT_TARGET_JAVA
-  #define WT_DEBUG(statement) do { if (Wt::WApplication::instance()->debug()) statement; } while(0)
-#else
-  #define WT_DEBUG(statement)
-#endif
-#else
-  #define WT_DEBUG(statement)
-#endif
+#cmakedefine WT_DEBUG_ENABLED
 
 #endif
 

examples/blog/BlogRSSFeed.C

@@ -8,11 +8,12 @@
 
 #include "BlogRSSFeed.h"
 
-#include "BlogSession.h"
+#include "model/BlogSession.h"
 #include "model/User.h"
 #include "model/Post.h"
 #include "model/Comment.h"
 #include "model/Tag.h"
+#include "model/Token.h"
 
 namespace dbo = Wt::Dbo;
 

examples/blog/BlogSession.C

@@ -6,16 +6,19 @@ IF(ASCIIDOC_EXECUTABLE)
 ENDIF(ASCIIDOC_EXECUTABLE)
 
 WT_ADD_EXAMPLE(blog.wt
+  model/BlogSession.C
+  model/BlogUserDatabase.C
   model/Post.C
   model/Comment.C
   model/User.C
-  model/Tag.C
+ model/Tag.C
+  model/Token.C
   view/PostView.C
   view/CommentView.C
+  view/BlogLoginWidget.C
   view/BlogView.C
   view/EditUsers.C
   asciidoc/asciidoc.C
-  BlogSession.C
   BlogRSSFeed.C
   blog.C
 )

examples/blog/CMakeLists.txt

@@ -7,11 +7,17 @@
 #include <Wt/WContainerWidget>
 #include <Wt/WServer>
 
+#include "model/BlogSession.h"
+#include "model/Token.h"
+#include "model/User.h"
 #include "view/BlogView.h"
 #include "BlogRSSFeed.h"
 
 using namespace Wt;
 
+//static const char *FeedUrl = "/Test/blog/feed/";
+//static const char *BlogUrl = "/Test/blog";
+
 static const char *FeedUrl = "/blog/feed/";
 static const char *BlogUrl = "/blog";
 
@@ -43,7 +49,9 @@ int main(int argc, char **argv)
       "", "It's just an example.");
 
     server.addResource(&rssFeed, FeedUrl);
-    server.addEntryPoint(Application, createApplication, BlogUrl);
+    server.addEntryPoint(Application, createApplication, BlogUrl);    
+
+    BlogSession::initAuth();
 
     std::cerr << "\n\n -- Warning: Example is deployed at '"
       << BlogUrl << "'\n\n";

examples/blog/blog.C

@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <messages>
   <message id="blog-login">
+    ${name} ${password} ${remember-me} ${login},
+  </message>
+
+  <message id="blog-login-status">
     <div class="login-box">
       <div class="login-menu">
-	${name} ${passwd} ${rememberMe} ${login-button} ${login-link} ${register-link}
+	${login} ${login-link} | ${register-link}
 	<a href="${feed-url}">
-	  <img src="/css/rss.png" alt="Rss Feed"
-	     style="margin-left: 6px; vertical-align: top;"/>
+	  <img src="css/rss.png" alt="Rss Feed"
+	       style="margin-left: 6px; vertical-align: top;"/>
 	</a>
       </div>
       <div class="user-menu">
-	${archive-link}
+	${archive-link} ${profile-link} ${author-panel-link} ${userlist-link} 
       </div>
     </div>
   </message>
 
-  <message id="remember-me">Remember me</message>
-
   <message id="edit-users-list">
     <h4>Registered users</h4>
     ${user-list}
@@ -43,7 +45,7 @@
 
   <message id="blog-mustlogin">
     <div class="profile-panel">
-      <h4>You need to log to access this function</h4>
+      <h4>You need to log in to access this function</h4>
     </div>
   </message>
 
@@ -137,21 +139,6 @@
     </div>
   </message>
 
-  <message id="blog-logout">
-    <div class="login-box">
-      <div class="login-menu">
-        <b>${user}</b> ${logout-link}
-        <a href="${feed-url}">
-	  <img src="/css/rss.png" alt="Rss Feed"
-	     style="margin-left: 6px; vertical-align: top;"/>
-        </a>
-      </div>
-      <div class="user-menu">
-	${archive-link} ${profile-link} ${author-panel-link} ${userlist-link} 
-      </div>
-    </div>
-  </message>
-
   <message id="blog-post">
     <h4>${title}</h4>
     <div id="${anchor}">