From c87f75cc970047551718890368f6ad742113ac0b Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Fri, 3 Nov 2017 11:36:41 +0100 Subject: [PATCH 1/3] Added placeholder for better usability. --- .../javascripts/app/views/integration/exchange_wizard.jst.eco | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/app/views/integration/exchange_wizard.jst.eco b/app/assets/javascripts/app/views/integration/exchange_wizard.jst.eco index df23bb0b4..8b1161c35 100644 --- a/app/assets/javascripts/app/views/integration/exchange_wizard.jst.eco +++ b/app/assets/javascripts/app/views/integration/exchange_wizard.jst.eco @@ -19,7 +19,7 @@ <%- @T('User') %> - + <%- @T('Password') %> From 3fc78c657cf3cf9c89e8548b9f038c40cb03942b Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Fri, 3 Nov 2017 11:40:11 +0100 Subject: [PATCH 2/3] Exchange changes: - Fixed bug: Not possible to disable SSL certificate check for import but only for autodiscover. - Improved SSL certificate error message to show domain of affected domain to prevent users from thinking that there is an issue with their Zammad installation. --- .../controllers/_integration/exchange.coffee | 99 +++++++++++++------ .../exchange_certificate_issue.jst.eco | 25 +++++ .../views/integration/exchange_wizard.jst.eco | 25 +---- .../integration/exchange_controller.rb | 27 +++-- lib/sequencer/unit/exchange/connection.rb | 33 ++++++- 5 files changed, 138 insertions(+), 71 deletions(-) create mode 100644 app/assets/javascripts/app/views/integration/exchange_certificate_issue.jst.eco diff --git a/app/assets/javascripts/app/controllers/_integration/exchange.coffee b/app/assets/javascripts/app/controllers/_integration/exchange.coffee index 3bfbde4c7..c02c541ba 100644 --- a/app/assets/javascripts/app/controllers/_integration/exchange.coffee +++ b/app/assets/javascripts/app/controllers/_integration/exchange.coffee @@ -174,17 +174,18 @@ class ConnectionWizard extends App.WizardModal 'js-mapping': 'mappingShow' events: - 'submit form.js-discover': 'discover' - 'submit form.js-discoverSsl': 'discover' - 'submit form.js-bind': 'folders' - 'submit form.js-folders': 'mapping' - 'click .js-cancelSsl': 'showSlideDiscover' - 'click .js-mapping .js-submitTry': 'mappingChange' - 'click .js-try .js-submitSave': 'save' - 'click .js-close': 'hide' - 'click .js-remove': 'removeRow' - 'click .js-userMappingForm .js-add': 'addUserMapping' - 'click .js-goToSlide': 'goToSlide' + 'submit form.js-discover': 'discover' + 'submit form.js-discoverCertificateIssue': 'discover' + 'submit form.js-bind': 'folders' + 'submit form.js-bindCertificateIssue': 'folders' + 'submit form.js-folders': 'mapping' + 'click .js-cancelSsl': 'showSlideDiscover' + 'click .js-mapping .js-submitTry': 'mappingChange' + 'click .js-try .js-submitSave': 'save' + 'click .js-close': 'hide' + 'click .js-remove': 'removeRow' + 'click .js-userMappingForm .js-add': 'addUserMapping' + 'click .js-goToSlide': 'goToSlide' elements: '.modal-body': 'body' @@ -261,20 +262,17 @@ class ConnectionWizard extends App.WizardModal processData: true success: (data, status, xhr) => if data.result isnt 'ok' - - if data.message.indexOf('certificate') is -1 - @showSlide('js-discover') - @showAlert('js-discover', data.message) - else - @$('.js-discoverSsl input[name="user"]').val(params.user) - @$('.js-discoverSsl input[name="password"]').val(params.password) - @showSlide('js-discoverSsl') - + @handleCertificateIssue( + message: data.message + wizardClass: 'js-discover' + user: params.user + password: params.password + ) return - @wizardConfig.endpoint = data.endpoint - @wizardConfig.user = params.user - @wizardConfig.password = params.password + @wizardConfig.disable_ssl_verify = params.disable_ssl_verify + @wizardConfig.user = params.user + @wizardConfig.password = params.password @showSlide('js-bind') @showBindDetails() @@ -300,13 +298,19 @@ class ConnectionWizard extends App.WizardModal processData: true success: (data, status, xhr) => if data.result isnt 'ok' - @showSlide('js-bind') - @showAlert('js-bind', data.message) + @handleCertificateIssue( + message: data.message + wizardClass: 'js-bind' + endpoint: params.endpoint + user: params.user + password: params.password + ) return - @wizardConfig.endpoint = params.endpoint - @wizardConfig.user = params.user - @wizardConfig.password = params.password + @wizardConfig.disable_ssl_verify = params.disable_ssl_verify + @wizardConfig.endpoint = params.endpoint + @wizardConfig.user = params.user + @wizardConfig.password = params.password # update wizard data @wizardConfig.wizardData = {} @@ -341,6 +345,45 @@ class ConnectionWizard extends App.WizardModal @foldersSelectSubmit.addClass('is-disabled') ) + handleCertificateIssue: (params) => + if params.message.indexOf('certificate') is -1 + @showSlide(params.wizardClass) + @showAlert(params.wizardClass, params.message) + else + wizardClass = "#{params.wizardClass}CertificateIssue" + + domain = @domainFromMessageOrEmail( + message: params.message + user: params.user + ) + + wizardSlide = App.view('integration/exchange_certificate_issue')( + wizardClass: wizardClass + endpoint: params.endpoint + user: params.user + password: params.password + domain: domain + ) + + @$('.js-certificateIssuePlaceholder').html(wizardSlide) + + @showSlide(wizardClass) + + domainFromMessageOrEmail: (params) -> + + # try to extract the hostname from the error message + hostname = params.message.match(/hostname[ ]\"([^\"]+)"/i) + if hostname + return hostname[1] + + # try to extract it from the given user + emailDomain = params.user.match(/@(.*)$/) + if emailDomain + return emailDomain[1] + + # fallback to user - better than no value?! + return user + mapping: (e) => e.preventDefault() @showSlide('js-analyze') diff --git a/app/assets/javascripts/app/views/integration/exchange_certificate_issue.jst.eco b/app/assets/javascripts/app/views/integration/exchange_certificate_issue.jst.eco new file mode 100644 index 000000000..1f3c01b83 --- /dev/null +++ b/app/assets/javascripts/app/views/integration/exchange_certificate_issue.jst.eco @@ -0,0 +1,25 @@ +
+ + + + +
+
+ <%- @Icon('diagonal-cross') %> +
+

