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

Merge pull request #3553 from markmckinnon/url_viewer

Browse Source 
Allow http reports to be viewed when clicked
This commit is contained in:
Brian Carrier 2018-03-19 13:06:09 -04:00 committed by GitHub
commit 68f224aea3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Core/src/org/sleuthkit/autopsy/casemodule/Case.java
View File

@ -1529,7 +1529,12 @@ public class Case {
public void addReport(String localPath, String srcModuleName, String reportName) throws TskCoreException { public void addReport(String localPath, String srcModuleName, String reportName) throws TskCoreException {
String normalizedLocalPath; String normalizedLocalPath;
try { try {
normalizedLocalPath = Paths.get(localPath).normalize().toString(); if (localPath.toLowerCase().startsWith("http")) {
normalizedLocalPath = localPath;
} else {
normalizedLocalPath = Paths.get(localPath).normalize().toString();
}
} catch (InvalidPathException ex) { } catch (InvalidPathException ex) {
String errorMsg = "Invalid local path provided: " + localPath; // NON-NLS String errorMsg = "Invalid local path provided: " + localPath; // NON-NLS
throw new TskCoreException(errorMsg, ex); throw new TskCoreException(errorMsg, ex);

2
Core/src/org/sleuthkit/autopsy/datamodel/Reports.java
View File

@ -290,7 +290,7 @@ public final class Reports implements AutopsyVisitableItem {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
String reportPath = ReportNode.this.report.getPath(); String reportPath = ReportNode.this.report.getPath();
if (reportPath.toLowerCase().startsWith("http://")) { if (reportPath.toLowerCase().startsWith("http")) {
ExternalViewerAction.openURL(reportPath); ExternalViewerAction.openURL(reportPath);
} }
else { else {

42
Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerAction.java
View File

@ -22,6 +22,8 @@ import java.awt.Desktop;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.logging.Level; import java.util.logging.Level;
import javax.swing.AbstractAction; import javax.swing.AbstractAction;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
@ -112,7 +114,8 @@ public class ExternalViewerAction extends AbstractAction {
"ExternalViewerAction.actionPerformed.failure.IO.message=There is no associated editor for files of this type or the associated application failed to launch.", "ExternalViewerAction.actionPerformed.failure.IO.message=There is no associated editor for files of this type or the associated application failed to launch.",
"ExternalViewerAction.actionPerformed.failure.support.message=This platform (operating system) does not support opening a file in an editor this way.", "ExternalViewerAction.actionPerformed.failure.support.message=This platform (operating system) does not support opening a file in an editor this way.",
"ExternalViewerAction.actionPerformed.failure.missingFile.message=The file no longer exists.", "ExternalViewerAction.actionPerformed.failure.missingFile.message=The file no longer exists.",
"ExternalViewerAction.actionPerformed.failure.permission.message=Permission to open the file was denied."}) "ExternalViewerAction.actionPerformed.failure.permission.message=Permission to open the file was denied.",
"ExternalViewerAction.actionPerformed.failure.open.url=Cannot open URL"})
public static void openFile(String mimeType, String ext, File file) { public static void openFile(String mimeType, String ext, File file) {
/** /**
* Check if the file MIME type or extension exists in the user defined * Check if the file MIME type or extension exists in the user defined
@ -163,8 +166,39 @@ public class ExternalViewerAction extends AbstractAction {
} }
public static void openURL(String path) { public static void openURL(String path) {
// @@@ TODO String url_path = path.replaceAll("\\\\","/");
// get viewer for .html extension try {
// launch it Desktop.getDesktop().browse(new URI(url_path.replaceFirst("/","//")));
} catch (IOException ex) {
logger.log(Level.WARNING, "Could not find a viewer for the given URL: " + url_path, ex); //NON-NLS
JOptionPane.showMessageDialog(null,
Bundle.ExternalViewerAction_actionPerformed_failure_IO_message(),
Bundle.ExternalViewerAction_actionPerformed_failure_title(),
JOptionPane.ERROR_MESSAGE);
} catch (UnsupportedOperationException ex) {
logger.log(Level.WARNING, "Platform cannot open " + url_path + " in the defined editor.", ex); //NON-NLS
JOptionPane.showMessageDialog(null,
Bundle.ExternalViewerAction_actionPerformed_failure_support_message(),
Bundle.ExternalViewerAction_actionPerformed_failure_title(),
JOptionPane.ERROR_MESSAGE);
} catch (IllegalArgumentException ex) {
logger.log(Level.WARNING, "Could not find the given URL: " + url_path, ex); //NON-NLS
JOptionPane.showMessageDialog(null,
Bundle.ExternalViewerAction_actionPerformed_failure_missingFile_message(),
Bundle.ExternalViewerAction_actionPerformed_failure_title(),
JOptionPane.ERROR_MESSAGE);
} catch (SecurityException ex) {
logger.log(Level.WARNING, "Could not get permission to open the given URL: " + url_path, ex); //NON-NLS
JOptionPane.showMessageDialog(null,
Bundle.ExternalViewerAction_actionPerformed_failure_permission_message(),
Bundle.ExternalViewerAction_actionPerformed_failure_title(),
JOptionPane.ERROR_MESSAGE);
} catch (URISyntaxException ex) {
logger.log(Level.WARNING, "Could not open URL provided: " + url_path, ex);
JOptionPane.showMessageDialog(null,
Bundle.ExternalViewerAction_actionPerformed_failure_open_url(),
Bundle.ExternalViewerAction_actionPerformed_failure_title(),
JOptionPane.ERROR_MESSAGE);
}
} }
} }