-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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
Omit runtime fields from FLS suggestions #78330
Changes from 3 commits
946c169
026eea6
5d82c6f
2f7c6dd
71c28d2
c99fd72
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,20 @@ import { schema } from '@kbn/config-schema'; | |
import { RouteDefinitionParams } from '../index'; | ||
import { wrapIntoCustomErrorResponse } from '../../errors'; | ||
|
||
interface FieldMappingResponse { | ||
[indexName: string]: { | ||
mappings: { | ||
[fieldName: string]: { | ||
mapping: { | ||
[fieldName: string]: { | ||
type: string; | ||
}; | ||
}; | ||
}; | ||
}; | ||
}; | ||
} | ||
|
||
export function defineGetFieldsRoutes({ router, clusterClient }: RouteDefinitionParams) { | ||
router.get( | ||
{ | ||
|
@@ -23,21 +37,41 @@ export function defineGetFieldsRoutes({ router, clusterClient }: RouteDefinition | |
fields: '*', | ||
allowNoIndices: false, | ||
includeDefaults: true, | ||
})) as Record<string, { mappings: Record<string, unknown> }>; | ||
})) as FieldMappingResponse; | ||
|
||
// The flow is the following (see response format at https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-get-field-mapping.html): | ||
// 1. Iterate over all matched indices. | ||
// 2. Extract all the field names from the `mappings` field of the particular index. | ||
// 3. Collect and flatten the list of the field names. | ||
// 3. Collect and flatten the list of the field names, omitting any fields without mappings, and any runtime fields | ||
// 4. Use `Set` to get only unique field names. | ||
const fields = Array.from( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. question: how do you feel about adding a simple jest test to test this logic? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good idea, will do! |
||
new Set( | ||
Object.values(indexMappings) | ||
.map((indexMapping) => { | ||
return Object.entries(indexMapping.mappings).map(([fieldName, properties]) => { | ||
const mappingValues = Object.values(properties.mapping); | ||
const hasMapping = mappingValues.length > 0; | ||
|
||
const isRuntimeField = hasMapping && mappingValues[0]?.type === 'runtime'; | ||
|
||
// fields without mappings are internal fields such as `_routing` and `_index`, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 |
||
// and therefore don't make sense as autocomplete suggestions for FLS. | ||
|
||
// Runtime fields are not securable via FLS. | ||
// Administrators should instead secure access to the fields which derive this information. | ||
if (!hasMapping || isRuntimeField) { | ||
return null; | ||
} | ||
|
||
return fieldName; | ||
}); | ||
}) | ||
.flat() | ||
) | ||
).filter((field) => field !== null) as string[]; | ||
legrego marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
return response.ok({ | ||
body: Array.from( | ||
new Set( | ||
Object.values(indexMappings) | ||
.map((indexMapping) => Object.keys(indexMapping.mappings)) | ||
.flat() | ||
) | ||
), | ||
body: fields, | ||
}); | ||
} catch (error) { | ||
return response.customError(wrapIntoCustomErrorResponse(error)); | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Improved type safety, at least until we can migrate away from the legacy ES client.