#252645617

Committed 08 Nov 2023 06:04PM UTC coverage: 72.209% (+0.4%) from 71.777%

Build Type

push

Committed by

Commit Message

Merge branch 'main'

* main: (49 commits)
  maintenance release v1.9.2451
  removed services/broker submodule before re-adding
  removed lua-iinspect
  log leak fix
  log cleanup, redeploy after changing expired Rollbar Project Access Tokens
  submodule sync
  version bump, log cleanup and base image update after fixing GitHub OAuth
  dependency updates, fixing github login (has code but different object structure)
  test passes, but parsing fails
  spec fix for staging
  fails in tests, because code is B
  removed json
  fixes
  gpg
  debugging broken github-oauth login
  task renamed
  recent test passed, build stable, adding debug logging only for next refactoring steps
  fix for potent. unlinked github login addRoutes
  recent test passed, build stable, adding debug logging only for next refactoring steps
  github fix
  ...

# Conflicts:
#	package-lock.json
#	package.json

Run Details

1817 of 3438 branches covered (0.0%)

Branch coverage included in aggregate %.

20 of 51 new or added lines in 6 files covered. (39.22%)

532 existing lines in 18 files now uncovered.

8202 of 10437 relevant lines covered (78.59%)

7.48 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

47.83

/lib/thinx/oauth-github.js

var axios = require('axios');

var events = require('events');
var url = require('url');
var crypto = require('crypto');

module.exports = function (opts) {
  if (!opts.callbackURI) opts.callbackURI = '/github/callback';
  if (!opts.loginURI) opts.loginURI = '/github/login';
  if (typeof opts.scope === 'undefined') opts.scope = 'user';
  var state = crypto.randomBytes(8).toString('hex');
  var urlObj = url.parse(opts.baseURL);
  urlObj.pathname = url.resolve(urlObj.pathname, opts.callbackURI);
  var redirectURI = url.format(urlObj);
  var emitter = new events.EventEmitter();

  function login(req, resp) {
    var u = 'https://github.com/login/oauth/authorize'
      + '?client_id=' + opts.githubClient
      + (opts.scope ? '&scope=' + opts.scope : '')
      + '&redirect_uri=' + redirectURI
      + '&state=' + state
      ;
    resp.statusCode = 302;
    resp.setHeader('location', u);
    resp.end();
  }

  function parseResponse(body) {
    const items = body.split("&");
    var data = null;
    for (item in items) {
      const kv = items[0].split("=");
      const key = kv[0];
      const val = kv[1];
      if (key.indexOf("access_token" !== -1)) {
        data = val;
        break;
      }
    }
    return data;
  }

  function callback(req, resp, cb) {
    var query = url.parse(req.url, true).query
    var code = query.code
    if (!code || code.length < 4) {
      const rbody = resp.body;
      console.log("[debug] [oauth-github] missing or invalid oauth code in ", {query}, {rbody});
      return emitter.emit('error', { error: 'missing or invalid oauth code' }, resp)
    }
    var u = 'https://github.com/login/oauth/access_token'
      + '?client_id=' + opts.githubClient
      + '&client_secret=' + opts.githubSecret
      + '&code=' + code
      + '&state=' + state
      ;

    (async () => {
      try {
        const body = await axios.get(u);
        console.log("[debug] emitting event token with body", { body });
        const data = parseResponse(body.data);
        if (data.indexOf("gho_") !== -1) {
          emitter.emit('token', data);
          if (cb) return cb(null, data);
        } else {
          console.log("[debug] Invalid GitHub Response:", {body});
        }
      } catch (e) {
        console.log("axios get error:", e);
        if (cb) return cb(e);
        emitter.emit('error', null, e);
      }
    })()
  }

  emitter.login = login;
  emitter.callback = callback;
  return emitter;
}

1	var axios = require('axios');	1✔
2
3	var events = require('events');	1✔
4	var url = require('url');	1✔
5	var crypto = require('crypto');	1✔
6
7	module.exports = function (opts) {	1✔
8	if (!opts.callbackURI) opts.callbackURI = '/github/callback';	15!
9	if (!opts.loginURI) opts.loginURI = '/github/login';	15!
10	if (typeof opts.scope === 'undefined') opts.scope = 'user';	15!
11	var state = crypto.randomBytes(8).toString('hex');	15✔
12	var urlObj = url.parse(opts.baseURL);	15✔
13	urlObj.pathname = url.resolve(urlObj.pathname, opts.callbackURI);	15✔
14	var redirectURI = url.format(urlObj);	15✔
15	var emitter = new events.EventEmitter();	15✔
16
17	function login(req, resp) {
18	var u = 'https://github.com/login/oauth/authorize'	1✔
19	+ '?client_id=' + opts.githubClient
20	+ (opts.scope ? '&scope=' + opts.scope : '')	1!
21	+ '&redirect_uri=' + redirectURI
22	+ '&state=' + state
23	;
24	resp.statusCode = 302;	1✔
25	resp.setHeader('location', u);	1✔
26	resp.end();	1✔
27	}
28
29	function parseResponse(body) {
NEW 30	const items = body.split("&");	×
NEW 31	var data = null;	×
NEW 32	for (item in items) {	×
NEW 33	const kv = items[0].split("=");	×
NEW 34	const key = kv[0];	×
NEW 35	const val = kv[1];	×
NEW 36	if (key.indexOf("access_token" !== -1)) {	×
NEW 37	data = val;	×
NEW 38	break;	×
39	}
40	}
NEW 41	return data;	×
42	}
43
44	function callback(req, resp, cb) {
45	var query = url.parse(req.url, true).query	2✔
46	var code = query.code	2✔
47	if (!code \|\| code.length < 4) {	2!
48	const rbody = resp.body;	2✔
49	console.log("[debug] [oauth-github] missing or invalid oauth code in ", {query}, {rbody});	2✔
50	return emitter.emit('error', { error: 'missing or invalid oauth code' }, resp)	2✔
51	}
UNCOV 52	var u = 'https://github.com/login/oauth/access_token'	×
53	+ '?client_id=' + opts.githubClient
54	+ '&client_secret=' + opts.githubSecret
55	+ '&code=' + code
56	+ '&state=' + state
57	;
58
NEW 59	(async () => {	×
NEW 60	try {	×
NEW 61	const body = await axios.get(u);	×
NEW 62	console.log("[debug] emitting event token with body", { body });	×
NEW 63	const data = parseResponse(body.data);	×
NEW 64	if (data.indexOf("gho_") !== -1) {	×
NEW 65	emitter.emit('token', data);	×
NEW 66	if (cb) return cb(null, data);	×
67	} else {
NEW 68	console.log("[debug] Invalid GitHub Response:", {body});	×
69	}
70	} catch (e) {
NEW 71	console.log("axios get error:", e);	×
NEW 72	if (cb) return cb(e);	×
NEW 73	emitter.emit('error', null, e);	×
74	}
75	})()
76	}
77
78	emitter.login = login;	15✔
79	emitter.callback = callback;	15✔
80	return emitter;	15✔
81	}

suculent / thinx-device-api / #252645617

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous