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

Update ExtractRegistry.java

Browse Source 
Address comments for RegFile and check for empty artifacts
This commit is contained in:
Mark McKinnon 2020-02-18 12:44:21 -05:00
parent 5f822c767b
commit d7e7dfe511
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
View File

@ -1171,21 +1171,21 @@ class ExtractRegistry extends Extract {
line = line.trim(); line = line.trim();
if (line.matches("^adoberdr v.*")) { if (line.matches("^adoberdr v.*")) {
parseAdobeMRUList(regFileName, regFile, reader); parseAdobeMRUList(regFile, reader);
} else if (line.matches("^mpmru v.*")) { } else if (line.matches("^mpmru v.*")) {
parseMediaPlayerMRUList(regFileName, regFile, reader); parseMediaPlayerMRUList(regFile, reader);
} else if (line.matches("^trustrecords v.*")) { } else if (line.matches("^trustrecords v.*")) {
parseTrustrecordsMRUList(regFileName, regFile, reader); parseTrustrecordsMRUList(regFile, reader);
} else if (line.matches("^ArcHistory:")) { } else if (line.matches("^ArcHistory:")) {
parseArchHistoryMRUList(regFileName, regFile, reader); parseArchHistoryMRUList(regFile, reader);
} else if (line.matches("^applets v.*")) { } else if (line.matches("^applets v.*")) {
parseGenericMRUList(regFileName, regFile, reader); parseGenericMRUList(regFile, reader);
} else if (line.matches("^mmc v.*")) { } else if (line.matches("^mmc v.*")) {
parseGenericMRUList(regFileName, regFile, reader); parseGenericMRUList(regFile, reader);
} else if (line.matches("^winrar v.*")) { } else if (line.matches("^winrar v.*")) {
parseWinRARMRUList(regFileName, regFile, reader); parseWinRARMRUList(regFile, reader);
} else if (line.matches("^officedocs2010 v.*")) { } else if (line.matches("^officedocs2010 v.*")) {
parseOfficeDocs2010MRUList(regFileName, regFile, reader); parseOfficeDocs2010MRUList(regFile, reader);
} }
line = reader.readLine(); line = reader.readLine();
} }
@ -1203,7 +1203,7 @@ class ExtractRegistry extends Extract {
* *
* @throws FileNotFound and IOException * @throws FileNotFound and IOException
*/ */
private void parseAdobeMRUList(String regFileName, AbstractFile regFile, BufferedReader reader) throws FileNotFoundException, IOException { private void parseAdobeMRUList(AbstractFile regFile, BufferedReader reader) throws FileNotFoundException, IOException {
List<BlackboardArtifact> bbartifacts = new ArrayList<>(); List<BlackboardArtifact> bbartifacts = new ArrayList<>();
String line = reader.readLine(); String line = reader.readLine();
SimpleDateFormat adobePluginDateFormat = new SimpleDateFormat("yyyyMMddHHmmssZ", US); SimpleDateFormat adobePluginDateFormat = new SimpleDateFormat("yyyyMMddHHmmssZ", US);
@ -1250,7 +1250,7 @@ class ExtractRegistry extends Extract {
line = line.trim(); line = line.trim();
} }
} }
if (bbartifacts.isEmpty()) { if (!bbartifacts.isEmpty()) {
postArtifacts(bbartifacts); postArtifacts(bbartifacts);
} }
} }
@ -1266,7 +1266,7 @@ class ExtractRegistry extends Extract {
* *
* @throws FileNotFound and IOException * @throws FileNotFound and IOException
*/ */
private void parseMediaPlayerMRUList(String regFileName, AbstractFile regFile, BufferedReader reader) throws FileNotFoundException, IOException { private void parseMediaPlayerMRUList(AbstractFile regFile, BufferedReader reader) throws FileNotFoundException, IOException {
List<BlackboardArtifact> bbartifacts = new ArrayList<>(); List<BlackboardArtifact> bbartifacts = new ArrayList<>();
String line = reader.readLine(); String line = reader.readLine();
while (!line.contains(SECTION_DIVIDER)) { while (!line.contains(SECTION_DIVIDER)) {
@ -1307,7 +1307,7 @@ class ExtractRegistry extends Extract {
* *
* @throws FileNotFound and IOException * @throws FileNotFound and IOException
*/ */
private void parseGenericMRUList(String regFileName, AbstractFile regFile, BufferedReader reader) throws FileNotFoundException, IOException { private void parseGenericMRUList(AbstractFile regFile, BufferedReader reader) throws FileNotFoundException, IOException {
List<BlackboardArtifact> bbartifacts = new ArrayList<>(); List<BlackboardArtifact> bbartifacts = new ArrayList<>();
String line = reader.readLine(); String line = reader.readLine();
while (!line.contains(SECTION_DIVIDER)) { while (!line.contains(SECTION_DIVIDER)) {
@ -1348,7 +1348,7 @@ class ExtractRegistry extends Extract {
* *
* @throws FileNotFound and IOException * @throws FileNotFound and IOException
*/ */
private void parseWinRARMRUList(String regFileName, AbstractFile regFile, BufferedReader reader) throws FileNotFoundException, IOException { private void parseWinRARMRUList(AbstractFile regFile, BufferedReader reader) throws FileNotFoundException, IOException {
List<BlackboardArtifact> bbartifacts = new ArrayList<>(); List<BlackboardArtifact> bbartifacts = new ArrayList<>();
String line = reader.readLine(); String line = reader.readLine();
while (!line.contains(SECTION_DIVIDER)) { while (!line.contains(SECTION_DIVIDER)) {
@ -1391,7 +1391,7 @@ class ExtractRegistry extends Extract {
* *
* @throws FileNotFound and IOException * @throws FileNotFound and IOException
*/ */
private void parseArchHistoryMRUList(String regFileName, AbstractFile regFile, BufferedReader reader) throws FileNotFoundException, IOException { private void parseArchHistoryMRUList(AbstractFile regFile, BufferedReader reader) throws FileNotFoundException, IOException {
List<BlackboardArtifact> bbartifacts = new ArrayList<>(); List<BlackboardArtifact> bbartifacts = new ArrayList<>();
String line = reader.readLine(); String line = reader.readLine();
line = line.trim(); line = line.trim();
@ -1426,7 +1426,7 @@ class ExtractRegistry extends Extract {
* *
* @throws FileNotFound and IOException * @throws FileNotFound and IOException
*/ */
private void parseOfficeDocs2010MRUList(String regFileName, AbstractFile regFile, BufferedReader reader) throws FileNotFoundException, IOException { private void parseOfficeDocs2010MRUList(AbstractFile regFile, BufferedReader reader) throws FileNotFoundException, IOException {
List<BlackboardArtifact> bbartifacts = new ArrayList<>(); List<BlackboardArtifact> bbartifacts = new ArrayList<>();
String line = reader.readLine(); String line = reader.readLine();
line = line.trim(); line = line.trim();
@ -1469,7 +1469,7 @@ class ExtractRegistry extends Extract {
* *
* @throws FileNotFound and IOException * @throws FileNotFound and IOException
*/ */
private void parseTrustrecordsMRUList(String regFileName, AbstractFile regFile, BufferedReader reader) throws FileNotFoundException, IOException { private void parseTrustrecordsMRUList(AbstractFile regFile, BufferedReader reader) throws FileNotFoundException, IOException {
String userProfile = regFile.getParentPath(); String userProfile = regFile.getParentPath();
userProfile = userProfile.substring(0, userProfile.length() - 2); userProfile = userProfile.substring(0, userProfile.length() - 2);
List<BlackboardArtifact> bbartifacts = new ArrayList<>(); List<BlackboardArtifact> bbartifacts = new ArrayList<>();