X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fconnobject%2FConnectionObject.h;h=3ad9d194023535b447b7ccec485527f3b72b840b;hb=74f3b0f9b31a7573c18a003bf008b0cc2819f424;hp=798ebae2c3418aaa4218cb1cdc499b58f06343d6;hpb=1a669f2f2ab771fac49d859851bd1cdba28ab3f8;p=xestiaab%2F.git

diff --git a/source/connobject/ConnectionObject.h b/source/connobject/ConnectionObject.h
index 798ebae..3ad9d19 100644
--- a/source/connobject/ConnectionObject.h
+++ b/source/connobject/ConnectionObject.h
@@ -16,52 +16,127 @@
 // You should have received a copy of the GNU General Public License along
 // with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
 
+#ifndef __CONNOBJECT_CONNECTIONOBJECT_H__
+#define __CONNOBJECT_CONNECTIONOBJECT_H__
+
 #include <string>
+#include <vector>
+#include <iostream>
+#include "../common/sslcertstructs.h"
+
+#if defined (__APPLE__)
+#import <Foundation/Foundation.h>
+#import <SecurityInterface/SFCertificateTrustPanel.h>
+#endif
+
+#if defined (__WIN32__)
+#include <Windows.h>
+#include <basetsd.h>
+#include <winapifamily.h>
+#include <security.h>
+#include <schannel.h>
+#include <cryptuiapi.h>
+#include <sspi.h>
+#endif
 
 enum COConnectResult {
 	COCONNECT_UNITTESTFAIL = -1,
 	COCONNECT_OK,
+	COCONNECT_SSLFAIL,
 	COCONNECT_INVALID,
 	COCONNECT_TIMEOUT,
-	COCONNECT_AUTHFAIL
+	COCONNECT_AUTHFAIL,
+	COCONNECT_NOCONNECTION,
 };
 
 enum CORequestResult {
 	COREQUEST_UNITTESTFAIL = -1,
 	COREQUEST_OK,
 	COREQUEST_ERROR_NOTCONNECTED,
-	COREQUEST_ERROR_SERVER
+	COREQUEST_ERROR_SERVER,
+	COREQUEST_NOCONNECTION,
+};
+
+enum COSSLVerified {
+	COSSL_UNITTESTFAIL = -1,
+	COSSL_VERIFIED,
+	COSSL_VERIFIED_USER,
+	COSSL_UNABLETOVERIFY,
+	COSSL_NOTAPPLICABLE,
+	COSSL_NORESULT
+};
+
+enum COContactStatus {
+	COCS_UNKNOWN,
+	COCS_UPDATED,
+	COCS_DELETED
 };
 
 struct COServerResponse {
-	CORequestResult RequestResult;
-	std::string EntityTag;
-	int ResultCode;
-	std::string ResultMessage;
+	CORequestResult RequestResult = COREQUEST_NOCONNECTION;
+	std::string EntityTag = "";
+	int SessionCode = 0;
+	int ResultCode = 0;
+	std::string ResultMessage = "";
+};
+
+struct COContactData {
+	std::string Location = "";
+	std::string Data = "";
+	COContactStatus Status = COCS_UNKNOWN;
+};
+
+struct COContactList {
+	COServerResponse ServerResponse;
+	std::vector<COContactData> ListData;
+	std::string SyncToken;
 };
 
 class ConnectionObject{
 	
 	public:
-		ConnectionObject(std::string ServerAddress, int ServerPort, std::string ServerUser, std::string ServerPass, bool ServerSSL);
-		ConnectionObject(std::string ServerAddress, int ServerPort, std::string ServerUser, std::string ServerPass, bool ServerSSL, std::string ServerPrefix, std::string ServerAccount);
-	
+		//ConnectionObject(std::string ServerAddress, int ServerPort, std::string ServerUser, std::string ServerPass, bool ServerSSL);
+		//ConnectionObject(std::string ServerAddress, int ServerPort, std::string ServerUser, std::string ServerPass, bool ServerSSL, std::string ServerPrefix, std::string ServerAccount);
+
 		// Virtual functions to be setup by the inheriting classes.
 	
 		virtual void SetupConnectionObject() {};
-		virtual ~ConnectionObject() {};
 		
-		virtual COConnectResult Connect() {};
+		virtual bool IsTaskCompleted() { return false; };
+		
+		virtual COConnectResult Connect(bool DoAuthentication) { COConnectResult x; return x; };
+		virtual void BypassSSLVerification(bool EnableBypass) {};
 		
-		virtual std::string GetDefaultPrefix() {};
-		//virtual void SetupData(std::string Method, std::string Location, std::string Data) {};
-		virtual COServerResponse AddContact(std::string Location, std::string Data) {};
+		virtual COServerResponse GetDefaultPrefix(std::string *ServerPrefix) { COServerResponse x; return x; };
+		virtual COServerResponse AddContact(std::string Location, std::string Data) { COServerResponse x; return x; };
+		virtual COServerResponse EditContact(std::string Location, std::string Data) { COServerResponse x; return x; };
+		virtual COServerResponse DeleteContact(std::string Location) { COServerResponse x; return x; };
+		virtual COServerResponse GetServerEntityTagValue(std::string Location) { COServerResponse x; return x; };
+		virtual COServerResponse GetContact(std::string Location, std::string *PageData) { COServerResponse x; return x; };
+		virtual COContactList GetContactList(std::string SyncToken) { COContactList x; return x; };
+		
+		virtual bool CanDoProcessing() { return false;  };
+		virtual bool CanDoSSL() { return false; };
+		virtual COSSLVerified SSLVerify() { COSSLVerified x; return x; };
+		virtual bool AbleToLogin() { return false; };
+		virtual bool HasValidResponse() { return false; };
+		virtual bool IsSelfSigned() { return false; };
+		virtual std::string GetErrorMessage() { return ""; };
+	
+		// OS specific functions.
 		
-		virtual bool CanDoProcessing() {};
-		virtual bool CanDoSSL() {};
-		virtual bool SSLVerify() {};
-		virtual bool AbleToLogin() {};
-		virtual bool HasValidResponse() {};
+#if defined(__APPLE__)
+    
+		virtual SecTrustRef BuildSSLCollection() { return nullptr; };
+    
+#elif defined(__WIN32__)
+
+		virtual PCCERT_CONTEXT BuildSSLCollection() { return nullptr; };
+
+#else
+		virtual SSLCertCollectionString BuildSSLCollection() {};
+
+#endif
 		
 	protected:
 		// Test Mode.
@@ -78,17 +153,19 @@ class ConnectionObject{
 		std::string ServerAccount = "";
 		bool ServerSSL = true;
 		std::string ErrorMessage = "";
-		std::string ErrorBufferMessage = "";
 	
 		// Connect results.
 	
 		bool SSLStatus = false;
-		bool SSLVerified = false;
+		COSSLVerified SSLVerified = COSSL_NORESULT;
 		bool ValidResponse = false;
 		bool AuthPassed = false;
 		bool CanProcess = false;
 		bool SSLSelfSigned = false;
+		bool TaskCompleted = false;
 		
 	private:
 
-};
\ No newline at end of file
+};
+
+#endif