native windows http get for premium auth

src/lib/arch/CArch.h

@@ -52,6 +52,7 @@
 #	include "CArchTaskBarWindows.h"
 #	include "CArchTimeWindows.h"
 #	include "CArchPluginWindows.h"
+#	include "CArchInternetWindows.h"
 #elif SYSAPI_UNIX
 #	include "CArchConsoleUnix.h"
 #	include "CArchDaemonUnix.h"
@@ -67,6 +68,7 @@
 #	include "CArchTaskBarXWindows.h"
 #	include "CArchTimeUnix.h"
 #	include "CArchPluginUnix.h"
+#	include "CArchInternetUnix.h"
 #endif
 
 /*!
@@ -119,10 +121,12 @@ public:
 	static CArch*		getInstance();
 
 	ARCH_PLUGIN&		plugin() const { return (ARCH_PLUGIN&)m_plugin; }
+	ARCH_INTERNET&		internet() const { return (ARCH_INTERNET&)m_internet; }
 
 private:
 	static CArch*		s_instance;
 	ARCH_PLUGIN			m_plugin;
+	ARCH_INTERNET		m_internet;
 };
 
 //! Convenience object to lock/unlock an arch mutex

src/lib/arch/CArchInternetUnix.cpp

@@ -0,0 +1,24 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2014 Bolton Software Ltd.
+ *
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ *
+ * This package 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CArchInternetUnix.h"
+
+CString
+CArchInternetUnix::get(const CString& url)
+{
+    return "Not implemented";
+}

src/lib/arch/CArchInternetUnix.h

@@ -0,0 +1,27 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2014 Bolton Software Ltd.
+ *
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ *
+ * This package 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define ARCH_INTERNET CArchInternetUnix
+
+#include "CString.h"
+
+class CArchInternetUnix {
+public:
+	CString				get(const CString& url);
+};

src/lib/arch/CArchInternetWindows.cpp

@@ -0,0 +1,119 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2014 Bolton Software Ltd.
+ *
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ *
+ * This package 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CArchInternetWindows.h"
+#include "CArch.h"
+#include "Version.h"
+#include "XArchWindows.h"
+#include <sstream>
+#include <Wininet.h>
+
+CString
+CArchInternetWindows::get(const CString& url)
+{
+	std::stringstream userAgent;
+	userAgent << "Synergy ";
+	userAgent << kVersion;
+
+    HINTERNET session = InternetOpen(
+		userAgent.str().c_str(),
+		INTERNET_OPEN_TYPE_PRECONFIG,
+		NULL, NULL, NULL);
+
+	if (session == NULL) {
+		throw XArch(new XArchEvalWindows());
+	}
+
+	// InternetCrackUrl didn't seem to work too well, this isn't quite
+	// as robust, but it should do just fine for basic URLs.
+	size_t schemeEnd = url.find("://");
+	size_t hostEnd = url.find('/', schemeEnd + 3);
+	CString scheme = url.substr(0, schemeEnd);
+	CString host = url.substr(schemeEnd + 3, hostEnd - (schemeEnd + 3));
+	CString path = url.substr(hostEnd);
+
+	INTERNET_PORT port = INTERNET_DEFAULT_HTTP_PORT;
+	DWORD requestFlags = 0;
+
+	if (scheme.find("https") != CString::npos) {
+		port = INTERNET_DEFAULT_HTTPS_PORT;
+		requestFlags = INTERNET_FLAG_SECURE;
+	}
+
+	HINTERNET connect = InternetConnect(
+		session, host.c_str(), port, NULL, NULL,
+		INTERNET_SERVICE_HTTP, NULL, NULL);
+	
+	if (connect == NULL) {
+		throw XArch(new XArchEvalWindows());
+	}
+
+	HINTERNET request = HttpOpenRequest(
+		connect, "GET", path.c_str(),
+		HTTP_VERSION, NULL,
+		NULL, requestFlags, NULL);
+
+	if (request == NULL) {
+		throw XArch(new XArchEvalWindows());
+	}
+
+	CString headers("Content-Type: text/html");
+	if (!HttpSendRequest(request, headers.c_str(), (DWORD)headers.length(), NULL, NULL)) {
+		int error = GetLastError();
+		throw XArch(new XArchEvalWindows());
+	}
+	
+	std::stringstream result;
+	CHAR buffer[1025];
+    DWORD read = 0;
+
+	while (InternetReadFile(request, buffer, sizeof(buffer) - 1, &read) && (read != 0)) {
+		buffer[read] = 0;
+		result << buffer;
+		read = 0;
+	}
+
+    InternetCloseHandle(request);
+    InternetCloseHandle(connect);
+    InternetCloseHandle(session);
+
+	return result.str();
+}
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2014 Bolton Software Ltd.
+ *
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ *
+ * This package 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CArchInternetWindows.h"
+
+CString
+CArchInternetWindows::get(const CString& url)
+{
+    return "Hello bob!";
+}

src/lib/arch/CArchInternetWindows.h

@@ -0,0 +1,54 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2014 Bolton Software Ltd.
+ *
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ *
+ * This package 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define ARCH_INTERNET CArchInternetWindows
+
+#include "CString.h"
+
+class CArchInternetWindows {
+public:
+	CString				get(const CString& url);
+};
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2014 Bolton Software Ltd.
+ *
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ *
+ * This package 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define ARCH_INTERNET CArchInternetWindows
+
+#include "CString.h"
+
+class CArchInternetWindows {
+public:
+	CString				get(const CString& url);
+};

src/lib/arch/CMakeLists.txt

@@ -43,6 +43,7 @@ if (WIN32)
 		XArch.h
 		IArchPlugin.h
 		CArchPluginWindows.h
+		CArchInternetWindows.h
 	)
 
 	list(APPEND src
@@ -61,6 +62,7 @@ if (WIN32)
 		CArchTimeWindows.cpp
 		XArchWindows.cpp
 		CArchPluginWindows.cpp
+		CArchInternetWindows.cpp
 	)
 	
 elseif (UNIX)
@@ -80,6 +82,7 @@ elseif (UNIX)
 		XArchUnix.cpp
 		CArchDaemonNone.cpp
 		CArchPluginUnix.cpp
+		CArchInternetUnix.cpp
 	)
 	
 endif()

src/lib/synergy/CMakeLists.txt

@@ -49,6 +49,7 @@ set(inc
 	IAppUtil.h
 	CFileChunker.h
 	CDragInformation.h
+	CToolApp.h
 )
 
 set(src
@@ -77,6 +78,7 @@ set(src
 	CArgsBase.cpp
 	CFileChunker.cpp
 	CDragInformation.cpp
+	CToolApp.cpp
 )
 
 if (WIN32)

src/lib/synergy/CToolApp.cpp

@@ -0,0 +1,60 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2014 Bolton Software Ltd.
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CToolApp.h"
+#include "CString.h"
+#include "CArch.h"
+
+#include <iostream>
+#include <sstream>
+	
+//#define PREMIUM_AUTH_URL "http://localhost/synergy/premium/json/auth/"
+#define PREMIUM_AUTH_URL "https://synergy-foss.org/premium/json/auth/"
+
+int
+CToolApp::run(int argc, char** argv)
+{
+	if (argc <= 1) {
+		std::cerr << "no args" << std::endl;
+		return 1;
+	}
+
+	for (int i = 1; i < argc; i++) {
+		if (strcmp(argv[i], "--premium-auth") == 0) {
+			CString credentials;
+			std::cin >> credentials;
+
+			size_t separator = credentials.find(':');
+			CString email = credentials.substr(0, separator);
+			CString password = credentials.substr(separator + 1, credentials.length());
+			
+			std::stringstream ss;
+			ss << PREMIUM_AUTH_URL;
+			ss << "?email=" << email;
+			ss << "&password=" << password;
+
+			std::cout << ARCH->internet().get(ss.str()) << std::endl;
+			return 0;
+		}
+		else {
+			std::cerr << "unknown arg: " << argv[i] << std::endl;
+			return 1;
+		}
+	}
+
+	return 0;
+}

src/lib/synergy/CToolApp.h

@@ -0,0 +1,23 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2014 Bolton Software Ltd.
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+class CToolApp {
+public:
+	int					run(int argc, char** argv);
+};