fix(token): trim before using

Author: gergelyke

lib/utils/configReader.js

@@ -128,7 +128,7 @@ ConfigReader.prototype._getFileConfig = function (file) {
 
 ConfigReader.prototype._getVmConfig = function (name) {
   var vmConfig = {}
-  var cGroupContent = this.readProcFile('/self/cgroup')
+  var cGroupContent = this._readProcFile('/self/cgroup')
   var isRunningInVm
 
   if (cGroupContent) {
@@ -163,7 +163,7 @@ ConfigReader.prototype.isRunningInVm = function (cGroupFile) {
   return false
 }
 
-ConfigReader.prototype.readProcFile = function (name) {
+ConfigReader.prototype._readProcFile = function (name) {
   var procFileContent
   try {
     procFileContent = fs.readFileSync('/proc' + name, 'utf-8')
@@ -173,7 +173,7 @@ ConfigReader.prototype.readProcFile = function (name) {
   return procFileContent
 }
 
-ConfigReader.prototype.checkApiToken = function (token) {
+ConfigReader.prototype._checkApiToken = function (token) {
   var bearerTokenParts
 
   if (!token) {
@@ -187,6 +187,11 @@ ConfigReader.prototype.checkApiToken = function (token) {
   }
 }
 
+ConfigReader.prototype._normalizeConfig = function () {
+  this.config.apiKey = this.config.apiKey.trim()
+  this.config.serviceName = this.config.serviceName.trim()
+}
+
 ConfigReader.prototype.getConfig = function () {
   var parameterConfig = this.parameterConfig
   var systemConfig = this._getSystemConfig()
@@ -202,7 +207,7 @@ ConfigReader.prototype.getConfig = function () {
 
   var vmConfig = this._getVmConfig()
 
-  config = defaults(
+  this.config = config = defaults(
     config,
     fileConfig,
     cloudFoundryConfig,
@@ -214,12 +219,14 @@ ConfigReader.prototype.getConfig = function () {
     url.parse(config.collectorApiUrl).host
   ].concat(config.ignoreOutgoingHosts || [])
 
-  this.checkApiToken(config.apiKey)
+  this._checkApiToken(config.apiKey)
 
   if (!config.serviceName) {
     throw new Error('Missing serviceName, please set the TRACE_SERVICE_NAME environment variable')
   }
 
+  this._normalizeConfig()
+
   return config
 }
 

lib/utils/configReader.spec.js

@@ -6,6 +6,7 @@ var ConfigReader = require('./configReader')
 
 describe('Config Reader module', function () {
   var testApiToken = 'headers.payload.signature'
+  var testApiTokenWithWhitespaces = testApiToken + '\n'
 
   it('creates a configReader', function () {
     var config = { }
@@ -19,7 +20,7 @@ describe('Config Reader module', function () {
     var configReader = ConfigReader.create({
       serviceName: 'test',
       reporter: 'dummy',
-      apiKey: testApiToken
+      apiKey: testApiTokenWithWhitespaces
     })
 
     var getDefaultConfigStub = this.sandbox.stub(configReader, '_getDefaultConfig', function () {