[Development] Implement PasswordValidator class on Windows (Martin Koegler)

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4183 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/common/rfb/CMakeLists.txt b/common/rfb/CMakeLists.txt
index 6bfb5fefeab94bc4fd6e88a0a46a20c8748443d1..5ae9ade0d97d1b427ad52afeb174a77c8aa256e3 100644 (file)
--- a/common/rfb/CMakeLists.txt
+++ b/common/rfb/CMakeLists.txt
@@ -62,6 +62,7 @@ add_library(rfb STATIC
   UpdateTracker.cxx
   VNCSConnectionST.cxx
   VNCServerST.cxx
+  WinPasswdValidator.cxx       # Windows specific code
   ZRLEEncoder.cxx
   ZRLEDecoder.cxx
   encodings.cxx

diff --git a/common/rfb/Makefile.am b/common/rfb/Makefile.am
index 796c10b6d3575ead22cc18da459e6e62a3a90464..519cbd07551b319dd9f0e84f9044437d07096722 100644 (file)
--- a/common/rfb/Makefile.am
+++ b/common/rfb/Makefile.am
@@ -67,4 +67,8 @@ librfb_la_CPPFLAGS += -I$(top_srcdir)/common/jpeg -I$(top_builddir)/common/jpeg
 librfb_la_LIBADD += $(top_builddir)/common/jpeg/libjpeg.la
 endif
 
+if BUILD_WIN
+librfb_la_SOURCES += WinPasswdValidator.h WinPasswdValidator.cxx
+endif
+
 EXTRA_DIST = CMakeLists.txt

diff --git a/common/rfb/SSecurityPlain.cxx b/common/rfb/SSecurityPlain.cxx
index 84ef099771055b490031c099dc595fd65cc21a75..f5a5cc7392a8555bde4c03e1f24bb804fe699165 100644 (file)
--- a/common/rfb/SSecurityPlain.cxx
+++ b/common/rfb/SSecurityPlain.cxx
@@ -28,6 +28,9 @@
 #ifdef HAVE_PAM
 #include <rfb/UnixPasswordValidator.h>
 #endif
+#ifdef BUILD_WIN
+#include <rfb/WinPasswdValidator.h>
+#endif
 
 using namespace rfb;
 
@@ -61,6 +64,8 @@ SSecurityPlain::SSecurityPlain()
 {
 #ifdef HAVE_PAM
   valid = new UnixPasswordValidator();
+#elif BUILD_WIN
+  valid = new WinPasswdValidator();
 #else
   valid = NULL;
 #endif

diff --git a/common/rfb/WinPasswdValidator.cxx b/common/rfb/WinPasswdValidator.cxx
new file mode 100644 (file)
index 0000000..7f8fbf2
--- /dev/null
+++ b/common/rfb/WinPasswdValidator.cxx
@@ -0,0 +1,51 @@
+/* Copyright (C) 2005-2006 Martin Koegler
+ * Copyright (C) 2006 OCCAM Financial Technology
+ * Copyright (C) 2010 TigerVNC Team
+ * 
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+ * USA.
+ */
+
+#include <rfb/WinPasswdValidator.h>
+#include <windows.h>
+#include <tchar.h>
+
+using namespace rfb;
+
+// This method will only work for Windows NT, 2000, and XP (and possibly Vista)
+bool WinPasswdValidator::validateInternal(rfb::SConnection* sc,
+                                         const char* username,
+                                         const char* password)
+{
+       TCHAR* user = (TCHAR*) strDup(username);
+       TCHAR* pass = (TCHAR*) strDup(password);
+       TCHAR* domain = (TCHAR*) strDup(".");
+       HANDLE handle;
+
+       BOOL ret = LogonUser(user, domain, pass, LOGON32_LOGON_NETWORK,
+                            LOGON32_PROVIDER_DEFAULT, &handle);
+       delete [] user;
+       delete [] pass;
+       delete [] domain;
+
+       if (ret != 0) {
+               CloseHandle(handle);
+               return true;
+       }
+
+       int err = GetLastError();
+
+       return false;
+}

diff --git a/common/rfb/WinPasswdValidator.h b/common/rfb/WinPasswdValidator.h
new file mode 100644 (file)
index 0000000..ef2310a
--- /dev/null
+++ b/common/rfb/WinPasswdValidator.h
@@ -0,0 +1,37 @@
+/* Copyright (C) 2005-2006 Martin Koegler
+ * Copyright (C) 2006 OCCAM Financial Technology
+ * Copyright (C) 2010 TigerVNC Team
+ * 
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+ * USA.
+ */
+
+#ifndef __RFB_WINPASSWDVALIDATOR_H__
+#define __RFB_WINPASSWDVALIDATOR_H__
+
+#include <rfb/SSecurityPlain.h>
+
+namespace rfb
+{
+  class WinPasswdValidator : public PasswordValidator {
+  public:
+    WinPasswdValidator() {};
+    virtual ~WinPasswdValidator() {};
+  protected:
+    bool validateInternal(SConnection *sc, const char* username, const char* password);
+  };
+}
+
+#endif /* WINPASSWDVALIDATOR_H */

diff --git a/configure.ac b/configure.ac
index 560f5fc940e33c144d94416b16e2031f6e8a6c47..811342ab285c19c254aa00a2f97353207e47e24f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,9 @@ mingw*)
        ;;
 esac
 AM_CONDITIONAL([BUILD_WIN], [test "x$BUILD_WIN" = xyes])
+if test "x$BUILD_WIN" = xyes; then
+       AC_DEFINE([BUILD_WIN],1,[is it a windows build])
+fi
 
 dnl FIXME: Check for MIT-SHM properly, add a corresponding --with option.
 if test "$USE_MITSHM" = yes; then