OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3965 HoloLens : Add flag in preferences to disable ssl verification

Browse Source
This commit is contained in:
Magne Sjaastad 2019-01-15 10:01:01 +01:00
parent db9b225112
commit 6695cf2a39
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/Application/RiaPreferences.cpp
View File

@ -109,6 +109,9 @@ RiaPreferences::RiaPreferences(void)
m_holoLensExportFolder.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::TOP); m_holoLensExportFolder.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::TOP);
m_holoLensExportFolder.uiCapability()->setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName()); m_holoLensExportFolder.uiCapability()->setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());
CAF_PDM_InitField(&holoLensDisableCertificateVerification, "holoLensDisableCertificateVerification", false, "Disable SSL Certificate Verification (HoloLens)", "", "", "");
holoLensDisableCertificateVerification.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
CAF_PDM_InitFieldNoDefault(&m_readerSettings, "readerSettings", "Reader Settings", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_readerSettings, "readerSettings", "Reader Settings", "", "", "");
m_readerSettings = new RifReaderSettings; m_readerSettings = new RifReaderSettings;
@ -154,7 +157,8 @@ void RiaPreferences::defineEditorAttribute(const caf::PdmFieldHandle* field, QSt
field == &m_appendFieldKeywordToToolTipText || field == &m_appendFieldKeywordToToolTipText ||
field == &m_showTestToolbar || field == &m_showTestToolbar ||
field == &m_includeFractureDebugInfoFile || field == &m_includeFractureDebugInfoFile ||
field == &showLasCurveWithoutTvdWarning) field == &showLasCurveWithoutTvdWarning ||
field == &holoLensDisableCertificateVerification)
{ {
caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute); caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute);
if (myAttr) if (myAttr)
@ -194,10 +198,10 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
viewsGroup->add(&useShaders); viewsGroup->add(&useShaders);
viewsGroup->add(&showHud); viewsGroup->add(&showHud);
caf::PdmUiGroup* otherGroup = uiOrdering.addNewGroup("Other"); caf::PdmUiGroup* otherGroup = uiOrdering.addNewGroup("Other");
otherGroup->add(&ssihubAddress); otherGroup->add(&ssihubAddress);
otherGroup->add(&showLasCurveWithoutTvdWarning); otherGroup->add(&showLasCurveWithoutTvdWarning);
otherGroup->add(&holoLensDisableCertificateVerification);
} }
else if (uiConfigName == m_tabNames[1]) else if (uiConfigName == m_tabNames[1])

2
ApplicationCode/Application/RiaPreferences.h
View File

@ -87,6 +87,8 @@ public: // Pdm Fields
caf::PdmField<SummaryRestartFilesImportModeType> summaryImportMode; caf::PdmField<SummaryRestartFilesImportModeType> summaryImportMode;
caf::PdmField<SummaryRestartFilesImportModeType> gridImportMode; caf::PdmField<SummaryRestartFilesImportModeType> gridImportMode;
caf::PdmField<bool> holoLensDisableCertificateVerification;
protected: protected:
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override; void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;

11
ApplicationCode/Commands/HoloLensCommands/RicHoloLensRestClient.cpp
View File

@ -18,6 +18,9 @@
#include "RicHoloLensRestClient.h" #include "RicHoloLensRestClient.h"
#include "RiaApplication.h"
#include "RiaPreferences.h"
#include "cvfBase.h" #include "cvfBase.h"
#include "cvfTrace.h" #include "cvfTrace.h"
@ -76,6 +79,7 @@ void RicHoloLensRestClient::createSession(const QByteArray& sessionPinCode)
request.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("application/x-www-form-urlencoded")); request.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("application/x-www-form-urlencoded"));
request.setRawHeader("PinCode", sessionPinCode); request.setRawHeader("PinCode", sessionPinCode);
#ifdef EXPERIMENTAL_SSL_SUPPORT #ifdef EXPERIMENTAL_SSL_SUPPORT
// NOTE !!! // NOTE !!!
// Apparently something like this is currently needed in order to get SSL/HTTPS going // Apparently something like this is currently needed in order to get SSL/HTTPS going
@ -86,8 +90,11 @@ void RicHoloLensRestClient::createSession(const QByteArray& sessionPinCode)
// Needed this one to be able to connect to sharing server // Needed this one to be able to connect to sharing server
sslConf.setProtocol(QSsl::AnyProtocol); sslConf.setProtocol(QSsl::AnyProtocol);
// !!MUST!! remove this code in production bool disableCertificateVerification = RiaApplication::instance()->preferences()->holoLensDisableCertificateVerification();
sslConf.setPeerVerifyMode(QSslSocket::VerifyNone); if (disableCertificateVerification)
{
sslConf.setPeerVerifyMode(QSslSocket::VerifyNone);
}
request.setSslConfiguration(sslConf); request.setSslConfiguration(sslConf);
#endif #endif