Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import java.text.MessageFormat;

import jakarta.inject.Named;
import org.apache.commons.io.FilenameUtils;
import org.apache.tika.Tika;
import org.cloudfoundry.multiapps.common.SLException;
import org.cloudfoundry.multiapps.controller.core.Messages;
Expand All @@ -21,8 +20,6 @@ public class FileMimeTypeValidator {
private static final String APPLICATION_ZIP_MIME_TYPE = "application/zip";
private static final String APPLICATION_OCTET_STREAM_MIME_TYPE = "application/octet-stream";
private static final String TEXT_PLAIN_MIME_TYPE = "text/plain";
private static final String YAML_FILE_EXTENSION = "yaml";
private static final String EXTENSION_DESCRIPTOR_FILE_EXTENSION = "mtaext";
private static final Tika tika = new Tika();

public void validateMultipartFileMimeType(MultipartFile multipartFile) {
Expand Down Expand Up @@ -52,20 +49,11 @@ private String getFileMimeType(InputStream uploadedFileInputStream) throws IOExc
}

private void validateYamlFile(InputStream uploadedFileInputStream, String filename) {
validateTextFileExtension(filename);
Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()));
try {
yaml.load(uploadedFileInputStream);
} catch (YAMLException e) {
throw new IllegalArgumentException(MessageFormat.format(Messages.THE_PROVIDED_0_FILE_IS_INVALID, filename), e);
}
}

private void validateTextFileExtension(String filename) {
String fileExtension = FilenameUtils.getExtension(filename);

if (!(YAML_FILE_EXTENSION.equals(fileExtension) || EXTENSION_DESCRIPTOR_FILE_EXTENSION.equals(fileExtension))) {
throw new IllegalArgumentException(MessageFormat.format(Messages.THE_PROVIDED_0_FILE_IS_INVALID, filename));
}
}
}
Loading