Skip to content

[SIEM Remove GraphiQL #48135

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

Merged
XavierM merged 2 commits into from
Oct 16, 2019
Merged

[SIEM Remove GraphiQL #48135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a197e9
remove GraphIql in production
XavierM Oct 14, 2019
7d7781f
fix api intergation on CI
XavierM Oct 14, 2019
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
29 changes: 17 additions & 12 deletions x-pack/legacy/plugins/siem/server/lib/framework/kibana_framework_adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/

import { GenericParams } from 'elasticsearch';
import { EnvironmentMode } from 'kibana/public';
import { GraphQLSchema } from 'graphql';
import { Legacy } from 'kibana';

Expand All @@ -28,9 +29,11 @@ interface CallWithRequestParams extends GenericParams {

export class KibanaBackendFrameworkAdapter implements FrameworkAdapter {
public version: string;
public envMode: EnvironmentMode;

constructor(private server: Legacy.Server) {
this.version = server.config().get('pkg.version');
this.envMode = server.newPlatform.env.mode;
}

public async callWithRequest(
Expand Down Expand Up @@ -90,19 +93,21 @@ export class KibanaBackendFrameworkAdapter implements FrameworkAdapter {
plugin: graphqlHapi,
});

this.server.register<HapiGraphiQLPluginOptions>({
options: {
graphiqlOptions: {
endpointURL: routePath,
passHeader: `'kbn-version': '${this.version}'`,
},
path: `${routePath}/graphiql`,
route: {
tags: ['access:siem'],
if (!this.envMode.prod) {
this.server.register<HapiGraphiQLPluginOptions>({
options: {
graphiqlOptions: {
endpointURL: routePath,
passHeader: `'kbn-version': '${this.version}'`,
},
path: `${routePath}/graphiql`,
route: {
tags: ['access:siem'],
},
},
},
plugin: graphiqlHapi,
});
plugin: graphiqlHapi,
});
}
}

public getIndexPatternsService(
Expand Down
18 changes: 16 additions & 2 deletions x-pack/test/api_integration/apis/siem/feature_controls.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const introspectionQuery = gql`
`;

export default function({ getService }: FtrProviderContext) {
const config = getService('config');
const supertest = getService('supertestWithoutAuth');
const security: SecurityService = getService('security');
const spaces: SpacesService = getService('spaces');
Expand Down Expand Up @@ -82,6 +83,11 @@ export default function({ getService }: FtrProviderContext) {
};

describe('feature controls', () => {
let isProd = false;
before(() => {
const kbnConfig = config.get('servers.kibana');
isProd = kbnConfig.hostname === 'localhost' && kbnConfig.port === 5620 ? false : true;
});
it(`APIs can't be accessed by user with no privileges`, async () => {
const username = 'logstash_read';
const roleName = 'logstash_read';
Expand Down Expand Up @@ -130,7 +136,11 @@ export default function({ getService }: FtrProviderContext) {
expectGraphQLResponse(graphQLResult);

const graphQLIResult = await executeGraphIQLRequest(username, password);
expectGraphIQLResponse(graphQLIResult);
if (!isProd) {
expectGraphIQLResponse(graphQLIResult);
} else {
expectGraphIQL404(graphQLIResult);
}
} finally {
await security.role.delete(roleName);
await security.user.delete(username);
Expand Down Expand Up @@ -225,7 +235,11 @@ export default function({ getService }: FtrProviderContext) {
expectGraphQLResponse(graphQLResult);

const graphQLIResult = await executeGraphIQLRequest(username, password, space1Id);
expectGraphIQLResponse(graphQLIResult);
if (!isProd) {
expectGraphIQLResponse(graphQLIResult);
} else {
expectGraphIQL404(graphQLIResult);
}
});

it(`user_1 can't access APIs in space_2`, async () => {
Expand Down