mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-06 21:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

other defensive code for imageio spi changes

Browse Source
This commit is contained in:
Greg DiCristofaro 2020-04-27 12:10:41 -04:00
parent f6be370a84
commit e25eb33277
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/org/sleuthkit/autopsy/coreutils/FileTypeUtils.java
View File

@ -38,6 +38,8 @@ public final class FileTypeUtils {
.addAll(removeAll(
asList(
// remove any empty mime types provided by ImageIO.getReaderMIMETypes()
// This prevents mime types added by SPI implementations from causing errors
// (i.e. 'jai-imageio' utilized with IcePDF)
Arrays.stream(ImageIO.getReaderMIMETypes())
.filter((mimeType) -> StringUtils.isNotBlank(mimeType))
.toArray(String[]::new)),

20
Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java
View File

@ -46,6 +46,8 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.logging.Level;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javafx.concurrent.Task;
import javafx.embed.swing.SwingFXUtils;
import javax.annotation.Nonnull;
@ -137,11 +139,25 @@ public class ImageUtils {
}
FFMPEG_LOADED = tempFfmpegLoaded;
SUPPORTED_IMAGE_EXTENSIONS.addAll(Arrays.asList(ImageIO.getReaderFileSuffixes()));
// remove any empty extension types provided by ImageIO.getReaderFileSuffixes()
// This prevents extensions added by SPI implementations from causing errors
// (i.e. 'jai-imageio' utilized with IcePDF)
List<String> imageSuffixList = Arrays.stream(ImageIO.getReaderFileSuffixes())
.filter((extension) -> StringUtils.isNotBlank(extension))
.collect(Collectors.toList());
SUPPORTED_IMAGE_EXTENSIONS.addAll(imageSuffixList);
SUPPORTED_IMAGE_EXTENSIONS.add("tec"); // Add JFIF .tec files
SUPPORTED_IMAGE_EXTENSIONS.removeIf("db"::equals); // remove db files
SUPPORTED_IMAGE_MIME_TYPES = new TreeSet<>(Arrays.asList(ImageIO.getReaderMIMETypes()));
List<String> mimeTypeList = Stream.of(ImageIO.getReaderMIMETypes())
// remove any empty mime types provided by ImageIO.getReaderMIMETypes()
// This prevents mime types added by SPI implementations from causing errors
// (i.e. 'jai-imageio' utilized with IcePDF)
.filter((mimeType) -> StringUtils.isNotBlank(mimeType))
.collect(Collectors.toList());
SUPPORTED_IMAGE_MIME_TYPES = new TreeSet<>(mimeTypeList);
/*
* special cases and variants that we support, but don't get registered
* with ImageIO automatically

10
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/FileTypeUtils.java
View File

@ -94,6 +94,10 @@ public enum FileTypeUtils {
ImageIO.scanForPlugins();
//add all extension ImageIO claims to support
imageExtensions.addAll(Stream.of(ImageIO.getReaderFileSuffixes())
// remove any empty extension types provided by ImageIO.getReaderFileSuffixes()
// This prevents extensions added by SPI implementations from causing errors
// (i.e. 'jai-imageio' utilized with IcePDF)
.filter((extension) -> StringUtils.isNotBlank(extension))
.map(String::toLowerCase)
.collect(Collectors.toList()));
//add list of known image extensions
@ -144,8 +148,12 @@ public enum FileTypeUtils {
* are not images) to show up in Image Gallery.
* supportedMimeTypes.addAll(Arrays.asList("application/x-emf"));
*/
//add list of mimetypes ImageIO claims to support
//add list of mimetypes ImageIO claims to support
supportedMimeTypes.addAll(Stream.of(ImageIO.getReaderMIMETypes())
// remove any empty mime types provided by ImageIO.getReaderMIMETypes()
// This prevents mime types added by SPI implementations from causing errors
// (i.e. 'jai-imageio' utilized with IcePDF)
.filter((mimeType) -> StringUtils.isNotBlank(mimeType))
.map(String::toLowerCase)
.collect(Collectors.toList()));