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

diff --git a/source/connobject/ConnectionObject.h b/source/connobject/ConnectionObject.h
index 9ffbe4d..3ad9d19 100644
--- a/source/connobject/ConnectionObject.h
+++ b/source/connobject/ConnectionObject.h
@@ -21,20 +21,40 @@
 
 #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 {
@@ -46,17 +66,24 @@ enum COSSLVerified {
 	COSSL_NORESULT
 };
 
+enum COContactStatus {
+	COCS_UNKNOWN,
+	COCS_UPDATED,
+	COCS_DELETED
+};
+
 struct COServerResponse {
-	CORequestResult RequestResult;
-	std::string EntityTag;
-	int SessionCode;
-	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;
+	std::string Location = "";
+	std::string Data = "";
+	COContactStatus Status = COCS_UNKNOWN;
 };
 
 struct COContactList {
@@ -68,31 +95,48 @@ struct COContactList {
 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 bool IsTaskCompleted() {};
+		virtual bool IsTaskCompleted() { return false; };
 		
-		virtual COConnectResult Connect() {};
+		virtual COConnectResult Connect(bool DoAuthentication) { COConnectResult x; return x; };
+		virtual void BypassSSLVerification(bool EnableBypass) {};
 		
-		virtual std::string GetDefaultPrefix() {};
-		virtual COServerResponse AddContact(std::string Location, std::string Data) {};
-		virtual COServerResponse EditContact(std::string Location, std::string Data) {};
-		virtual COServerResponse DeleteContact(std::string Location, std::string EntityTag) {};
-		virtual COServerResponse GetServerEntityTagValue(std::string Location) {};
-		virtual COServerResponse GetContact(std::string Location) {};
-		virtual COContactList GetContactList(std::string SyncToken) {};
+		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() {};
-		virtual bool CanDoSSL() {};
-		virtual COSSLVerified SSLVerify() {};
-		virtual bool AbleToLogin() {};
-		virtual bool HasValidResponse() {};
+		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.
+		
+#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.
@@ -109,7 +153,6 @@ class ConnectionObject{
 		std::string ServerAccount = "";
 		bool ServerSSL = true;
 		std::string ErrorMessage = "";
-		std::string ErrorBufferMessage = "";
 	
 		// Connect results.
 	
@@ -125,4 +168,4 @@ class ConnectionObject{
 
 };
 
-#endif
\ No newline at end of file
+#endif