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

[Code] don't allow access secured routes before x-pack info is available #34994

Merged
merged 1 commit into from
Apr 14, 2019
Merged

[Code] don't allow access secured routes before x-pack info is available #34994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions x-pack/plugins/code/server/routes/file.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { detectLanguage } from '../utils/detect_language';
const TEXT_FILE_LIMIT = 1024 * 1024; // 1mb

export function fileRoute(server: hapi.Server, options: ServerOptions) {
server.route({
server.securedRoute({
path: '/api/code/repo/{uri*3}/tree/{ref}/{path*}',
method: 'GET',
async handler(req: hapi.Request) {
Expand Down Expand Up @@ -58,7 +58,7 @@ export function fileRoute(server: hapi.Server, options: ServerOptions) {
},
});

server.route({
server.securedRoute({
path: '/api/code/repo/{uri*3}/blob/{ref}/{path*}',
method: 'GET',
async handler(req: hapi.Request, h: hapi.ResponseToolkit) {
Expand Down Expand Up @@ -108,7 +108,7 @@ export function fileRoute(server: hapi.Server, options: ServerOptions) {
},
});

server.route({
server.securedRoute({
path: '/app/code/repo/{uri*3}/raw/{ref}/{path*}',
method: 'GET',
async handler(req, h: hapi.ResponseToolkit) {
Expand All @@ -131,7 +131,7 @@ export function fileRoute(server: hapi.Server, options: ServerOptions) {
},
});

server.route({
server.securedRoute({
path: '/api/code/repo/{uri*3}/history/{ref}',
method: 'GET',
handler: historyHandler,
Expand Down Expand Up @@ -176,7 +176,7 @@ export function fileRoute(server: hapi.Server, options: ServerOptions) {
}
}
}
server.route({
server.securedRoute({
path: '/api/code/repo/{uri*3}/references',
method: 'GET',
async handler(req, reply) {
Expand All @@ -197,7 +197,7 @@ export function fileRoute(server: hapi.Server, options: ServerOptions) {
},
});

server.route({
server.securedRoute({
path: '/api/code/repo/{uri*3}/diff/{revision}',
method: 'GET',
async handler(req) {
Expand All @@ -216,7 +216,7 @@ export function fileRoute(server: hapi.Server, options: ServerOptions) {
},
});

server.route({
server.securedRoute({
path: '/api/code/repo/{uri*3}/blame/{revision}/{path*}',
method: 'GET',
async handler(req) {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/code/server/routes/install.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export function installRoute(
pluginName: def.pluginName,
});

server.route({
server.securedRoute({
path: '/api/code/install',
handler() {
return LanguageServers.map(status);
Expand Down
6 changes: 3 additions & 3 deletions x-pack/plugins/code/server/routes/lsp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export function lspRoute(
serverOptions: ServerOptions
) {
const log = new Logger(server);
server.route({
server.securedRoute({
path: '/api/code/lsp/textDocument/{method}',
async handler(req, h: hapi.ResponseToolkit) {
if (typeof req.payload === 'object' && req.payload != null) {
Expand Down Expand Up @@ -77,7 +77,7 @@ export function lspRoute(
method: 'POST',
});

server.route({
server.securedRoute({
path: '/api/code/lsp/findReferences',
method: 'POST',
async handler(req, h: hapi.ResponseToolkit) {
Expand Down Expand Up @@ -170,7 +170,7 @@ export function lspRoute(
}

export function symbolByQnameRoute(server: hapi.Server, log: Logger) {
server.route({
server.securedRoute({
path: '/api/code/lsp/symbol/{qname}',
method: 'GET',
async handler(req) {
Expand Down
14 changes: 8 additions & 6 deletions x-pack/plugins/code/server/routes/repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export function repositoryRoute(
});

// Get a git repository
server.route({
server.securedRoute({
path: '/api/code/repo/{uri*3}',
method: 'GET',
async handler(req) {
Expand All @@ -149,7 +149,7 @@ export function repositoryRoute(
},
});

server.route({
server.securedRoute({
path: '/api/code/repo/status/{uri*3}',
method: 'GET',
async handler(req) {
Expand Down Expand Up @@ -192,7 +192,7 @@ export function repositoryRoute(
});

// Get all git repositories
server.route({
server.securedRoute({
path: '/api/code/repos',
method: 'GET',
async handler(req) {
Expand All @@ -212,9 +212,10 @@ export function repositoryRoute(
// Issue a repository index task.
// TODO(mengwei): This is just temporary API stub to trigger the index job. Eventually in the near
// future, this route will be removed. The scheduling strategy is still in discussion.
server.route({
server.securedRoute({
path: '/api/code/repo/index/{uri*3}',
method: 'POST',
requireAdmin: true,
async handler(req) {
const repoUri = req.params.uri as string;
const log = new Logger(req.server);
Expand All @@ -238,9 +239,10 @@ export function repositoryRoute(
});

// Update a repo config
server.route({
server.securedRoute({
path: '/api/code/repo/config/{uri*3}',
method: 'PUT',
requireAdmin: true,
async handler(req, h) {
const config: RepositoryConfig = req.payload as RepositoryConfig;
const repoUri: RepositoryUri = config.uri;
Expand Down Expand Up @@ -269,7 +271,7 @@ export function repositoryRoute(
});

// Get repository config
server.route({
server.securedRoute({
path: '/api/code/repo/config/{uri*3}',
method: 'GET',
async handler(req) {
Expand Down
12 changes: 6 additions & 6 deletions x-pack/plugins/code/server/routes/search.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { DocumentSearchClient, RepositorySearchClient, SymbolSearchClient } from
import { EsClientWithRequest } from '../utils/esclient_with_request';

export function repositorySearchRoute(server: hapi.Server, log: Logger) {
server.route({
server.securedRoute({
path: '/api/code/search/repo',
method: 'GET',
async handler(req) {
Expand Down Expand Up @@ -43,7 +43,7 @@ export function repositorySearchRoute(server: hapi.Server, log: Logger) {
},
});

server.route({
server.securedRoute({
path: '/api/code/suggestions/repo',
method: 'GET',
async handler(req) {
Expand Down Expand Up @@ -75,7 +75,7 @@ export function repositorySearchRoute(server: hapi.Server, log: Logger) {
}

export function documentSearchRoute(server: hapi.Server, log: Logger) {
server.route({
server.securedRoute({
path: '/api/code/search/doc',
method: 'GET',
async handler(req) {
Expand Down Expand Up @@ -107,7 +107,7 @@ export function documentSearchRoute(server: hapi.Server, log: Logger) {
},
});

server.route({
server.securedRoute({
path: '/api/code/suggestions/doc',
method: 'GET',
async handler(req) {
Expand Down Expand Up @@ -166,12 +166,12 @@ export function symbolSearchRoute(server: hapi.Server, log: Logger) {
};

// Currently these 2 are the same.
server.route({
server.securedRoute({
path: '/api/code/suggestions/symbol',
method: 'GET',
handler: symbolSearchHandler,
});
server.route({
server.securedRoute({
path: '/api/code/search/symbol',
method: 'GET',
handler: symbolSearchHandler,
Expand Down
5 changes: 3 additions & 2 deletions x-pack/plugins/code/server/routes/workspace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,17 @@ import { EsClientWithRequest } from '../utils/esclient_with_request';
import { ServerLoggerFactory } from '../utils/server_logger_factory';

export function workspaceRoute(server: hapi.Server, serverOptions: ServerOptions) {
server.route({
server.securedRoute({
path: '/api/code/workspace',
method: 'GET',
async handler() {
return serverOptions.repoConfigs;
},
});

server.route({
server.securedRoute({
path: '/api/code/workspace/{uri*3}/{revision}',
requireAdmin: true,
method: 'POST',
async handler(req: hapi.Request, reply) {
const repoUri = req.params.uri as string;
Expand Down
7 changes: 5 additions & 2 deletions x-pack/plugins/code/server/security.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,12 @@ export class SecureRoute {

private isSecurityEnabledInEs() {
const xpackInfo = this.server.plugins.xpack_main.info;
if (!xpackInfo.isAvailable()) {
throw Boom.serverUnavailable('x-pack info is not available yet.');
}
if (
xpackInfo.isAvailable() &&
(!xpackInfo.feature('security').isEnabled() || xpackInfo.license.isOneOf('basic'))
!xpackInfo.feature('security').isEnabled() ||
!xpackInfo.feature('security').isAvailable()
) {
return false;
}
Expand Down