<%- @T('Your connection is not private') %>

+
+
+
+

<%- @T('The certificate of the domain |%s| could not be verified. This may allow hackers to steal your credentials. If you are sure that you are using a self-signed certificate, you can press "Proceed". Otherwise, please "Cancel".', @domain) %>

+
+
+
+
+ +
+
+ <%- @T('Cancel') %> +
+
+
diff --git a/app/assets/javascripts/app/views/integration/exchange_wizard.jst.eco b/app/assets/javascripts/app/views/integration/exchange_wizard.jst.eco index 8b1161c35..d47ccaca9 100644 --- a/app/assets/javascripts/app/views/integration/exchange_wizard.jst.eco +++ b/app/assets/javascripts/app/views/integration/exchange_wizard.jst.eco @@ -34,30 +34,7 @@ -
- - - -
-
- <%- @Icon('diagonal-cross') %> -
-

<%- @T('Your connection is not private') %>

-
-
-
-

<%- @T('The certificate of the domain could not be verified. Hackers could steal the credentials or redirect the connection. Or maybe you are using a self-signed certificate.') %>

-
-
-
-
- -
-
- <%- @T('Cancel') %> -
-
-
+
diff --git a/app/controllers/integration/exchange_controller.rb b/app/controllers/integration/exchange_controller.rb index 1e66600c4..c3db9c4a3 100644 --- a/app/controllers/integration/exchange_controller.rb +++ b/app/controllers/integration/exchange_controller.rb @@ -26,11 +26,7 @@ class Integration::ExchangeController < ApplicationController answer_with do Sequencer.process('Import::Exchange::AvailableFolders', parameters: { - ews_config: { - endpoint: params[:endpoint], - user: params[:user], - password: params[:password], - } + ews_config: ews_config }) end end @@ -42,11 +38,7 @@ class Integration::ExchangeController < ApplicationController examples = Sequencer.process('Import::Exchange::AttributesExamples', parameters: { ews_folder_ids: params[:folders], - ews_config: { - endpoint: params[:endpoint], - user: params[:user], - password: params[:password], - } + ews_config: ews_config }) examples.tap do |result| raise 'No entries found in selected folder(s).' if result[:attributes].blank? @@ -61,15 +53,20 @@ class Integration::ExchangeController < ApplicationController { ews_attributes: params[:attributes].permit!.to_h, ews_folder_ids: params[:folders], - ews_config: { - endpoint: params[:endpoint], - user: params[:user], - password: params[:password], - } + ews_config: ews_config } end def payload_import nil end + + def ews_config + { + disable_ssl_verify: params[:disable_ssl_verify], + endpoint: params[:endpoint], + user: params[:user], + password: params[:password], + } + end end diff --git a/lib/sequencer/unit/exchange/connection.rb b/lib/sequencer/unit/exchange/connection.rb index fddcba8c0..0f96650a7 100644 --- a/lib/sequencer/unit/exchange/connection.rb +++ b/lib/sequencer/unit/exchange/connection.rb @@ -11,12 +11,37 @@ class Sequencer return if state.provided?(:ews_connection) state.provide(:ews_connection) do - config = ews_config - config ||= ::Import::Exchange.config - - Viewpoint::EWSClient.new(config[:endpoint], config[:user], config[:password]) + Viewpoint::EWSClient.new( + config[:endpoint], + config[:user], + config[:password], + additional_opts + ) end end + + private + + def config + @config ||= begin + ews_config || ::Import::Exchange.config + end + end + + def additional_opts + @additional_opts ||= begin + http_opts + end + end + + def http_opts + return {} if config[:disable_ssl_verify].blank? + { + http_opts: { + ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE + } + } + end end end end From cb02d21118c0c24a5f6983615a832b61b318404d Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Fri, 3 Nov 2017 12:04:10 +0100 Subject: [PATCH 3/3] Updated autodiscover dependency to fix an issue with not reachable redirected HTTP URLs in Exchange autodiscovery process - see https://github.com/WinRb/autodiscover/issues/10 . --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b8339f658..3e2981f49 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/thorsteneckel/autodiscover.git - revision: 29d713ee0c8c25fcf74c4292ff13fe1fa4d0d827 + revision: ee9b53dfa797ce6d4f970b82beea7fbdd2df56bb specs: autodiscover (1.0.2) httpclient @@ -221,7 +221,7 @@ GEM mime-types (2.99.3) mini_portile2 (2.3.0) minitest (5.10.3) - multi_json (1.12.1) + multi_json (1.12.2) multi_xml (0.6.0) multipart-post (2.0.0) mysql2 (0.4.9)