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.

Sign up for GitHub

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

Allow any hostname for chromium proxy bypass #74693

Merged
merged 3 commits into from
Aug 10, 2020
Merged

Allow any hostname for chromium proxy bypass #74693

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09818b4
Allow any hostname for chromium proxy bypass
Aug 10, 2020
4720872
Adds a test for the proxy bypass config
Aug 10, 2020
b9b1bfd
Add wildcard to test
Aug 10, 2020
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
28 changes: 28 additions & 0 deletions x-pack/plugins/reporting/server/config/schema.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,34 @@ describe('Reporting Config Schema', () => {
).toMatchObject({ hostname: 'Frodo' });
});

it('allows setting a wildcard for chrome proxy bypass', () => {
expect(
ConfigSchema.validate({
capture: {
browser: {
chromium: {
proxy: {
enabled: true,
server: 'http://example.com:8080',
bypass: ['foo.example.com', 'bar.example.com', 'bats.example.com'],
tsullivan marked this conversation as resolved.
Show resolved Hide resolved
},
},
},
},
}).capture.browser.chromium.proxy
).toMatchInlineSnapshot(`
Object {
"bypass": Array [
"foo.example.com",
"bar.example.com",
"bats.example.com",
],
"enabled": true,
"server": "http://example.com:8080",
}
`);
});

it(`logs the proper validation messages`, () => {
// kibanaServer
const throwValidationErr = () => ConfigSchema.validate({ kibanaServer: { hostname: '0' } });
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/reporting/server/config/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ const CaptureSchema = schema.object({
bypass: schema.conditional(
schema.siblingRef('enabled'),
true,
schema.arrayOf(schema.string({ hostname: true })),
schema.arrayOf(schema.string()),
schema.maybe(schema.never())
),
}),
Expand Down