X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fobjects%2FCalDAV%2FCalDAV.cpp;h=ea578a9ae0924608e2cd9bffcfea2505877ac19a;hb=6013b76daf2e9e2cf790584aea18a6f2a5bf1aa8;hp=545c10808110b5725122b84aeefd729bc6858a93;hpb=ddd1ca72930b22d2dc221b1e315789b14f0ca837;p=xestiacalendar%2F.git
diff --git a/source/objects/CalDAV/CalDAV.cpp b/source/objects/CalDAV/CalDAV.cpp
index 545c108..ea578a9 100644
--- a/source/objects/CalDAV/CalDAV.cpp
+++ b/source/objects/CalDAV/CalDAV.cpp
@@ -17,10 +17,44 @@
// with Xestia Calendar. If not, see
#include "CalDAV.h"
-#include
using namespace std;
+size_t CalDAVReceive(char *ReceivedBuffer, size_t Size, size_t NewMemoryBytes, string *StringPointer)
+{
+
+ string ReceivedBufferString = "";
+ ReceivedBufferString.append(ReceivedBuffer, NewMemoryBytes);
+
+ StringPointer->append(ReceivedBufferString);
+
+ return Size * NewMemoryBytes;
+
+}
+
+size_t CalDAVSend(char *SendBuffer, size_t Size, size_t NewMemoryBytes, void *DataStruct){
+
+ struct CalDAVSendData *UploadPtr = (struct CalDAVSendData *)DataStruct;
+
+ if (UploadPtr->sizeleft){
+
+ UploadPtr->sizeleft--;
+ char CharSend;
+
+ CharSend = (*UploadPtr->readptr)[UploadPtr->seek];
+
+ *SendBuffer = CharSend;
+
+ UploadPtr->seek++;
+
+ return 1;
+
+ }
+
+ return 0;
+
+}
+
CalDAV::CalDAV(){
// Setup the objects within the CalDAV connection
@@ -66,6 +100,7 @@ CalDAVStatus CalDAV::GetConnectionData(){
ConnectionStatus.Username = ConnectionData.Username;
ConnectionStatus.Prefix = ConnectionData.Prefix;
ConnectionStatus.UseSSL = ConnectionData.UseSSL;
+ ConnectionStatus.Timeout = ConnectionData.Timeout;
return ConnectionStatus;
@@ -77,28 +112,10 @@ CalDAVServerResult CalDAV::Connect(){
string ServerAddress = "";
string ServerUserPass = "";
- string ServerData = "";
- string ServerHeader = "";
// Setup the server address.
- if (ConnectionData.UseSSL == true){
- ServerAddress += "https://";
- } else {
- ServerAddress += "http://";
- }
-
- ServerAddress += ConnectionData.Hostname;
-
- // Check if server port is 80, otherwise
- // specifiy the port number in the address.
-
- if (ConnectionData.Port != 80){
- ServerAddress += ":";
- ServerAddress += to_string(ConnectionData.Port);
- }
-
- ServerAddress += "/principals/";
+ ServerAddress = BuildServerAddress(&ConnectionData, "/principals/");
// Setup the server password.
@@ -110,7 +127,8 @@ CalDAVServerResult CalDAV::Connect(){
curl_easy_setopt(ConnectionHandle, CURLOPT_USERPWD, ServerUserPass.c_str());
curl_easy_setopt(ConnectionHandle, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
curl_easy_setopt(ConnectionHandle, CURLOPT_FAILONERROR, 1L);
- curl_easy_setopt(ConnectionHandle, CURLOPT_WRITEFUNCTION, CalDAVOutput);
+ curl_easy_setopt(ConnectionHandle, CURLOPT_TIMEOUT, ConnectionData.Timeout);
+ curl_easy_setopt(ConnectionHandle, CURLOPT_WRITEFUNCTION, CalDAVReceive);
curl_easy_setopt(ConnectionHandle, CURLOPT_WRITEDATA, &ServerData);
curl_easy_setopt(ConnectionHandle, CURLOPT_WRITEHEADER, &ServerHeader);
@@ -138,6 +156,228 @@ CalDAVServerResult CalDAV::Connect(){
}
+CalDAVServerResult CalDAV::GetServerResult(){
+
+ return ConnectionServerResult;
+
+}
+
+CalDAVServerSupport CalDAV::GetServerSupport(){
+
+ CalDAVServerSupport ServerStatus;
+
+ // Setup the server connection.
+
+ curl_easy_setopt(ConnectionHandle, CURLOPT_CUSTOMREQUEST, "OPTIONS");
+
+ CURLcode ServerResult = curl_easy_perform(ConnectionHandle);
+
+ // Set the results.
+
+ if (ServerResult == CURLE_OK){
+ ConnectionServerResult.Result = CALDAVQUERYRESULT_OK;
+ } else {
+ ConnectionServerResult.Result = CALDAVQUERYRESULT_SERVERERROR;
+ }
+ ConnectionServerResult.Code = ServerResult;
+ curl_easy_getinfo(ConnectionHandle, CURLINFO_RESPONSE_CODE, &ConnectionServerResult.HTTPCode);
+
+ if (ServerResult != CURLE_OK){
+ return ServerStatus;
+ }
+
+ // Check that the server header has data in,
+ // otherwise return an "empty" CalDAVServerSupport.
+
+ if (ServerHeader.size() == 0){
+ return ServerStatus;
+ }
+
+ // Process each line looking for the first DAV header
+ // line.
+
+ bool NewlineMode = true;
+
+ string DAVLine;
+
+ for (int CharSeek = 0; CharSeek < ServerHeader.size(); CharSeek++){
+
+ if (NewlineMode == true){
+
+ // Check if we have reached the end of the string.
+
+ if (CharSeek >= ServerHeader.size()){
+
+ break;
+
+ }
+
+ // Check the first four letters to make sure
+ // they are 'DAV:'.
+
+ string DAVHeaderCheck = "";
+
+ try {
+ DAVHeaderCheck = ServerHeader.substr(CharSeek, 4);
+ }
+
+ catch (out_of_range &oor){
+ break;
+ }
+
+ if (DAVHeaderCheck == "DAV:"){
+
+ CharSeek += 5;
+
+ for (; CharSeek < ServerHeader.size(); CharSeek++){
+
+ if (ServerHeader[CharSeek] == '\n'){
+
+ break;
+
+ }
+
+ DAVLine.push_back(ServerHeader[CharSeek]);
+
+ }
+
+ break;
+
+ }
+
+ NewlineMode = false;
+
+ }
+
+ if (ServerHeader[CharSeek] == '\n'){
+
+ NewlineMode = true;
+
+ }
+
+ }
+
+ // Process the DAV line.
+
+ vector DAVLineData;
+ string DAVSegmentString;
+
+ for (int CharSeek = 0; CharSeek < DAVLine.size(); CharSeek++){
+
+ if (DAVLine[CharSeek] == ' '){
+ continue;
+ }
+
+ if (DAVLine[CharSeek] == ','){
+
+ DAVLineData.push_back(DAVSegmentString);
+ DAVSegmentString.clear();
+ continue;
+
+ }
+
+ DAVSegmentString += DAVLine[CharSeek];
+
+ }
+
+ // Process the DAV values and set each value
+ // to true as required.
+
+ for (int DAVItemSeek = 0;
+ DAVItemSeek < DAVLineData.size();
+ DAVItemSeek++){
+
+ if (DAVLineData.at(DAVItemSeek) == "calendar-access"){
+
+ ServerStatus.BasicSupport = true;
+
+ }
+
+ }
+
+ // Reset the connection status.
+
+ curl_easy_setopt(ConnectionHandle, CURLOPT_CUSTOMREQUEST, NULL);
+
+ return ServerStatus;
+
+}
+
+string CalDAV::GetUserPrincipal(){
+
+ string CurrentUserPrincipal = "";
+ string UserPrincipalRequest = "";
+ CalDAVSendData UserPrincipalSendData;
+
+ UserPrincipalRequest = "\n"
+ "\n"
+ " \n"
+ " \n"
+ " \n"
+ "";
+
+ UserPrincipalSendData.readptr = &UserPrincipalRequest;
+ UserPrincipalSendData.sizeleft = UserPrincipalRequest.size();
+
+ // Setup the header.
+
+ struct curl_slist *UserPrincipalRequestHeader = NULL;
+
+ UserPrincipalRequestHeader = curl_slist_append(UserPrincipalRequestHeader, "Depth: 0");
+ UserPrincipalRequestHeader = curl_slist_append(UserPrincipalRequestHeader, "Prefer: return-minimal");
+ UserPrincipalRequestHeader = curl_slist_append(UserPrincipalRequestHeader, "Content-Type: application/xml; charset=utf-8");
+
+ curl_easy_setopt(ConnectionHandle, CURLOPT_HTTPHEADER, UserPrincipalRequestHeader);
+
+ curl_easy_setopt(ConnectionHandle, CURLOPT_CUSTOMREQUEST, "PROPFIND");
+ curl_easy_setopt(ConnectionHandle, CURLOPT_UPLOAD, 1L);
+ curl_easy_setopt(ConnectionHandle, CURLOPT_READDATA, &UserPrincipalSendData);
+ curl_easy_setopt(ConnectionHandle, CURLOPT_READFUNCTION, CalDAVSend);
+
+ // Process the data.
+
+ ServerData.clear();
+ ServerHeader.clear();
+
+ CURLcode ServerResult = curl_easy_perform(ConnectionHandle);
+
+ // Set the results.
+
+ if (ServerResult == CURLE_OK){
+ ConnectionServerResult.Result = CALDAVQUERYRESULT_OK;
+ } else {
+ ConnectionServerResult.Result = CALDAVQUERYRESULT_SERVERERROR;
+ }
+ ConnectionServerResult.Code = ServerResult;
+ curl_easy_getinfo(ConnectionHandle, CURLINFO_RESPONSE_CODE, &ConnectionServerResult.HTTPCode);
+
+ if (ServerResult != CURLE_OK){
+
+ return CurrentUserPrincipal;
+
+ }
+
+ // Process the User Principal from the ServerData.
+
+ CurrentUserPrincipal = ProcessXMLUserPrincipal();
+
+ // Reset the changed settings.
+
+ curl_easy_setopt(ConnectionHandle, CURLOPT_UPLOAD, 0L);
+ curl_easy_setopt(ConnectionHandle, CURLOPT_READDATA, NULL);
+ curl_easy_setopt(ConnectionHandle, CURLOPT_READFUNCTION, NULL);
+
+ return CurrentUserPrincipal;
+}
+
+CalDAVCalendarList CalDAV::GetCalendars(){
+
+ CalDAVCalendarList ServerList;
+
+ return ServerList;
+
+}
+
bool CalDAVObjectValidSettings(CalDAVConnectionData *ConnData){
// Check if the passed CalDAV Connection Data is has
@@ -197,4 +437,32 @@ bool CalDAVObjectValidSettings(CalDAVConnectionData *ConnData){
return true;
+}
+
+string BuildServerAddress(CalDAVConnectionData *ConnData, string URIAddress){
+
+ string ServerAddress;
+
+ // Setup the server address.
+
+ if (ConnData->UseSSL == true){
+ ServerAddress += "https://";
+ } else {
+ ServerAddress += "http://";
+ }
+
+ ServerAddress += ConnData->Hostname;
+
+ // Check if server port is 80, otherwise
+ // specifiy the port number in the address.
+
+ if (ConnData->Port != 80){
+ ServerAddress += ":";
+ ServerAddress += to_string(ConnData->Port);
+ }
+
+ ServerAddress += URIAddress;
+
+ return ServerAddress;
+
}
\ No newline at end of file