reset timeout watchdog when in a recursive eventloop

Author: Koen Deforche

examples/hangman/CMakeLists.txt

@@ -13,4 +13,19 @@ WT_ADD_EXAMPLE(hangman.wt
 )
 TARGET_LINK_LIBRARIES(hangman.wt wtdbo wtdbosqlite3)
 
+# Test whether crypt(3) is provided by libc. If it's not, check if
+# libcrypt exists and if it provides crypt(3).
+CHECK_FUNCTION_EXISTS(crypt CRYPT_EXISTS)
+IF(NOT CRYPT_EXISTS)
+  CHECK_LIBRARY_EXISTS(crypt crypt "" CRYPT_LIB_EXISTS)
+  IF(CRYPT_LIB_EXISTS)
+    SET(CMAKE_REQUIRED_LIBRARIES "crypt")
+    CHECK_FUNCTION_EXISTS(crypt CRYPT_EXISTS)
+  ENDIF(CRYPT_LIB_EXISTS)
+ENDIF(NOT CRYPT_EXISTS)
+
+IF(CRYPT_LIB_EXISTS)
+  TARGET_LINK_LIBRARIES(hangman.wt crypt)
+ENDIF(CRYPT_LIB_EXISTS)
+
 INCLUDE_DIRECTORIES(${WT_SOURCE_DIR}/src)

examples/hangman/HighScoresWidget.C

