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

Globally enforce internal API restriction #193792

Merged
merged 16 commits into from
Oct 2, 2024
Merged

Globally enforce internal API restriction #193792

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e916f4b
Globally enforce internal API restriction
TinaHeiligers Sep 23, 2024
ea02761
adds restrictInternalApis to cli args
TinaHeiligers Sep 23, 2024
7066fa1
Merge branch 'main' into kbn-163654-enable-internalAPIrestriction
elasticmachine Sep 23, 2024
e0d4ed8
Merge branch 'main' into kbn-163654-enable-internalAPIrestriction
elasticmachine Sep 24, 2024
b2d6a5e
Enable restriction in http config if not set through kibana.yml
TinaHeiligers Sep 24, 2024
81c58d7
Merge branch 'main' into kbn-163654-enable-internalAPIrestriction
elasticmachine Sep 26, 2024
b579951
Set default to true in config schema
TinaHeiligers Sep 26, 2024
ff95bde
Update tests to handle restriction enabled by default
TinaHeiligers Sep 26, 2024
5fbfb76
core api integration tests
TinaHeiligers Sep 26, 2024
4bc36a9
Merge branch 'main' into kbn-163654-enable-internalAPIrestriction
elasticmachine Sep 27, 2024
2d73f0b
Update files plugin tests
TinaHeiligers Sep 27, 2024
d02ce7c
Disable restricting internal APIs in security functional tests
TinaHeiligers Sep 28, 2024
d9b3ea9
Merge branch 'main' into kbn-163654-enable-internalAPIrestriction
elasticmachine Sep 28, 2024
b42530a
Clean up
TinaHeiligers Sep 30, 2024
d177cdb
Merge branch 'main' into kbn-163654-enable-internalAPIrestriction
elasticmachine Oct 1, 2024
624a65d
Merge branch 'main' into kbn-163654-enable-internalAPIrestriction
elasticmachine Oct 2, 2024
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
4 changes: 2 additions & 2 deletions packages/core/http/core-http-server-internal/src/http_config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,8 @@ export class HttpConfig implements IHttpConfig {
this.requestId = rawHttpConfig.requestId;
this.shutdownTimeout = rawHttpConfig.shutdownTimeout;

// default to `false` to prevent breaking changes in current offerings
this.restrictInternalApis = rawHttpConfig.restrictInternalApis ?? false;
// default to `true` to restrict internal APIs if not set through config.
this.restrictInternalApis = rawHttpConfig.restrictInternalApis ?? true;
TinaHeiligers marked this conversation as resolved.
Show resolved Hide resolved
this.eluMonitor = rawHttpConfig.eluMonitor;
this.versioned = rawHttpConfig.versioned;
this.oas = rawHttpConfig.oas;
Expand Down
2 changes: 1 addition & 1 deletion packages/core/http/core-http-server-mocks/src/test_utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export const createConfigService = ({
shutdownTimeout: moment.duration(30, 'seconds'),
keepaliveTimeout: 120_000,
socketTimeout: 120_000,
restrictInternalApis: false,
restrictInternalApis: false, // disable restriction for Kibana tests
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leaves the restriction disabled for tests consuming createConfigService.

versioned: {
versionResolution: 'oldest',
strictClientVersionCheck: true,
Expand Down
1 change: 1 addition & 0 deletions packages/kbn-config/src/env.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export interface CliArgs {
cache: boolean;
dist: boolean;
serverless?: boolean;
retrictInternalApis?: boolean;
}

/** @internal */
Expand Down