Skip to content

Commit

Permalink
[chrome/xsrf] if a user sends a custom xsrfToken, it should be ignored
Browse files Browse the repository at this point in the history
  • Loading branch information
spalger committed Dec 9, 2015
1 parent b0a36de commit fadadb8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/ui/public/chrome/api/__tests__/xsrf.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@ describe('chrome xsrf apis', function () {
$httpBackend.flush();
});

it('accepts alternate tokens to use', function () {
it('treats the kbnXsrfToken option as boolean-y', function () {
const customToken = `custom:${version}`;
$httpBackend.expectPOST('/api/test', undefined, function (headers) {
return headers[xsrfHeader] === customToken;
return headers[xsrfHeader] === version;
}).respond(200, '');

$http({
Expand Down
8 changes: 4 additions & 4 deletions src/ui/public/chrome/api/xsrf.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ export default function (chrome, internals) {
return internals.version;
};

$.ajaxPrefilter(function ({ kbnXsrfToken = internals.version }, originalOptions, jqXHR) {
$.ajaxPrefilter(function ({ kbnXsrfToken = true }, originalOptions, jqXHR) {
if (kbnXsrfToken) {
jqXHR.setRequestHeader('kbn-version', kbnXsrfToken);
jqXHR.setRequestHeader('kbn-version', internals.version);
}
});

chrome.$setupXsrfRequestInterceptor = function ($httpProvider) {
$httpProvider.interceptors.push(function () {
return {
request: function (opts) {
const { kbnXsrfToken = internals.version } = opts;
const { kbnXsrfToken = true } = opts;
if (kbnXsrfToken) {
set(opts, ['headers', 'kbn-version'], kbnXsrfToken);
set(opts, ['headers', 'kbn-version'], internals.version);
}
return opts;
}
Expand Down

0 comments on commit fadadb8

Please sign in to comment.