cartodb/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle error properly in user middleware, it will logged in error middleware

Browse Source
This commit is contained in:
Daniel García Aubert 2020-06-03 15:39:02 +02:00
parent 107a97aa9e
commit c37e3f173d
3 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/api/middlewares/user.js
View File

@ -3,11 +3,14 @@
const CdbRequest = require('../../models/cdb-request');
module.exports = function user (metadataBackend) {
return function userMiddleware (req, res, next) {
const { logger } = res.locals;
const cdbRequest = new CdbRequest({ logger });
const cdbRequest = new CdbRequest();
res.locals.user = getUserNameFromRequest(req, cdbRequest);
return function userMiddleware (req, res, next) {
try {
res.locals.user = getUserNameFromRequest(req, cdbRequest);
} catch (err) {
return next(err);
}
metadataBackend.getUserId(res.locals.user, (err, userId) => {
if (err || !userId) {

11
lib/models/cdb-request.js
View File

@ -1,8 +1,7 @@
'use strict';
module.exports = class CdbRequest {
constructor ({ logger }) {
this.logger = logger;
constructor () {
// would extract "strk" from "strk.cartodb.com"
this.RE_USER_FROM_HOST = new RegExp(global.environment.user_from_host || '^([^\\.]+)\\.');
}
@ -16,12 +15,8 @@ module.exports = class CdbRequest {
const mat = host.match(this.RE_USER_FROM_HOST);
if (!mat) {
return this.logger.error(new Error(`Pattern '${this.RE_USER_FROM_HOST}' does not match hostname '${host}'`));
}
if (mat.length !== 2) {
return this.logger.error(new Error(`Pattern '${this.RE_USER_FROM_HOST}' gave unexpected matches against '${host}': ${mat}`));
if (!mat || mat.length !== 2) {
throw new Error(`No username found in hostname '${host}'`);
}
return mat[1];

33
test/unit/cdb-request-test.js
View File

@ -4,9 +4,8 @@ require('../support/test-helper');
var assert = require('assert');
var CdbRequest = require('../../lib/models/cdb-request');
const { logger } = require('../../lib/server-options');
describe('req2params', function () {
describe('username in host header (CdbRequest)', function () {
function createRequest (host, userParam) {
var req = {
params: {},
@ -23,7 +22,7 @@ describe('req2params', function () {
}
it('extracts name from host header', function () {
var cdbRequest = new CdbRequest({ logger });
var cdbRequest = new CdbRequest();
var user = cdbRequest.userByReq(createRequest('localhost'));
assert.strictEqual(user, 'localhost');
@ -33,7 +32,7 @@ describe('req2params', function () {
var userFromHostConfig = global.environment.user_from_host;
global.environment.user_from_host = null;
var cdbRequest = new CdbRequest({ logger });
var cdbRequest = new CdbRequest();
var user = cdbRequest.userByReq(createRequest('development.localhost.lan'));
global.environment.user_from_host = userFromHostConfig;
@ -42,45 +41,39 @@ describe('req2params', function () {
});
it('considers user param before headers', function () {
var cdbRequest = new CdbRequest({ logger });
var cdbRequest = new CdbRequest();
var user = cdbRequest.userByReq(createRequest('localhost', 'development'));
assert.strictEqual(user, 'development');
});
it('returns undefined when it cannot extract username', function () {
it('returns throw when it cannot extract username', function () {
var userFromHostConfig = global.environment.user_from_host;
global.environment.user_from_host = null;
var cdbRequest = new CdbRequest({ logger });
var user = cdbRequest.userByReq(createRequest('localhost'));
var cdbRequest = new CdbRequest();
assert.throws(() => cdbRequest.userByReq(createRequest('localhost')));
global.environment.user_from_host = userFromHostConfig;
assert.strictEqual(user, undefined);
});
it('should not fail for undefined host header', function () {
it('should throw for undefined host header', function () {
var userFromHostConfig = global.environment.user_from_host;
global.environment.user_from_host = null;
var cdbRequest = new CdbRequest({ logger });
var user = cdbRequest.userByReq(createRequest(undefined));
var cdbRequest = new CdbRequest();
assert.throws(() => cdbRequest.userByReq(createRequest(undefined)));
global.environment.user_from_host = userFromHostConfig;
assert.strictEqual(user, undefined);
});
it('should not fail for null host header', function () {
it('should throw for null host header', function () {
var userFromHostConfig = global.environment.user_from_host;
global.environment.user_from_host = null;
var cdbRequest = new CdbRequest({ logger });
var user = cdbRequest.userByReq(createRequest(null));
var cdbRequest = new CdbRequest();
assert.throws(() => cdbRequest.userByReq(createRequest(null)));
global.environment.user_from_host = userFromHostConfig;
assert.strictEqual(user, undefined);
});
});