@@ -27,7 +27,7 @@ void HighScoresWidget::update()
 {
   clear();
 
-  WText *title = new WText("<h2>Hall of fame</h2>", this);
+  new WText("<h2>Hall of fame</h2>", this);
 
   int ranking = session_->findRanking(session_->user());
 

examples/hangman/ImagesWidget.C

@@ -14,7 +14,7 @@ const int ImagesWidget::maxGuesses_ = 9;
 
 ImagesWidget::ImagesWidget(WContainerWidget *parent)
 {
-  for (unsigned int i = 0; i <= maxGuesses_; ++i) {
+  for (int i = 0; i <= maxGuesses_; ++i) {
     std::string fname = "icons/hangman";
     fname += boost::lexical_cast<std::string>(i) + ".png";
     WImage *theImage = new WImage(fname, this);
@@ -40,7 +40,7 @@ void ImagesWidget::init()
 
 void ImagesWidget::badGuess()
 {
-  if (badGuesses_ < hangmanImages_.size() - 1) {
+  if (badGuesses_ < (int)hangmanImages_.size() - 1) {
     hangmanImages_[badGuesses_]->hide();
     hangmanImages_[++badGuesses_]->show();
   }

examples/hangman/Session.C

@@ -12,7 +12,7 @@
 using namespace Wt;
 
 Session::Session()
-  :  sqlite3_(WApplication::instance()->appRoot() + "hangman.db")
+  : sqlite3_(WApplication::instance()->appRoot() + "hangman.db")
 {
   session_.setConnection(sqlite3_);
   sqlite3_.setProperty("show-queries", "true");
@@ -38,7 +38,7 @@ bool Session::login(std::string name, std::string password)
   if (!user_)
     user_ = session_.add(new User(name, password));
 
-  bool ok = user_->password == password;
+  bool ok = user_->authenticate(password);
 
   transaction.commit();
 

examples/hangman/User.C

@@ -1,13 +1,74 @@
+/*
+ * Copyright (C) 2011 Emweb bvba, Kessel-Lo, Belgium.
+ *
+ * See the LICENSE file for terms of use.
+ */
+
+#if !defined(WIN32) && !defined(__QNXNTO__)
+#define _XOPEN_SOURCE
+#include <unistd.h>
+#endif
+
 #include "User.h"
 
+#if !defined(WIN32) && !defined(__CYGWIN__) && !defined(ANDROID)
+#define HAVE_CRYPT
+#endif
+
+#ifdef HAVE_CRYPT
+namespace {
+  std::string generateSalt() {
+    /* Salt generation from glibc manual */
+    unsigned long seed[2];
+    char salt[] = "$1$........";
+    const char *const seedchars =
+      "./0123456789ABCDEFGHIJKLMNOPQRST"
+      "UVWXYZabcdefghijklmnopqrstuvwxyz";
+     
+    /* Generate a (not very) random seed. */
+    seed[0] = time(NULL);
+    seed[1] = getpid() ^ (seed[0] >> 14 & 0x30000);
+     
+    /* Turn it into printable characters from `seedchars'. */
+    for (int i = 0; i < 8; i++)
+      salt[3+i] = seedchars[(seed[i/5] >> (i%5)*6) & 0x3f];
+
+    return salt;
+  }
+
+  std::string md5(const std::string& s, const std::string& salt) {
+    return crypt(s.c_str(), salt.c_str());
+  }
+}
+#endif
+
 using namespace Wt;
 using namespace Wt::Dbo;
 
-User::User(const std::string &name, const std::string &password) :
-  name(name),
-  password(password),
-  gamesPlayed(0),
-  score(0)
+User::User(const std::string &name, const std::string &password)
+  : name(name),
+    gamesPlayed(0),
+    score(0)
+{ 
+  setPassword(password);
+}
+
+
+void User::setPassword(const std::string& password)
 {
+#ifdef HAVE_CRYPT
+  password_ = md5(password, generateSalt());
+#else
+  // This should not be used in production...
+  password_ = password;
+#endif
+}
 
+bool User::authenticate(const std::string& password) const
+{
+#ifdef HAVE_CRYPT
+  return md5(password, password_) == password_;
+#else
+  return password_ == password;
+#endif
 }

examples/hangman/User.h

@@ -16,25 +16,30 @@
 
 class User : public Wt::Dbo::ptr<User> {
 public:
-  std::string     name;
-  std::string     password;
-  int             gamesPlayed;
-  long long       score;
-  Wt::WDateTime   lastLogin;
+  std::string   name;
+  int           gamesPlayed;
+  long long     score;
+  Wt::WDateTime lastLogin;
 
   template<class Action>
   void persist(Action& a)
   {
     Wt::Dbo::field(a, name,        "name");
-    Wt::Dbo::field(a, password,    "password");
+    Wt::Dbo::field(a, password_,   "password");
     Wt::Dbo::field(a, gamesPlayed, "gamesPlayed");
     Wt::Dbo::field(a, score,       "score");
     Wt::Dbo::field(a, lastLogin,   "lastLogin");
   }
 
   User() {}
 
+  void setPassword(const std::string& password);
+  bool authenticate(const std::string& password) const;
+
   User(const std::string &name, const std::string &password);
+
+private:
+  std::string password_;
 };
 
 typedef Wt::Dbo::collection< Wt::Dbo::ptr<User> > Users;

examples/hangman/WordWidget.h

@@ -26,7 +26,7 @@ class WordWidget : public Wt::WContainerWidget
   std::vector<Wt::WText *>       wordLetters_;
   std::wstring                   word_;
 
-  int                            displayedLetters_;
+  unsigned                       displayedLetters_;
 };
 
 #endif //WORD_WIDGET_H_

examples/hangman/hangman.C

@@ -19,7 +19,7 @@ Wt::WApplication *createApplication(const Wt::WEnvironment& env)
 
   app->useStyleSheet("style/hangman.css");
 
-  HangmanGame *game = new HangmanGame(app->root());
+  new HangmanGame(app->root());
 
   return app;
 }

examples/widgetgallery/MvcWidgets.C

@@ -81,7 +81,19 @@ void MvcWidgets::changeRegexp()
 {
   WString regexp = regexpFilter->text();
 
-  if (WRegExp(regexp).isValid()) {
+  bool valid;
+#ifndef WT_TARGET_JAVA
+  valid = WRegExp(regexp).isValid();
+#else
+  try {
+    WRegExp r(regexp.toUTF8());
+    valid = true;
+  } catch (std::exception& e) {
+    valid = false;
+  }
+#endif
+
+  if (valid) {
     filteredCocktails->setFilterRegExp(regexp);
     filteredSortedCocktails->setFilterRegExp(regexp);
     regexpFilter->removeStyleClass("Wt-invalid");

examples/wt-homepage/wt-home.xml

@@ -51,7 +51,7 @@
 	</div>
 
 	<div id="chat"></div>
-        <script src="http://www.webtoolkit.eu/wt/examples/simplechat/chat.js?div=chat" type="text/javascript"></script>
+	<script src="http://www.webtoolkit.eu/wt/examples/simplechat/chat.js?div=chat" type="text/javascript"></script>
 
 	<div class="clearall"></div>
       </div>