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

Merge pull request #944 from rcordovano/recent_activity_reg_ripper_fix

Browse Source 
Make sure the correct reg ripper copy is run by the recent activity modu...
This commit is contained in:
Richard Cordovano 2014-11-07 17:45:18 -05:00
commit 820bf66a8d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,7 +297,7 @@ class ExtractRegistry extends Extract {
regOutputFiles.autopsyPlugins = outFilePathBase + "-autopsy.txt"; //NON-NLS regOutputFiles.autopsyPlugins = outFilePathBase + "-autopsy.txt"; //NON-NLS
String errFilePath = outFilePathBase + "-autopsy.err.txt"; //NON-NLS String errFilePath = outFilePathBase + "-autopsy.err.txt"; //NON-NLS
logger.log(Level.INFO, "Writing RegRipper results to: {0}", regOutputFiles.autopsyPlugins); //NON-NLS logger.log(Level.INFO, "Writing RegRipper results to: {0}", regOutputFiles.autopsyPlugins); //NON-NLS
executeRegRipper(regFilePath, autopsyType, regOutputFiles.autopsyPlugins, errFilePath); executeRegRipper(RR_PATH, regFilePath, autopsyType, regOutputFiles.autopsyPlugins, errFilePath);
} }
if (context.dataSourceIngestIsCancelled()) { if (context.dataSourceIngestIsCancelled()) {
return regOutputFiles; return regOutputFiles;
@ -308,16 +308,16 @@ class ExtractRegistry extends Extract {
regOutputFiles.fullPlugins = outFilePathBase + "-full.txt"; //NON-NLS regOutputFiles.fullPlugins = outFilePathBase + "-full.txt"; //NON-NLS
String errFilePath = outFilePathBase + "-full.err.txt"; //NON-NLS String errFilePath = outFilePathBase + "-full.err.txt"; //NON-NLS
logger.log(Level.INFO, "Writing Full RegRipper results to: {0}", regOutputFiles.fullPlugins); //NON-NLS logger.log(Level.INFO, "Writing Full RegRipper results to: {0}", regOutputFiles.fullPlugins); //NON-NLS
executeRegRipper(regFilePath, fullType, regOutputFiles.fullPlugins, errFilePath); executeRegRipper(RR_FULL_PATH, regFilePath, fullType, regOutputFiles.fullPlugins, errFilePath);
} }
return regOutputFiles; return regOutputFiles;
} }
private void executeRegRipper(String hiveFilePath, String hiveFileType, String outputFile, String errFile) { private void executeRegRipper(String regRipperPath, String hiveFilePath, String hiveFileType, String outputFile, String errFile) {
try { try {
logger.log(Level.INFO, "Writing RegRipper results to: {0}", outputFile); //NON-NLS logger.log(Level.INFO, "Writing RegRipper results to: {0}", outputFile); //NON-NLS
List<String> commandLine = new ArrayList<>(); List<String> commandLine = new ArrayList<>();
commandLine.add(RR_PATH); commandLine.add(regRipperPath);
commandLine.add("-r"); //NON-NLS commandLine.add("-r"); //NON-NLS
commandLine.add(hiveFilePath); commandLine.add(hiveFilePath);
commandLine.add("-f"); //NON-NLS commandLine.add("-f"); //NON-NLS