github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(TLS): remove file type validation [EE-3672] (#7280)

pull/7310/head
itsconquest 2022-07-21 16:25:23 +12:00 committed by GitHub
parent 985eef6987
commit b040aa1e78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/portainer/helpers/yup-file-validation.ts
View File

@ -22,22 +22,3 @@ export function withFileSize(fileValidation: FileSchema, maxSize: number) {
return file.size <= maxSize;
}
}
export function withFileType(
fileValidation: FileSchema,
fileTypes: File['type'][]
) {
return fileValidation.test(
'file-type',
'Selected file has unsupported format.',
validateFileType
);
function validateFileType(file?: File) {
if (!file) {
return true;
}
return fileTypes.includes(file.type);
}
}

15
app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/APITab/TLSFieldset.tsx
View File

@ -1,10 +1,6 @@
import { useFormikContext } from 'formik';
import {
file,
withFileSize,
withFileType,
} from '@/portainer/helpers/yup-file-validation';
import { file, withFileSize } from '@/portainer/helpers/yup-file-validation';
import { FileUploadField } from '@@/form-components/FileUpload';
import { SwitchField } from '@@/form-components/SwitchField';
@ -83,16 +79,9 @@ export function TLSFieldset() {
}
const MAX_FILE_SIZE = 5_242_880; // 5MB
const ALLOWED_FILE_TYPES = [
'application/x-x509-ca-cert',
'application/x-pem-file',
];
function certValidation() {
return withFileType(
withFileSize(file(), MAX_FILE_SIZE),
ALLOWED_FILE_TYPES
).when(['tls', 'skipVerify'], {
return withFileSize(file(), MAX_FILE_SIZE).when(['tls', 'skipVerify'], {
is: (tls: boolean, skipVerify: boolean) => tls && !skipVerify,
then: (schema) => schema.required('File is required'),
});