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

4961 fix casting bug and add min size for registry files

Browse Source
This commit is contained in:
William Schaefer 2019-05-10 14:56:02 -04:00
parent 1fcc0e7a78
commit a8990e0870
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Core/src/org/sleuthkit/autopsy/contentviewers/FileTypeViewer.java
View File

@ -53,5 +53,12 @@ interface FileTypeViewer {
*/ */
void resetComponent(); void resetComponent();
/**
* Identify whether the viewer is supported for the given file
*
* @param file to check support for of the appropriate MIME type
*
* @return true if supported false otherwise
*/
boolean isSupported(AbstractFile file); boolean isSupported(AbstractFile file);
} }

7
Core/src/org/sleuthkit/autopsy/contentviewers/WindowsRegistryViewer.java
View File

@ -43,6 +43,7 @@ class WindowsRegistryViewer extends JPanel implements FileTypeViewer {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Logger logger = Logger.getLogger(WindowsRegistryViewer.class.getName()); private static final Logger logger = Logger.getLogger(WindowsRegistryViewer.class.getName());
private static final String[] SUPPORTED_MIMETYPES = new String[]{"custom/windows-nt-registry"}; private static final String[] SUPPORTED_MIMETYPES = new String[]{"custom/windows-nt-registry"};
private static final int MIN_REGISTRY_FILE_SIZE = 1025; //size in bytes
private RejView regview; private RejView regview;
private AbstractFile lastFile; private AbstractFile lastFile;
@ -58,7 +59,7 @@ class WindowsRegistryViewer extends JPanel implements FileTypeViewer {
this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
if (content.getSize() == 0) { if (content.getSize() < MIN_REGISTRY_FILE_SIZE) {
return; return;
} }
@ -98,7 +99,7 @@ class WindowsRegistryViewer extends JPanel implements FileTypeViewer {
if (file == null) { if (file == null) {
return false; return false;
} }
if (file.getSize() == 0) { if (file.getSize() < MIN_REGISTRY_FILE_SIZE) {
return false; return false;
} }
byte[] header = new byte[0x4000]; byte[] header = new byte[0x4000];
@ -134,8 +135,6 @@ class WindowsRegistryViewer extends JPanel implements FileTypeViewer {
return; //prevent from loading twice if setNode() called mult. times return; //prevent from loading twice if setNode() called mult. times
} }
lastFile = file; lastFile = file;
if (isSupported(file)) {
this.setDataView(file); this.setDataView(file);
} }
} }
}

2
Core/src/org/sleuthkit/autopsy/rejview/RejTreeView.java
View File

@ -89,7 +89,7 @@ final class RejTreeView extends JScrollPane implements TreeExpansionListener, Tr
TreePath path = event.getPath(); TreePath path = event.getPath();
DefaultMutableTreeNode node = (DefaultMutableTreeNode) path.getLastPathComponent(); DefaultMutableTreeNode node = (DefaultMutableTreeNode) path.getLastPathComponent();
if (node.getChildCount() == 0) { if (node instanceof RejTreeNode && node.getChildCount() == 0) {
RejTreeNode n = (RejTreeNode) node.getUserObject(); RejTreeNode n = (RejTreeNode) node.getUserObject();
for (RejTreeNode rejTreeNode : n.getChildren()) { for (RejTreeNode rejTreeNode : n.getChildren()) {
node.add(getTreeNode(rejTreeNode)); node.add(getTreeNode(rejTreeNode));