mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-15 01:07:42 +00:00
Merge branch 'develop' of github.com:sleuthkit/autopsy into develop
This commit is contained in:
Brian Carrier
commit
8ddffa8ba3
@ -30,9 +30,7 @@ import javax.swing.JOptionPane;
|
||||
|
||||
import org.openide.util.NbBundle;
|
||||
import org.openide.util.Utilities;
|
||||
import org.openide.util.Lookup;
|
||||
import org.openide.util.actions.Presenter;
|
||||
import org.sleuthkit.autopsy.ingest.IngestJobConfigurator;
|
||||
import org.sleuthkit.autopsy.coreutils.Logger;
|
||||
import org.sleuthkit.datamodel.AbstractFile;
|
||||
import org.sleuthkit.datamodel.TskCoreException;
|
||||
@ -43,17 +41,18 @@ import org.sleuthkit.autopsy.ingest.IngestManager;
|
||||
* Instances of this Action allow users to content to a hash database.
|
||||
*/
|
||||
final class AddContentToHashDbAction extends AbstractAction implements Presenter.Popup {
|
||||
|
||||
private static AddContentToHashDbAction instance;
|
||||
private final static String SINGLE_SELECTION_NAME = NbBundle.getMessage(AddContentToHashDbAction.class,
|
||||
"AddContentToHashDbAction.singleSelectionName");
|
||||
"AddContentToHashDbAction.singleSelectionName");
|
||||
private final static String MULTIPLE_SELECTION_NAME = NbBundle.getMessage(AddContentToHashDbAction.class,
|
||||
"AddContentToHashDbAction.multipleSelectionName");
|
||||
"AddContentToHashDbAction.multipleSelectionName");
|
||||
|
||||
/**
|
||||
* AddContentToHashDbAction is a singleton to support multi-selection of nodes, since
|
||||
* org.openide.nodes.NodeOp.findActions(Node[] nodes) will only pick up an Action from a node
|
||||
* if every node in the nodes array returns a reference to the same action object from
|
||||
* Node.getActions(boolean).
|
||||
* AddContentToHashDbAction is a singleton to support multi-selection of
|
||||
* nodes, since org.openide.nodes.NodeOp.findActions(Node[] nodes) will only
|
||||
* pick up an Action from a node if every node in the nodes array returns a
|
||||
* reference to the same action object from Node.getActions(boolean).
|
||||
*/
|
||||
public static synchronized AddContentToHashDbAction getInstance() {
|
||||
if (null == instance) {
|
||||
@ -92,8 +91,7 @@ final class AddContentToHashDbAction extends AbstractAction implements Presenter
|
||||
if (selectedFiles.isEmpty()) {
|
||||
setEnabled(false);
|
||||
return;
|
||||
}
|
||||
else if (selectedFiles.size() > 1) {
|
||||
} else if (selectedFiles.size() > 1) {
|
||||
setText(MULTIPLE_SELECTION_NAME);
|
||||
}
|
||||
|
||||
@ -119,11 +117,10 @@ final class AddContentToHashDbAction extends AbstractAction implements Presenter
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
JMenuItem empty = new JMenuItem(
|
||||
NbBundle.getMessage(this.getClass(),
|
||||
"AddContentToHashDbAction.ContentMenu.noHashDbsConfigd"));
|
||||
"AddContentToHashDbAction.ContentMenu.noHashDbsConfigd"));
|
||||
empty.setEnabled(false);
|
||||
add(empty);
|
||||
}
|
||||
@ -133,7 +130,7 @@ final class AddContentToHashDbAction extends AbstractAction implements Presenter
|
||||
// the new database.
|
||||
addSeparator();
|
||||
JMenuItem newHashSetItem = new JMenuItem(NbBundle.getMessage(this.getClass(),
|
||||
"AddContentToHashDbAction.ContentMenu.createDbItem"));
|
||||
"AddContentToHashDbAction.ContentMenu.createDbItem"));
|
||||
newHashSetItem.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
@ -151,33 +148,43 @@ final class AddContentToHashDbAction extends AbstractAction implements Presenter
|
||||
for (AbstractFile file : files) {
|
||||
String md5Hash = file.getMd5Hash();
|
||||
if (null != md5Hash) {
|
||||
// don't let them add the hash for an empty file to the DB
|
||||
if (md5Hash.toLowerCase().equals("d41d8cd98f00b204e9800998ecf8427e")) {
|
||||
Logger.getLogger(AddContentToHashDbAction.class.getName()).log(Level.INFO, "Not adding " + file.getName() + " to database (empty content)");
|
||||
JOptionPane.showMessageDialog(null,
|
||||
NbBundle.getMessage(this.getClass(),
|
||||
"AddContentToHashDbAction.addFilesToHashSet.unableToAddFileEmptyMsg",
|
||||
file.getName()),
|
||||
NbBundle.getMessage(this.getClass(),
|
||||
"AddContentToHashDbAction.addFilesToHashSet.addToHashDbErr"),
|
||||
JOptionPane.ERROR_MESSAGE);
|
||||
continue;
|
||||
}
|
||||
try {
|
||||
hashSet.addHashes(file);
|
||||
}
|
||||
catch (TskCoreException ex) {
|
||||
} catch (TskCoreException ex) {
|
||||
//noinspection HardCodedStringLiteral
|
||||
Logger.getLogger(AddContentToHashDbAction.class.getName()).log(Level.SEVERE, "Error adding to hash database", ex);
|
||||
JOptionPane.showMessageDialog(null,
|
||||
NbBundle.getMessage(this.getClass(),
|
||||
"AddContentToHashDbAction.addFilesToHashSet.unableToAddFileMsg",
|
||||
file.getName()),
|
||||
NbBundle.getMessage(this.getClass(),
|
||||
"AddContentToHashDbAction.addFilesToHashSet.addToHashDbErr"),
|
||||
JOptionPane.ERROR_MESSAGE);
|
||||
NbBundle.getMessage(this.getClass(),
|
||||
"AddContentToHashDbAction.addFilesToHashSet.unableToAddFileMsg",
|
||||
file.getName()),
|
||||
NbBundle.getMessage(this.getClass(),
|
||||
"AddContentToHashDbAction.addFilesToHashSet.addToHashDbErr"),
|
||||
JOptionPane.ERROR_MESSAGE);
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
JOptionPane.showMessageDialog(null,
|
||||
NbBundle.getMessage(this.getClass(),
|
||||
"AddContentToHashDbAction.addFilesToHashSet.unableToAddFileSzMsg",
|
||||
files.size() > 1 ? NbBundle
|
||||
.getMessage(this.getClass(),
|
||||
"AddContentToHashDbAction.addFilesToHashSet.files") : NbBundle
|
||||
.getMessage(this.getClass(),
|
||||
"AddContentToHashDbAction.addFilesToHashSet.file")),
|
||||
NbBundle.getMessage(this.getClass(),
|
||||
"AddContentToHashDbAction.addFilesToHashSet.addToHashDbErr"),
|
||||
JOptionPane.ERROR_MESSAGE);
|
||||
NbBundle.getMessage(this.getClass(),
|
||||
"AddContentToHashDbAction.addFilesToHashSet.unableToAddFileSzMsg",
|
||||
files.size() > 1 ? NbBundle
|
||||
.getMessage(this.getClass(),
|
||||
"AddContentToHashDbAction.addFilesToHashSet.files") : NbBundle
|
||||
.getMessage(this.getClass(),
|
||||
"AddContentToHashDbAction.addFilesToHashSet.file")),
|
||||
NbBundle.getMessage(this.getClass(),
|
||||
"AddContentToHashDbAction.addFilesToHashSet.addToHashDbErr"),
|
||||
JOptionPane.ERROR_MESSAGE);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -47,6 +47,7 @@ AddContentToHashDbAction.ContentMenu.noHashDbsConfigd=No hash databases configur
|
||||
AddContentToHashDbAction.ContentMenu.createDbItem=Create database...
|
||||
AddContentToHashDbAction.addFilesToHashSet.addToHashDbErr=Add to Hash Database Error
|
||||
AddContentToHashDbAction.addFilesToHashSet.unableToAddFileMsg=Unable to add {0} to the hash database.
|
||||
AddContentToHashDbAction.addFilesToHashSet.unableToAddFileEmptyMsg=Unable to add {0} to the hash database. File has no content.
|
||||
AddContentToHashDbAction.addFilesToHashSet.unableToAddFileSzMsg=Unable to add the {0} to the hash database. Hashes have not been calculated. Please configure and run an appropriate ingest module.
|
||||
HashDatabaseOptionsPanelController.moduleErr=Module Error
|
||||
HashDatabaseOptionsPanelController.moduleErrMsg=A module caused an error listening to HashDatabaseOptionsPanelController updates. See log to determine which module. Some data could be incomplete.
|
||||
|
||||
@ -39,6 +39,7 @@ AddContentToHashDbAction.ContentMenu.noHashDbsConfigd=\u30cf\u30c3\u30b7\u30e5\u
|
||||
AddContentToHashDbAction.ContentMenu.createDbItem=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u4f5c\u6210...
|
||||
AddContentToHashDbAction.addFilesToHashSet.addToHashDbErr=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30a8\u30e9\u30fc\u306b\u8ffd\u52a0
|
||||
AddContentToHashDbAction.addFilesToHashSet.unableToAddFileMsg=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b {0} \u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
|
||||
AddContentToHashDbAction.addFilesToHashSet.unableToAddFileEmptyMsg=Unable to add {0} to the hash database. File has no content.
|
||||
AddContentToHashDbAction.addFilesToHashSet.unableToAddFileSzMsg=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b {0} \u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30cf\u30c3\u30b7\u30e5\u5024\u304c\u8a08\u7b97\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u9069\u5207\u306a\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u8a2d\u5b9a\u3057\u3001\u5b9f\u884c\u3057\u3066\u4e0b\u3055\u3044\u3002
|
||||
HashDatabaseOptionsPanelController.moduleErr=\u30e2\u30b8\u30e5\u30fc\u30eb\u30a8\u30e9\u30fc
|
||||
HashDatabaseOptionsPanelController.moduleErrMsg=HashDatabaseOptionsPanelController\u306e\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u3092\u78ba\u8a8d\u4e2d\u306b\u30e2\u30b8\u30e5\u30fc\u30eb\u304c\u30a8\u30e9\u30fc\u3092\u8d77\u3053\u3057\u307e\u3057\u305f\u3002\u3069\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u304b\u30ed\u30b0\u3067\u78ba\u8a8d\u3057\u3066\u4e0b\u3055\u3044\u3002\u4e00\u90e8\u306e\u30c7\u30fc\u30bf\u304c\u5b8c\u5168\u3067\u306a\u3044\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002
|
||||
|
||||
@ -131,6 +131,15 @@ public class HashDbIngestModule implements FileIngestModule {
|
||||
return ProcessResult.OK;
|
||||
}
|
||||
|
||||
/* Skip directories. One reason for this is because we won't accurately
|
||||
* calculate hashes of NTFS directories that have content that spans the
|
||||
* IDX_ROOT and IDX_ALLOC artifacts. So we disable that until a solution for
|
||||
* it is developed.
|
||||
*/
|
||||
if (file.isDir()) {
|
||||
return ProcessResult.OK;
|
||||
}
|
||||
|
||||
// bail out if we have no hashes set
|
||||
if ((knownHashSets.isEmpty()) && (knownBadHashSets.isEmpty()) && (!settings.shouldCalculateHashes())) {
|
||||
return ProcessResult.OK;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user