#include <wx/filefn.h>
#include <wx/fileconf.h>
+#if defined(__WIN32__)
+#include <cryptuiapi.h>
+#include "common/win32ssl.h"
+#endif
+
#include "carddav/carddav.h"
#include "common/dirs.h"
+#include "common/svrblist.h"
#include "frmInvalidSSLCertificate.h"
frmNewAccount::frmNewAccount( wxWindow* parent )
}
+ // Check if server address matches against the blacklist.
+ // Bring up warning message if it does.
+
+ if (CheckBlacklist(txtServerAddress->GetValue())){
+
+ int MessageBoxResult = wxMessageBox(_("The server with the address given does not support the CardDAV protocol properly and shouldn't be used.\n\nData loss is very likely.\n\nDo you still want to continue using this server?"), _("Server warning"), wxYES_NO, this);
+
+ if (MessageBoxResult == wxNO){
+ PageSeek--;
+ return;
+ }
+
+ }
+
btnNext->Disable();
bool ServerResult = FALSE;
UseSSL);
CardDAVConn.SetupResultBools(&ServerResult, &ServerAction);
+#if defined(__WIN32__)
+
+ BOOL ModifiedCertificateData = FALSE;
+
+#endif
+
// Verify SSL trust first before doing anything.
if (UseSSL == TRUE){
// SSL certificate message.
// Setup the data to be sent in the wxPostEvent command.
+
+ int SSLResult;
+
+#if defined(__APPLE__)
+
+ SSLResult = DisplayTrustPanel(&CardDAVConn);
- //SSLInvalidCertNotifObj SSLICNProcData;
+ if (SSLResult != NSOKButton){
+
+ lblServerConnResult->SetLabel(_("Failed"));
+ lblServerResponse->SetLabel(_("Not applicable"));
+ lblServerSSLResult->SetLabel(_("Used"));
+ lblServerSSLValid->SetLabel(_("No"));
+ lblConnectionResultText->SetLabel(_("An error occured whilst connnecting: ") + CardDAVConn.GetErrorMessage() + wxString::Format(wxT(" (%i)\n%s"), sslcode, CardDAVConn.GetErrorBuffer().mb_str()));
+ return;
+
+ } else {
+
+ // Evalulate the trust object.
+
+ SecTrustResultType EvalResult = ProcessResultType(&CardDAVConn);
+
+ switch(EvalResult){
+ case kSecTrustResultProceed:
+ lblServerSSLValid->SetLabel(_("Verified"));
+ break;
+ case kSecTrustResultConfirm:
+ lblServerSSLValid->SetLabel(_("Verified (user)"));
+ break;
+ default:
+ lblServerSSLValid->SetLabel(_("Unable to verify"));
+ }
+
+ lblServerResponse->SetLabel(_("Not applicable"));
+ lblServerSSLResult->SetLabel(_("Used"));
+
+ if (EvalResult != kSecTrustResultProceed){
+ return;
+ }
+
+ }
- //bool *PauseMode = new bool;
- int SSLResult;
- //QRNotif qrn;
+#elif defined(__WIN32__)
- //*PauseMode = TRUE;
- //qrn.QResponse = &SSLResult;
- //qrn.PausePtr = PauseMode;
-
- //SSLICNProcData.CertCollection = CardDAVConn.GetSSLVerifyResults();
- //SSLICNProcData.QRNotifData = &qrn;
- //SSLICNProcData.AccountName = _("New account");
+ CRYPTUI_VIEWCERTIFICATE_STRUCTW CertificateData = BuildCertificateData(&CardDAVConn, (HWND)this->GetHandle());
+
+ if (!CryptUIDlgViewCertificate(&CertificateData, &ModifiedCertificateData)){
+ wxMessageBox(_("An error occured while trying to open the certificate dialog."), _("Error opening Certificate Information dialog"));
+ }
+
+ if (ModifiedCertificateData == FALSE){
+
+ lblServerConnResult->SetLabel(_("Failed"));
+ lblServerResponse->SetLabel(_("Not applicable"));
+ lblServerSSLResult->SetLabel(_("Used"));
+ lblServerSSLValid->SetLabel(_("No"));
+ lblConnectionResultText->SetLabel(_("An error occured whilst connnecting: ") + CardDAVConn.GetErrorMessage() + wxString::Format(wxT(" (%i)\n%s"), sslcode, CardDAVConn.GetErrorBuffer().mb_str()));
+ return;
+
+ }
+
+#else
frmInvalidSSLCertificate *frmICPtr = new frmInvalidSSLCertificate(this);
frmICPtr->LoadDataNew(CardDAVConn.GetSSLVerifyResults(), txtServerAddress->GetValue());
frmICPtr->ShowModal();
-
- //wxCommandEvent event(INVALIDSSLCERT);
- //event.SetClientData(&SSLICNProcData);
- //wxPostEvent(this->GetParent(), event);
-
- /*timespec n1, n2;
-
- // Fall asleep until we get an response.
-
- n1.tv_sec = 0;
- n1.tv_nsec = 250000000L;*/
-
+
SSLResult = frmICPtr->GetResult();
// Clean up before processing response.
return;
}
-
- //frmInvalidSSLCertificate *frmICPtr = new frmInvalidSSLCertificate(this);
-
- //frmICPtr->LoadDataNew(CardDAVConn.GetSSLVerifyResults(), txtServerAddress->GetValue());
- //frmICPtr->ShowModal();
+#endif
} else {
// Something else happened. Stop the process and
// display an error message instead.
+ CURLcode sslcode = CardDAVConn.SSLVerifyTest();
+
lblServerConnResult->SetLabel(_("Failed"));
lblConnectionResultText->SetLabel(_("An error occured whilst connnecting: ") + CardDAVConn.GetErrorMessage() + wxString::Format(wxT(" (%i)\n%s"), sslcode, CardDAVConn.GetErrorBuffer().mb_str()));
return;
std::thread ConnTest(&CardDAV::Connect, &CardDAVConn);
ConnTest.join();
-
+
+#if defined(__WIN32__)
+ if (ServerResult == FALSE && ModifiedCertificateData == FALSE){
+#else
if (ServerResult == FALSE){
+#endif
- lblServerConnResult->SetLabel(_("Failed"));
- return;
-
+ lblServerConnResult->SetLabel(_("Failed"));
+ lblConnectionResultText->SetLabel(_("An error occured whilst connnecting: ") + CardDAVConn.GetErrorMessage());
+ return;
+
} else {
- lblServerConnResult->SetLabel(_("Connected"));
+ lblServerConnResult->SetLabel(_("Connected"));
}
-
+
if (CardDAVConn.CanDoSSL() == TRUE){
-
- lblServerSSLResult->SetLabel(_("Used"));
-
+
+ lblServerSSLResult->SetLabel(_("Used"));
+
} else {
- lblServerSSLResult->SetLabel(_("Not Used"));
- lblServerSSLValid->SetLabel(_("Not Applicable"));
+ lblServerSSLResult->SetLabel(_("Not Used"));
+ lblServerSSLValid->SetLabel(_("Not Applicable"));
}
-
+
+#if defined(__APPLE__)
+
+ // Evalulate the trust object.
+
+ SecTrustResultType EvalResult = ProcessResultType(&CardDAVConn);
+
+ switch(EvalResult){
+ case kSecTrustResultProceed:
+ lblServerSSLValid->SetLabel(_("Verified"));
+ break;
+ case kSecTrustResultConfirm:
+ lblServerSSLValid->SetLabel(_("Verified (user)"));
+ break;
+ default:
+ lblServerSSLValid->SetLabel(_("Unable to verify"));
+ }
+
+#elif defined(__WIN32__)
+
+ if (ModifiedCertificateData == TRUE){
+ lblServerSSLValid->SetLabel(_("Verified (user)"));
+ } else {
+ lblServerSSLValid->SetLabel(_("Verified"));
+ }
+
+#else
+
if (CardDAVConn.SSLVerify() == TRUE && CardDAVConn.CanDoSSL() == TRUE){
- lblServerSSLValid->SetLabel(_("Verified"));
+ lblServerSSLValid->SetLabel(_("Verified"));
} else if (CardDAVConn.SSLVerify() == FALSE && CardDAVConn.CanDoSSL() == TRUE && CardDAVConn.IsSelfSigned() == TRUE){
- lblServerSSLValid->SetLabel(_("Verified (user)"));
+ lblServerSSLValid->SetLabel(_("Verified (user)"));
} else if (CardDAVConn.SSLVerify() == FALSE && CardDAVConn.CanDoSSL() == TRUE) {
- lblServerSSLValid->SetLabel(_("Unable to verify"));
+ lblServerSSLValid->SetLabel(_("Unable to verify"));
- }
-
+ }
+
+#endif
+
if (CardDAVConn.CanDoCardDAV() == TRUE){
- lblCardDAVSupportResult->SetLabel(_("Supported"));
+ lblCardDAVSupportResult->SetLabel(_("Supported"));
} else {
- lblCardDAVSupportResult->SetLabel(_("Unsupported"));
+ lblCardDAVSupportResult->SetLabel(_("Unsupported"));
+ SetErrorMessageLabel();
+ return;
}
if (CardDAVConn.AbleToLogin() == TRUE){
- lblAbleToLoginResult->SetLabel(_("Yes"));
+ lblAbleToLoginResult->SetLabel(_("Yes"));
} else {
- lblAbleToLoginResult->SetLabel(_("No"));
+ lblAbleToLoginResult->SetLabel(_("No"));
+ SetErrorMessageLabel();
+ return;
}
if (CardDAVConn.HasValidResponse() == TRUE){
- lblServerResponse->SetLabel(_("Yes"));
+ lblServerResponse->SetLabel(_("Yes"));
} else {
- lblServerResponse->SetLabel(_("No"));
+ lblServerResponse->SetLabel(_("No"));
+ SetErrorMessageLabel();
+ return;
}
if (ServerResult == TRUE && CardDAVConn.HasValidResponse() == TRUE &&
- //CardDAVConn.CanDoSSL() == TRUE && CardDAVConn.SSLVerify() == TRUE &&
- CardDAVConn.CanDoCardDAV() == TRUE && CardDAVConn.AbleToLogin() == TRUE){
+
+ CardDAVConn.CanDoCardDAV() == TRUE && CardDAVConn.AbleToLogin() == TRUE){
- btnNext->Enable();
+ btnNext->Enable();
- lblConnectionResultText->SetLabel(_("Click on Next to set the account name."));
+ lblConnectionResultText->SetLabel(_("Click on Next to set the account name."));
} else {
- lblConnectionResultText->SetLabel(_("A problem has occured whilst connecting to the CardDAV server.\nPlease review the above information and change the server details if needed.\nIf there are still problems, please speak to your system administrator(s)."));
+ SetErrorMessageLabel();
}
if (txtAccountName->IsEmpty() && PageSeek == 2){
- btnNext->Disable();
+ btnNext->Disable();
} else {
- btnNext->Enable();
+ btnNext->Enable();
}
wxString XestiaABDirectory;
wxString AccountSettingsFile;
//wxFile ASFile;
- wxString RandomNumberSuffix = wxString::Format(wxT("%i"), rand() % 32767);
+
+ srand(time(0));
+ int RandomNumber = rand() % 32767;
+ wxString RandomNumberSuffix = wxString::Format(wxT("%i"), RandomNumber);
bool DirectoryCreated = FALSE;
#if defined(__HAIKU__)
void frmNewAccount::UpdateRequirements( wxCommandEvent& event )
{
- // Update the options.
+ // Update the options.
if (cmbServerType->GetCurrentSelection() == 1){
ReloadAccountConfig = ReloadAccountInc;
+}
+
+void frmNewAccount::SetErrorMessageLabel(){
+
+ lblConnectionResultText->SetLabel(_("A problem has occured whilst connecting to the CardDAV server.\nPlease review the above information and change the server details if needed.\nIf there are still problems, please speak to your system administrator(s)."));
+
}
\ No newline at end of file
Home |
News |
Projects |
Releases
Bugs |
RFE |
Repositories |
Help
