diff --git a/src/cli/connector.js b/src/cli/connector.js index cdc00f0a1..c3feae7bb 100644 --- a/src/cli/connector.js +++ b/src/cli/connector.js @@ -125,7 +125,7 @@ function _createConnectorObject(cliData) { name: cliData.name, domain: cliData.domain, publicIp: cliData.publicIp, - certDir: cliData.certDir, + cert: cliData.cert, isSelfSignedCert: AppHelper.validateBooleanCliOptions(cliData.selfSignedEnable, cliData.selfSignedDisable), devMode: AppHelper.validateBooleanCliOptions(cliData.devModeOn, cliData.devModeOff) } diff --git a/src/schemas/connector.js b/src/schemas/connector.js index bc766c641..d23b105bb 100644 --- a/src/schemas/connector.js +++ b/src/schemas/connector.js @@ -18,7 +18,7 @@ const connectorCreate = { "name": {"type": "string", "minLength": 1}, "domain": {"type": "string", "minLength": 4}, "publicIp": {"type": "string", "minLength": 7}, - "certDir": {"type": "string"}, + "cert": {"type": "string"}, "isSelfSignedCert": {"type": "boolean"}, "devMode": {"type": "boolean"} }, @@ -33,7 +33,7 @@ const connectorUpdate = { "name": {"type": "string", "minLength": 1}, "domain": {"type": "string", "minLength": 4}, "publicIp": {"type": "string", "minLength": 7}, - "certDir": {"type": "string"}, + "cert": {"type": "string"}, "isSelfSignedCert": {"type": "boolean"}, "devMode": {"type": "boolean"} }, diff --git a/src/services/connector-service.js b/src/services/connector-service.js index 04bb3cb9c..d48eacb7b 100644 --- a/src/services/connector-service.js +++ b/src/services/connector-service.js @@ -24,6 +24,7 @@ const logger = require('../logger') const querystring = require('querystring') const Op = require('sequelize').Op; const Sequelize = require('sequelize'); +const fs = require('fs'); async function _createConnector(connectorData, transaction) { await Validator.validate(connectorData, Validator.schemas.connectorCreate) @@ -121,7 +122,7 @@ async function _makeRequest(connector, options, data) { }) if (connector.cert && connector.isSelfSignedCert === true) { - let ca = '-----BEGIN CERTIFICATE-----\n' + connector.cert + '\n' + '-----END CERTIFICATE-----'; + const ca = fs.readFileSync(connector.cert); options.ca = new Buffer(ca); }