Revision: 4183
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4183&view=rev
Author: atkac
Date: 2010-11-02 09:16:49 +0000 (Tue, 02 Nov 2010)
Log Message:
-----------
[Development] Implement PasswordValidator class on Windows (Martin Koegler)
Modified Paths:
--------------
trunk/common/rfb/CMakeLists.txt
trunk/common/rfb/Makefile.am
trunk/common/rfb/SSecurityPlain.cxx
trunk/configure.ac
Added Paths:
-----------
trunk/common/rfb/WinPasswdValidator.cxx
trunk/common/rfb/WinPasswdValidator.h
Modified: trunk/common/rfb/CMakeLists.txt
===================================================================
--- trunk/common/rfb/CMakeLists.txt 2010-11-02 08:45:30 UTC (rev 4182)
+++ trunk/common/rfb/CMakeLists.txt 2010-11-02 09:16:49 UTC (rev 4183)
@@ -62,6 +62,7 @@
UpdateTracker.cxx
VNCSConnectionST.cxx
VNCServerST.cxx
+ WinPasswdValidator.cxx # Windows specific code
ZRLEEncoder.cxx
ZRLEDecoder.cxx
encodings.cxx
Modified: trunk/common/rfb/Makefile.am
===================================================================
--- trunk/common/rfb/Makefile.am 2010-11-02 08:45:30 UTC (rev 4182)
+++ trunk/common/rfb/Makefile.am 2010-11-02 09:16:49 UTC (rev 4183)
@@ -67,4 +67,8 @@
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
Modified: trunk/common/rfb/SSecurityPlain.cxx
===================================================================
--- trunk/common/rfb/SSecurityPlain.cxx 2010-11-02 08:45:30 UTC (rev 4182)
+++ trunk/common/rfb/SSecurityPlain.cxx 2010-11-02 09:16:49 UTC (rev 4183)
@@ -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 @@
{
#ifdef HAVE_PAM
valid = new UnixPasswordValidator();
+#elif BUILD_WIN
+ valid = new WinPasswdValidator();
#else
valid = NULL;
#endif
Added: trunk/common/rfb/WinPasswdValidator.cxx
===================================================================
--- trunk/common/rfb/WinPasswdValidator.cxx (rev 0)
+++ trunk/common/rfb/WinPasswdValidator.cxx 2010-11-02 09:16:49 UTC (rev
4183)
@@ -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;
+}
Added: trunk/common/rfb/WinPasswdValidator.h
===================================================================
--- trunk/common/rfb/WinPasswdValidator.h (rev 0)
+++ trunk/common/rfb/WinPasswdValidator.h 2010-11-02 09:16:49 UTC (rev
4183)
@@ -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 */
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2010-11-02 08:45:30 UTC (rev 4182)
+++ trunk/configure.ac 2010-11-02 09:16:49 UTC (rev 4183)
@@ -43,6 +43,9 @@
;;
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
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
