Merge branch 'develop' of github.com:sleuthkit/autopsy into updateToNewestActiveMQandPostgreSQL

This commit is contained in:
Karl Mortensen 2016-06-28 10:14:49 -04:00
commit c4888f511e
14 changed files with 55 additions and 13 deletions

View File

@ -55,6 +55,7 @@ public class CueBannerPanel extends javax.swing.JPanel {
ImageIcon icon = new ImageIcon(cl.getResource(welcomeLogo));
autopsyLogo.setIcon(icon);
}
refresh();
}
/**

View File

@ -594,6 +594,8 @@ public class IngestManager {
JOptionPane.showMessageDialog(null, message, Bundle.IngestManager_startupErr_dlgTitle(), JOptionPane.ERROR_MESSAGE);
});
}
// abort ingest
return new IngestJobStartResult(null, new IngestManagerException("Errors occurred while starting ingest"), errors);
}
}
return new IngestJobStartResult(job, null, errors);

View File

@ -140,7 +140,7 @@ public class OpenTimelineAction extends CallableSystemAction implements Presente
*/
@Override
public Component getToolbarPresenter() {
ImageIcon icon = new ImageIcon("Core/src/org/sleuthkit/autopsy/timeline/images/btn_icon_timeline_colorized_26.png"); //NON-NLS
ImageIcon icon = new ImageIcon(getClass().getResource("images/btn_icon_timeline_colorized_26.png")); //NON-NLS
toolbarButton.setIcon(icon);
toolbarButton.setText(this.getName());

View File

@ -135,7 +135,8 @@ public class SnapShotReportWriter {
private Path writeIndexHTML() throws IOException {
//make a map of context objects to resolve template paramaters against
HashMap<String, Object> indexContext = new HashMap<>();
indexContext.put("currentCase", currentCase); //NON-NLS
indexContext.put("reportBranding", reportBranding); //NON-NLS
indexContext.put("reportName", reportName); //NON-NLS
Path reportIndexFile = reportFolderPath.resolve("index.html"); //NON-NLS
fillTemplateAndWrite("/org/sleuthkit/autopsy/timeline/snapshot/index_template.html", "Index", indexContext, reportIndexFile); //NON-NLS
@ -206,9 +207,15 @@ public class SnapShotReportWriter {
Files.copy(navStream, reportFolderPath.resolve("nav.html")); //NON-NLS
}
//copy favicon
try (InputStream faviconStream = SnapShotReportWriter.class.getResourceAsStream("/org/sleuthkit/autopsy/report/images/favicon.ico")) { //NON-NLS
Files.copy(faviconStream, reportFolderPath.resolve("favicon.ico")); //NON-NLS
if (StringUtils.isBlank(agencyLogoPath)) {
// use default Autopsy icon if custom icon is not set
try (InputStream faviconStream = SnapShotReportWriter.class.getResourceAsStream("/org/sleuthkit/autopsy/report/images/favicon.ico")) { //NON-NLS
Files.copy(faviconStream, reportFolderPath.resolve("favicon.ico")); //NON-NLS
}
} else {
Files.copy(Files.newInputStream(Paths.get(agencyLogoPath)), reportFolderPath.resolve("favicon.ico")); //NON-NLS
}
//copy report summary icon
try (InputStream summaryStream = SnapShotReportWriter.class.getResourceAsStream("/org/sleuthkit/autopsy/report/images/summary.png")) { //NON-NLS
Files.copy(summaryStream, reportFolderPath.resolve("summary.png")); //NON-NLS

View File

@ -1,6 +1,6 @@
<head>
<title>Autopsy Report for {{curentCase.getName}}</title>
<title>{{reportBranding.getReportTitle}} for {{reportName}}</title>
<link rel="icon" type="image/ico" href="favicon.ico" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>

View File

@ -13,7 +13,7 @@
<div class="title">
{{#reportBranding.getAgencyLogoPath}}
<div class="left">
<img src="{{agency_logo.png}}" />
<img src="agency_logo.png" />
</div>
<div class="right">
{{/reportBranding.getAgencyLogoPath}}

View File

@ -743,4 +743,11 @@ class GlobalEditListPanel extends javax.swing.JPanel implements ListSelectionLis
table, value, isSelected, hasFocus, row, col);
}
}
/**
* Set the keyboard focus to new keyword textbox.
*/
void setFocusOnKeywordTextBox() {
addWordField.requestFocus();
}
}

View File

@ -28,7 +28,9 @@ import org.sleuthkit.autopsy.corecomponents.OptionsPanel;
final class GlobalListSettingsPanel extends javax.swing.JPanel implements OptionsPanel {
private final GlobalListsManagementPanel listsManagementPanel = new GlobalListsManagementPanel();
private static final long serialVersionUID = 1L;
private final GlobalListsManagementPanel listsManagementPanel = new GlobalListsManagementPanel(this);
private final GlobalEditListPanel editListPanel = new GlobalEditListPanel();
GlobalListSettingsPanel() {
@ -110,7 +112,7 @@ final class GlobalListSettingsPanel extends javax.swing.JPanel implements Option
mainSplitPane.revalidate();
mainSplitPane.repaint();
}
@Override
public void addPropertyChangeListener(PropertyChangeListener l) {
listsManagementPanel.addPropertyChangeListener(l);
@ -135,6 +137,13 @@ final class GlobalListSettingsPanel extends javax.swing.JPanel implements Option
listsManagementPanel.load();
}
/**
* Set the keyboard focus to new keyword textbox.
*/
void setFocusOnKeywordTextBox() {
editListPanel.setFocusOnKeywordTextBox();
}
/**
* This method is called from within the constructor to initialize the form.
* WARNING: Do NOT modify this code. The content of this method is always

View File

@ -39,11 +39,15 @@ import org.sleuthkit.autopsy.coreutils.Logger;
*/
class GlobalListsManagementPanel extends javax.swing.JPanel implements OptionsPanel {
private static final long serialVersionUID = 1L;
private Logger logger = Logger.getLogger(GlobalListsManagementPanel.class.getName());
private KeywordListTableModel tableModel;
private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
private final org.sleuthkit.autopsy.keywordsearch.GlobalListSettingsPanel globalListSettingsPanel;
GlobalListsManagementPanel() {
GlobalListsManagementPanel(org.sleuthkit.autopsy.keywordsearch.GlobalListSettingsPanel gsp) {
this.globalListSettingsPanel = gsp;
tableModel = new KeywordListTableModel();
initComponents();
customizeComponents();
@ -78,7 +82,7 @@ class GlobalListsManagementPanel extends javax.swing.JPanel implements OptionsPa
* listsTable.getSelectionModel().clearSelection(); } } } });
*/
}
@Override
public void addPropertyChangeListener(PropertyChangeListener l) {
pcs.addPropertyChangeListener(l);
@ -210,6 +214,7 @@ class GlobalListsManagementPanel extends javax.swing.JPanel implements OptionsPa
}
}
pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
globalListSettingsPanel.setFocusOnKeywordTextBox();
}//GEN-LAST:event_newListButtonActionPerformed
private void importButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_importButtonActionPerformed

