github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove 401 error wrapping (#14324)

Browse source
This commit is contained in:
Kim Joar Bekkelund 2017-11-16 12:06:37 +01:00 • committed by GitHub
parent 25ed343633
commit f167a00543
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/core_plugins/elasticsearch/lib/__tests__/cluster.js
View file

@ -113,35 +113,6 @@ describe('plugins/elasticsearch', function () {
headers: headers
});
});
describe('wrap401Errors', () => {
let handler;
let error;
beforeEach(() => {
error = new Error('Authentication required');
error.statusCode = 401;
handler = sinon.stub();
});
it('ensures WWW-Authenticate header', async () => {
set(client, 'mock.401', sinon.stub().returns(Promise.reject(error)));
await cluster.callWithRequest({}, 'mock.401', {}, { wrap401Errors: true }).catch(handler);
sinon.assert.calledOnce(handler);
expect(handler.getCall(0).args[0].output.headers['WWW-Authenticate']).to.eql('Basic realm="Authorization Required"');
});
it('persists WWW-Authenticate header', async () => {
set(error, 'body.error.header[WWW-Authenticate]', 'Basic realm="Test"');
set(client, 'mock.401', sinon.stub().returns(Promise.reject(error)));
await cluster.callWithRequest({}, 'mock.401', {}, { wrap401Errors: true }).catch(handler);
sinon.assert.calledOnce(handler);
expect(handler.getCall(0).args[0].output.headers['WWW-Authenticate']).to.eql('Basic realm="Test"');
});
});
});
});
});

24
src/core_plugins/elasticsearch/lib/cluster.js
View file

@ -1,7 +1,6 @@
import elasticsearch from 'elasticsearch';
import { get, set, isEmpty, cloneDeep, pick } from 'lodash';
import toPath from 'lodash/internal/toPath';
import Boom from 'boom';
import filterHeaders from './filter_headers';
import { parseConfig } from './parse_config';
@ -20,17 +19,17 @@ export class Cluster {
return this;
}
callWithRequest = (req = {}, endpoint, clientParams = {}, options = {}) => {
callWithRequest = (req = {}, endpoint, clientParams = {}) => {
if (req.headers) {
const filteredHeaders = filterHeaders(req.headers, this.getRequestHeadersWhitelist());
set(clientParams, 'headers', filteredHeaders);
}
return callAPI(this._noAuthClient, endpoint, clientParams, options);
return callAPI(this._noAuthClient, endpoint, clientParams);
}
callWithInternalUser = (endpoint, clientParams = {}, options = {}) => {
return callAPI(this._client, endpoint, clientParams, options);
callWithInternalUser = (endpoint, clientParams = {}) => {
return callAPI(this._client, endpoint, clientParams);
}
getRequestHeadersWhitelist = () => getClonedProperty(this._config, 'requestHeadersWhitelist');
@ -81,8 +80,7 @@ export class Cluster {
}
}
function callAPI(client, endpoint, clientParams = {}, options = {}) {
const wrap401Errors = options.wrap401Errors !== false;
function callAPI(client, endpoint, clientParams = {}) {
const clientPath = toPath(endpoint);
const api = get(client, clientPath);
@ -95,17 +93,7 @@ function callAPI(client, endpoint, clientParams = {}, options = {}) {
throw new Error(`called with an invalid endpoint: ${endpoint}`);
}
return api.call(apiContext, clientParams).catch((err) => {
if (!wrap401Errors || err.statusCode !== 401) {
return Promise.reject(err);
}
const boomError = Boom.boomify(err, { statusCode: err.statusCode });
const wwwAuthHeader = get(err, 'body.error.header[WWW-Authenticate]');
boomError.output.headers['WWW-Authenticate'] = wwwAuthHeader || 'Basic realm="Authorization Required"';
throw boomError;
});
return api.call(apiContext, clientParams);
}
function getClonedProperties(config, paths) {