Merge pull request #304 from icmaa/bugfix/303-use-https-protocol-for-connections

Force ES connections to use protocol config option

Author: pkarw

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - The `product.price_*` fields have been normalized with the backward compatibility support (see `config.tax.deprecatedPriceFieldsSupport` which is by default true) - @pkarw (#289)
 - The `product.final_price` field is now being taken into product price calcualtion. Moreover, we've added the `config.tax.finalPriceIncludesTax` - which is set to `true` by default. All the `price`, `original_price` and `special_price` fields are calculated accordingly. It was required as Magento2 uses `final_price` to set the catalog pricing rules after-prices - @pkarw (#289)
+- Force ES connections to use protocol config option - @cewald (#303, #304)
 - Better handling of HTTP error codes provided by API client - #3151
 
 ## [1.10.0-rc.1] - UNRELEASED

migrations/.common.js

@@ -5,7 +5,11 @@ let queue = kue.createQueue(Object.assign(config.kue, { redis: config.redis }))
 
 let es = require('elasticsearch')
 const esConfig = {
-  host: config.elasticsearch.host + ':' + config.elasticsearch.port,
+  host: {
+    host: config.elasticsearch.host,
+    port: config.elasticsearch.port,
+    protocol: config.elasticsearch.protocol
+  },
   log: 'debug',
   apiVersion: config.elasticsearch.apiVersion,
   requestTimeout: 1000 * 60 * 60,

src/api/catalog.js

@@ -65,7 +65,7 @@ export default ({config, db}) => function (req, res, body) {
 	let url = config.elasticsearch.host + ':' + config.elasticsearch.port + (req.query.request ? _updateQueryStringParameter(req.url, 'request', null) : req.url)
 
 	if (!url.startsWith('http')) {
-		url = 'http://' + url
+		url = config.elasticsearch.protocol + '://' + url
 	}
 
 	// Check price tiers

src/api/extensions/gls-parcelshop-dk/cli.js

@@ -18,7 +18,8 @@ cli.command('buildcache', () => {
     const esConfig = {
         host: {
           host: config.elasticsearch.host,
-          port: config.elasticsearch.port
+          port: config.elasticsearch.port,
+          protocol: config.elasticsearch.protocol
         },
         log: 'debug',
         apiVersion: config.elasticsearch.apiVersion,

src/api/extensions/gls-parcelshop-dk/index.js

@@ -22,7 +22,7 @@ module.exports = ({config, db}) => {
         returnData.droppoints = []
 
         // pass the request to elasticsearch
-        const url = 'http://' + config.elasticsearch.host + ':' + config.elasticsearch.port + '/gls_parcelshop_dk/droppoint/_search';
+        const url = config.elasticsearch.protocol + '://' + config.elasticsearch.host + ':' + config.elasticsearch.port + '/gls_parcelshop_dk/droppoint/_search';
 
         request({ // do the elasticsearch request
             uri: url,

src/graphql/elasticsearch/client.js

@@ -2,7 +2,11 @@ import config from 'config';
 import elasticsearch from 'elasticsearch';
 
 const client = new elasticsearch.Client({
-  host: config.elasticsearch.host + ':' + config.elasticsearch.port
+  host: {
+    host: config.elasticsearch.host,
+    port: config.elasticsearch.port,
+    protocol: config.elasticsearch.protocol
+  },
 });
 
 export default client;

src/platform/magento1/tax.js

@@ -72,7 +72,8 @@ class TaxProxy extends AbstractTaxProxy {
         const esConfig = { // as we're runing tax calculation and other data, we need a ES indexer
           host: {
             host: this._config.elasticsearch.host,
-            port: this._config.elasticsearch.port
+            port: this._config.elasticsearch.port,
+            protocol: this._config.elasticsearch.protocol
           },
           log: 'debug',
           apiVersion: this._config.elasticsearch.apiVersion,

src/platform/magento2/tax.js

@@ -69,7 +69,11 @@ class TaxProxy extends AbstractTaxProxy {
 
       if (this._config.tax.calculateServerSide) {
         const esConfig = { // as we're runing tax calculation and other data, we need a ES indexer
-          host: this._config.elasticsearch.host + ':' + this._config.elasticsearch.port,
+          host: {
+            host: this._config.elasticsearch.host,
+            port: this._config.elasticsearch.port,
+            protocol: this._config.elasticsearch.protocol
+          },
           log: 'debug',
           apiVersion: this._config.elasticsearch.apiVersion,
           requestTimeout: 5000