9
docs/doxygen-user/advanced.dox Executable file
View File

@ -0,0 +1,9 @@
/*! \page advanced_page Advanced Settings
If you are behind a proxy and need access to a network with Autopsy or one of the modules, you may set your proxy information in the _Tools_, _Options_, _General_ tab as shown in the screenshot below.
<br><br>
\image html proxySettings.PNG
<br><br>
*/

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

View File

@ -81,11 +81,12 @@ The log file should end up looking like this (modified lines are highlighted in
<br><br>
<i>cmd /c C:\\Bitnami\\solr-4.10.3-0\\apache-solr\\scripts\\serviceinstall.bat INSTALL</i>
<br><br>
Your command prompt should look like the screenshot below. Very likely it will say "The solrJetty service could not be started." This is okay.
Note the argument "INSTALL" is case sensitive. Your command prompt should look like the screenshot below. Very likely it will say "The solrJetty service could not be started." This is okay.
<br><br>
\image html solrinstall1.PNG
<br><br>
8. Press _Start_, type _services.msc_, and press _Enter_. Find _solrJetty_. If the service is running, press _Stop the service_, then double click it, and switch to the _Log On_ tab to change the logon credentials to a user who will have access to read and write the primary shared drive. If the machine is on a domain, the Account Name will be in the form of _DOMAINNAME\\username_ as shown in the example below. Note that in the screenshot below, the domain name is _DOMAIN_ and the user name is _username_. These are just examples, not real values.
8. Press _Start_, type _services.msc_, and press _Enter_. Find _solrJetty_. If the service is running, press _Stop the service_, then double click it, and switch to the _Log On_ tab to change the logon credentials to a user who will have access to read and write the primary shared drive. Note that selecting "Local System account" will work only if Solr service and case output folders are on the same machine. Using "Local System account" to run Solr service and having case output folders on a different machine will result in Solr being unable to create index files.
<br>If the machine is on a domain, the Account Name will be in the form of _DOMAINNAME\\username_ as shown in the example below. Note that in the screenshot below, the domain name is _DOMAIN_ and the user name is _username_. These are just examples, not real values.
<br><br>
\image html solrinstall2.PNG
<br>

View File

@ -55,6 +55,7 @@ The following topics are available here:
- \subpage windows_authentication
- \subpage multiuser_sec_page
- \subpage multiuser_page
- \subpage advanced_page
If the topic you need is not listed, refer to the <a href="http://wiki.sleuthkit.org/index.php?title=Autopsy_User%27s_Guide">Autopsy Wiki</a> or join the <a href="https://lists.sourceforge.net/lists/listinfo/sleuthkit-users">SleuthKit User List</a> at SourceForge.

View File

@ -6,7 +6,7 @@ After installing Autopsy, there are several hardware-based things that we sugges
- Run Autopsy from the Start Menu or desktop
- When presented with the case creation splash screen, cancel/close the window
- Select "Tools", "Options"
- On the "Autopsy" tab, there is a drop down for _Number of threads to use for file ingest_. We recommend you set this value 4. If you set this number too high, performance can degrade because the pipelines are fighting for the same physical resources. Individual testing should be done to find an optimal setting.
- On the "Autopsy" tab, there is a drop down for _Number of threads to use for file ingest_. We recommend you set this value 4. If you set this number too high, performance can degrade because the pipelines are fighting for the same physical resources. Individual testing should be done to find an optimal setting, but our testing reveals that for most systems and setups, after four threads, the machine is I/O bound anyway, and increasing this number beyond 4 may actually reduce performance.
- After each change, restart Autopsy to let this setting take effect.
<br><br>