Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "No response compression when there is a referer (#47751)" #49987

Merged
merged 2 commits into from
Nov 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 0 additions & 39 deletions src/core/server/http/http_server.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -577,45 +577,6 @@ test('exposes route details of incoming request to a route handler', async () =>
});
});

describe('conditional compression', () => {
test('disables compression when there is a referer', async () => {
const { registerRouter, server: innerServer } = await server.setup(config);

const router = new Router('', logger, enhanceWithContext);
router.get({ path: '/', validate: false }, (context, req, res) =>
// we need the large body here so that compression would normally be used
res.ok({ body: 'hello'.repeat(500), headers: { 'Content-Type': 'text/html; charset=UTF-8' } })
);
registerRouter(router);

await server.start();
const response = await supertest(innerServer.listener)
.get('/')
.set('accept-encoding', 'gzip')
.set('referer', 'http://some-other-site/');

expect(response.header).not.toHaveProperty('content-encoding');
});

test(`enables compression when there isn't a referer`, async () => {
const { registerRouter, server: innerServer } = await server.setup(config);

const router = new Router('', logger, enhanceWithContext);
router.get({ path: '/', validate: false }, (context, req, res) =>
// we need the large body here so that compression will be used
res.ok({ body: 'hello'.repeat(500), headers: { 'Content-Type': 'text/html; charset=UTF-8' } })
);
registerRouter(router);

await server.start();
const response = await supertest(innerServer.listener)
.get('/')
.set('accept-encoding', 'gzip');

expect(response.header).toHaveProperty('content-encoding', 'gzip');
});
});

describe('setup contract', () => {
describe('#createSessionStorage', () => {
it('creates session storage factory', async () => {
Expand Down
18 changes: 0 additions & 18 deletions src/core/server/http/http_server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ export class HttpServer {

const basePathService = new BasePath(config.basePath);
this.setupBasePathRewrite(config, basePathService);
this.setupConditionalCompression();

return {
registerRouter: this.registerRouter.bind(this),
Expand Down Expand Up @@ -176,23 +175,6 @@ export class HttpServer {
});
}

private setupConditionalCompression() {
if (this.server === undefined) {
throw new Error('Server is not created yet');
}

this.server.ext('onRequest', (request, h) => {
// whenever there is a referrer, don't use compression even if the client supports it
if (request.info.referrer !== '') {
this.log.debug(
`Not using compression because there is a referer: ${request.info.referrer}`
);
request.info.acceptEncoding = '';
}
return h.continue;
});
}

private registerOnPostAuth(fn: OnPostAuthHandler) {
if (this.server === undefined) {
throw new Error('Server is not created yet');
Expand Down
46 changes: 11 additions & 35 deletions test/api_integration/apis/core/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,45 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
import expect from '@kbn/expect';

export default function ({ getService }) {
const supertest = getService('supertest');

describe('core', () => {
describe('request context', () => {
it('provides access to elasticsearch', async () => (
await supertest
.get('/requestcontext/elasticsearch')
.expect(200, 'Elasticsearch: true')
));
describe('core request context', () => {
it('provides access to elasticsearch', async () => (
await supertest
.get('/requestcontext/elasticsearch')
.expect(200, 'Elasticsearch: true')
));

it('provides access to SavedObjects client', async () => (
await supertest
.get('/requestcontext/savedobjectsclient')
.expect(200, 'SavedObjects client: {"page":1,"per_page":20,"total":0,"saved_objects":[]}')
));
});

describe('compression', () => {
it(`uses compression when there isn't a referer`, async () => {
await supertest
.get('/app/kibana')
.set('accept-encoding', 'gzip')
.then(response => {
expect(response.headers).to.have.property('content-encoding', 'gzip');
});
});

it(`doesn't use compression when there is a referer`, async () => {
await supertest
.get('/app/kibana')
.set('accept-encoding', 'gzip')
.set('referer', 'https://www.google.com')
.then(response => {
expect(response.headers).not.to.have.property('content-encoding');
});
});
});
it('provides access to SavedObjects client', async () => (
await supertest
.get('/requestcontext/savedobjectsclient')
.expect(200, 'SavedObjects client: {"page":1,"per_page":20,"total":0,"saved_objects":[]}')
));
});
}
1 change: 0 additions & 1 deletion test/api_integration/apis/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,5 @@ export default function ({ loadTestFile }) {
loadTestFile(require.resolve('./status'));
loadTestFile(require.resolve('./stats'));
loadTestFile(require.resolve('./ui_metric'));
loadTestFile(require.resolve('./core'));
});
}