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

[8.16] [SecuritySolution] Update file validation because the file type is empty on windows (#199791) #200188

Merged
merged 3 commits into from
Nov 19, 2024
Merged

[8.16] [SecuritySolution] Update file validation because the file type is empty on windows (#199791) #200188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f89288
[SecuritySolution] Update file validation because the file type is em…
machadoum Nov 14, 2024
b31bcf9
Merge branch '8.16' into backport/8.16/pr-199791
machadoum Nov 19, 2024
547ad6f
Merge branch '8.16' into backport/8.16/pr-199791
machadoum Nov 19, 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
8 changes: 7 additions & 1 deletion ..._solution/public/entity_analytics/components/asset_criticality_file_uploader/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,11 @@
* 2.0.
*/

export const SUPPORTED_FILE_TYPES = ['text/csv', 'text/plain', 'text/tab-separated-values'];
export const SUPPORTED_FILE_TYPES = [
'text/csv',
'text/plain',
'text/tab-separated-values',
'.tsv', // Useful for Windows when it can't recognise the file extension.
'.csv', // Useful for Windows when it can't recognise the file extension.
];
export const SUPPORTED_FILE_EXTENSIONS = ['CSV', 'TXT', 'TSV'];
3 changes: 2 additions & 1 deletion ...solution/public/entity_analytics/components/asset_criticality_file_uploader/hooks.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,13 @@ describe('useFileValidation', () => {
test('should call onError when an error occurs', () => {
const onErrorMock = jest.fn();
const onCompleteMock = jest.fn();
const invalidFileType = 'invalid file type';

const { result } = renderHook(
() => useFileValidation({ onError: onErrorMock, onComplete: onCompleteMock }),
{ wrapper: TestProviders }
);
result.current(new File([invalidLine], 'test.csv'));
result.current(new File([invalidLine], 'test.csv', { type: invalidFileType }));

expect(onErrorMock).toHaveBeenCalled();
expect(onCompleteMock).not.toHaveBeenCalled();
Expand Down
8 changes: 8 additions & 0 deletions ...on/public/entity_analytics/components/asset_criticality_file_uploader/validations.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,14 @@ describe('validateFile', () => {
expect(result.valid).toBe(true);
});

it('should return valid if the mime type is empty (Windows)', () => {
const file = new File(['file content'], 'test.csv', { type: '' });

const result = validateFile(file, formatBytes);

expect(result.valid).toBe(true);
});

it('should return an error message if the file type is invalid', () => {
const file = new File(['file content'], 'test.txt', { type: 'invalid-type' });

Expand Down
5 changes: 4 additions & 1 deletion ...olution/public/entity_analytics/components/asset_criticality_file_uploader/validations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ export const validateFile = (
file: File,
formatBytes: (bytes: number) => string
): { valid: false; errorMessage: string; code: string } | { valid: true } => {
if (!SUPPORTED_FILE_TYPES.includes(file.type)) {
if (
file.type !== '' && // file.type might be an empty string on windows
!SUPPORTED_FILE_TYPES.includes(file.type)
) {
return {
valid: false,
code: 'unsupported_file_type',
Expand Down