feat: Support basic authentication, #29

Author: vicanso

README.md

@@ -23,7 +23,27 @@ View the [./examples](examples) directory for working examples.
 [API](https://vicanso.github.io/influxdb-nodejs/)
 
 
-Write point
+### New Client
+
+```js
+// no auth
+const Influx = require('influxdb-nodejs');
+const client = new Influx('http://127.0.0.1:8086/mydb');
+```
+
+```js
+// normal auth (user and password will be added to URL query parameters)
+const Influx = require('influxdb-nodejs');
+const client = new Influx('http://user:pwd@127.0.0.1:8086/mydb');
+```
+
+```js
+// basic auth (will be used http basic auth)
+const Influx = require('influxdb-nodejs');
+const client = new Influx('http://user:pwd@127.0.0.1:8086/mydb?auth=basic');
+```
+
+### Write point
 
 ```js
 const Influx = require('influxdb-nodejs');
@@ -63,7 +83,7 @@ client.write('http')
 ```
 
 
-Query influxdb with multi where condition
+### Query influxdb with multi where condition
 
 ```js
 const Influx = require('influxdb-nodejs');
@@ -97,7 +117,7 @@ client.query('http')
 // select bottom("use",5) from "http" where "spdy" = '1'
 ```
 
-Write points to influxdb in queue
+### Write points to influxdb in queue
 
 ```js
 const Influx = require('influxdb-nodejs');
@@ -124,7 +144,7 @@ setInterval(() => {
 }, 5000);
 ```
 
-Sub query
+### Sub query
 
 ```js
 const Influx = require('influxdb-nodejs');
@@ -140,7 +160,7 @@ client.query('http')
   }).catch(console.error);
 ```
 
-Multi query
+### Multi query
 
 ```js
 const Influx = require('influxdb-nodejs');
@@ -162,7 +182,7 @@ reader.then(data => {
 }).catch(console.error);
 ```
 
-Use influxdb for express
+### Use influxdb for express
 
 ```js
 const express = require('express');

lib/client.js

@@ -4,6 +4,7 @@ const EventEmitter = require('events');
 const InfluxQL = require('influx-ql');
 const request = require('superagent');
 const _ = require('lodash');
+const querystring = require('querystring');
 
 const Influx = require('./influx');
 const debug = require('./debug');
@@ -84,13 +85,28 @@ class Client extends EventEmitter {
         port: parseInt(arr[1], 10),
       };
     });
-    opts.database = result[4] || '';
+    const db = result[4] || '';
+    const queryIndex = db.indexOf('?');
+    let query = '';
+    if (queryIndex === -1) {
+      opts.database = db;
+    } else {
+      opts.database = db.substring(0, queryIndex);
+      query = db.substr(queryIndex + 1);
+    }
     /* istanbul ignore else */
     if (result[2]) {
       const authInfos = result[2].substring(0, result[2].length - 1).split(
         ':');
       opts.username = authInfos[0];
       opts.password = authInfos[1];
+      // 根据query配置，判断使用哪种认证方式
+      if (query) {
+        const queryInfo = querystring.parse(query);
+        if (queryInfo.auth) {
+          opts.authType = queryInfo.auth;
+        }
+      }
     }
     debug('init options:%j', opts);
     const internalData = internal(this);
@@ -115,8 +131,8 @@ class Client extends EventEmitter {
    */
   startHealthCheck(ping, interval) {
     const defaultPing = (backend) => {
-      const url = `${backend.protocol || 'http'}://${backend.host}:${backend.port || 80}/ping`;
-      return request.get(url).timeout(1000);
+      const pingUrl = `${backend.protocol || 'http'}://${backend.host}:${backend.port || 80}/ping`;
+      return request.get(pingUrl).timeout(1000);
     };
     const pingFn = _.isNumber(ping) ? null : ping;
     const ms = _.isNumber(ping) ? ping : interval;

lib/http.js

@@ -30,7 +30,16 @@ class HTTP {
     debug('http backends:%j', servers);
     const balancer = new Balancer(servers, type);
     data.balancer = balancer;
-    data.plugin = balancer.plugin();
+    data.plugins = [
+      balancer.plugin(),
+    ];
+  }
+  /**
+   * [addPlugin add plugin for http request]
+   * @param {Function} fn plugin function
+   */
+  addPlugin(fn) {
+    internal(this).plugins.push(fn);
   }
   /**
    * [timeout set request time out]
@@ -60,7 +69,7 @@ class HTTP {
     debug('GET %s, query:%j', url, query);
     const internalData = internal(this);
     const req = getRequest('get', url, query, internalData.timeout);
-    req.use(internalData.plugin);
+    _.forEach(internalData.plugins, plugin => req.use(plugin));
     return req;
   }
   /**
@@ -76,7 +85,7 @@ class HTTP {
     const req = getRequest('post', url, query, internalData.timeout);
     req.type('form')
       .send(data);
-    req.use(internalData.plugin);
+    _.forEach(internalData.plugins, plugin => req.use(plugin));
     return req;
   }
   startHealthCheck(ping, interval) {

lib/influx.js

@@ -79,6 +79,27 @@ class Influx {
     }
     debug('Influx init options:%j', options);
     const client = new HTTP(options.servers, options.loadBalancingAlgorithm);
+    // 如果有配置了用户与密码
+    if (options.username && options.password) {
+      // basic auth认证
+      if (options.authType === 'basic') {
+        const str = `${options.username}:${options.password}`;
+        const authValue = `Basic ${Buffer.from(str).toString('base64')}`;
+        client.addPlugin((req) => {
+          req.set('Authorization', authValue);
+          return req;
+        });
+      } else {
+        client.addPlugin((req) => {
+          req.query({
+            u: options.username,
+            p: options.password,
+          });
+          return req;
+        });
+      }
+    }
+
     const internalData = internal(this);
     internalData.opts = _.extend({}, options);
     internalData.client = client;
@@ -113,10 +134,6 @@ class Influx {
       q,
       db: db || opts.database,
     };
-    if (opts.username && opts.password) {
-      queryData.u = opts.username;
-      queryData.p = opts.password;
-    }
     if (epoch) {
       queryData.epoch = epoch;
     }
@@ -138,10 +155,6 @@ class Influx {
     const queryData = {
       db: opts.database,
     };
-    if (opts.username && opts.password) {
-      queryData.u = opts.username;
-      queryData.p = opts.password;
-    }
     if (points[0].precision) {
       queryData.precision = points[0].precision;
     }
@@ -165,17 +178,12 @@ class Influx {
 
   queryPost(q, db) {
     const internalData = internal(this);
-    const opts = internalData.opts;
     debug('q:%s', q);
     const queryData = {};
     /* istanbul ignore if */
     if (db) {
       queryData.db = db;
     }
-    if (opts.username && opts.password) {
-      queryData.u = opts.username;
-      queryData.p = opts.password;
-    }
     return internalData.client.post('/query', {
       q,
     }, queryData).then(res => res.body, (err) => {

test/client.js

@@ -563,12 +563,24 @@ describe('Client:Auth', () => {
     });
   });
 
+
   it('create database', done => {
     client.createDatabase().then(() => {
       done();
     }).catch(done);
   });
 
+  it('basic auth client', done => {
+    const tmp = new Client(`http://vicanso:mypwd@localhost:8085/${db}?auth=basic`);
+    tmp.showDatabases().then((data) => {
+      if (data.length === 0) {
+        done(new Error('show data bases fail'));
+        return;
+      }
+      done();
+    }).catch(done);
+  });
+
   it('write point', done => {
     client.write('http')
       .tag({