mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-13 08:26:15 +00:00
Merge branch 'release-4.18.0' of github.com:sleuthkit/autopsy into 7215-externalTsvLib
This commit is contained in:
commit
8b146d7b8f
@ -52,6 +52,7 @@ DataResultViewerThumbnail.sortLabel.textTemplate=Sorted by: {0}
|
|||||||
DataResultViewerThumbnail.thumbnailSizeComboBox.large=Large Thumbnails
|
DataResultViewerThumbnail.thumbnailSizeComboBox.large=Large Thumbnails
|
||||||
DataResultViewerThumbnail.thumbnailSizeComboBox.medium=Medium Thumbnails
|
DataResultViewerThumbnail.thumbnailSizeComboBox.medium=Medium Thumbnails
|
||||||
DataResultViewerThumbnail.thumbnailSizeComboBox.small=Small Thumbnails
|
DataResultViewerThumbnail.thumbnailSizeComboBox.small=Small Thumbnails
|
||||||
|
MultiUserSettingsPanel_Close_Case_To_Modify=Close case to modfy settings
|
||||||
OptionsCategory_Name_General=Application
|
OptionsCategory_Name_General=Application
|
||||||
OptionsCategory_Keywords_General=Autopsy Options
|
OptionsCategory_Keywords_General=Autopsy Options
|
||||||
HINT_DataContentTopComponent=This is a DataContent window
|
HINT_DataContentTopComponent=This is a DataContent window
|
||||||
|
@ -32,13 +32,17 @@ import org.sleuthkit.autopsy.core.UserPreferences;
|
|||||||
import org.sleuthkit.autopsy.events.MessageServiceConnectionInfo;
|
import org.sleuthkit.autopsy.events.MessageServiceConnectionInfo;
|
||||||
import org.sleuthkit.autopsy.coreutils.Logger;
|
import org.sleuthkit.autopsy.coreutils.Logger;
|
||||||
import java.awt.Cursor;
|
import java.awt.Cursor;
|
||||||
|
import java.beans.PropertyChangeEvent;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.util.EnumSet;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import javax.swing.ImageIcon;
|
import javax.swing.ImageIcon;
|
||||||
import javax.swing.JOptionPane;
|
import javax.swing.JOptionPane;
|
||||||
import javax.swing.SwingUtilities;
|
import javax.swing.SwingUtilities;
|
||||||
import org.openide.util.ImageUtilities;
|
import org.openide.util.ImageUtilities;
|
||||||
import org.openide.util.Lookup;
|
import org.openide.util.Lookup;
|
||||||
|
import org.openide.util.NbBundle.Messages;
|
||||||
|
import org.sleuthkit.autopsy.casemodule.Case;
|
||||||
import org.sleuthkit.autopsy.coordinationservice.utils.CoordinationServiceUtils;
|
import org.sleuthkit.autopsy.coordinationservice.utils.CoordinationServiceUtils;
|
||||||
import org.sleuthkit.autopsy.core.UserPreferencesException;
|
import org.sleuthkit.autopsy.core.UserPreferencesException;
|
||||||
import org.sleuthkit.autopsy.coreutils.PlatformUtil;
|
import org.sleuthkit.autopsy.coreutils.PlatformUtil;
|
||||||
@ -159,6 +163,11 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
|
|||||||
goodIcon = new ImageIcon(ImageUtilities.loadImage("org/sleuthkit/autopsy/images/good.png", false));
|
goodIcon = new ImageIcon(ImageUtilities.loadImage("org/sleuthkit/autopsy/images/good.png", false));
|
||||||
badIcon = new ImageIcon(ImageUtilities.loadImage("org/sleuthkit/autopsy/images/bad.png", false));
|
badIcon = new ImageIcon(ImageUtilities.loadImage("org/sleuthkit/autopsy/images/bad.png", false));
|
||||||
enableMultiUserComponents(textBoxes, cbEnableMultiUser.isSelected());
|
enableMultiUserComponents(textBoxes, cbEnableMultiUser.isSelected());
|
||||||
|
|
||||||
|
Case.addEventTypeSubscriber(EnumSet.of(Case.Events.CURRENT_CASE), (PropertyChangeEvent evt) -> {
|
||||||
|
//disable when case is open, enable when case is closed
|
||||||
|
load(evt.getNewValue() != null);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -806,7 +815,11 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
|
|||||||
}
|
}
|
||||||
}//GEN-LAST:event_bnTestZKActionPerformed
|
}//GEN-LAST:event_bnTestZKActionPerformed
|
||||||
|
|
||||||
void load() {
|
@Messages({
|
||||||
|
"MultiUserSettingsPanel_Close_Case_To_Modify=Close case to modfy settings"
|
||||||
|
})
|
||||||
|
|
||||||
|
void load(boolean caseOpen) {
|
||||||
lbTestDatabase.setIcon(null);
|
lbTestDatabase.setIcon(null);
|
||||||
lbTestSolr8.setIcon(null);
|
lbTestSolr8.setIcon(null);
|
||||||
lbTestSolr4.setIcon(null);
|
lbTestSolr4.setIcon(null);
|
||||||
@ -845,7 +858,13 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
|
|||||||
bnTestMessageService.setEnabled(false);
|
bnTestMessageService.setEnabled(false);
|
||||||
|
|
||||||
cbEnableMultiUser.setSelected(UserPreferences.getIsMultiUserModeEnabled());
|
cbEnableMultiUser.setSelected(UserPreferences.getIsMultiUserModeEnabled());
|
||||||
this.valid(); // trigger validation to enable buttons based on current settings
|
|
||||||
|
// When a case is open, prevent the user from changing
|
||||||
|
// multi-user settings.
|
||||||
|
cbEnableMultiUser.setEnabled(!caseOpen);
|
||||||
|
enableMultiUserComponents(textBoxes, cbEnableMultiUser.isSelected() && !caseOpen);
|
||||||
|
|
||||||
|
this.valid(caseOpen); // trigger validation to enable buttons based on current settings
|
||||||
}
|
}
|
||||||
|
|
||||||
private void populateSolrAndZkSettings() {
|
private void populateSolrAndZkSettings() {
|
||||||
@ -1096,11 +1115,15 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
|
|||||||
*
|
*
|
||||||
* @return true if it's okay, false otherwise.
|
* @return true if it's okay, false otherwise.
|
||||||
*/
|
*/
|
||||||
boolean valid() {
|
boolean valid(boolean caseOpen) {
|
||||||
|
if(caseOpen) {
|
||||||
|
tbOops.setText(Bundle.MultiUserSettingsPanel_Close_Case_To_Modify());
|
||||||
|
} else {
|
||||||
tbOops.setText("");
|
tbOops.setText("");
|
||||||
|
}
|
||||||
|
|
||||||
if (cbEnableMultiUser.isSelected()) {
|
if (cbEnableMultiUser.isSelected()) {
|
||||||
return checkFieldsAndEnableButtons()
|
return checkFieldsAndEnableButtons(caseOpen)
|
||||||
&& databaseSettingsAreValid()
|
&& databaseSettingsAreValid()
|
||||||
&& indexingServerSettingsAreValid()
|
&& indexingServerSettingsAreValid()
|
||||||
&& messageServiceSettingsAreValid();
|
&& messageServiceSettingsAreValid();
|
||||||
@ -1115,7 +1138,7 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
|
|||||||
*
|
*
|
||||||
* @return True or false.
|
* @return True or false.
|
||||||
*/
|
*/
|
||||||
boolean checkFieldsAndEnableButtons() {
|
boolean checkFieldsAndEnableButtons(boolean caseOpen) {
|
||||||
boolean result = true;
|
boolean result = true;
|
||||||
|
|
||||||
boolean dbPopulated = databaseFieldsArePopulated();
|
boolean dbPopulated = databaseFieldsArePopulated();
|
||||||
@ -1125,15 +1148,15 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
|
|||||||
boolean messageServicePopulated = messageServiceFieldsArePopulated();
|
boolean messageServicePopulated = messageServiceFieldsArePopulated();
|
||||||
|
|
||||||
// PostgreSQL Database
|
// PostgreSQL Database
|
||||||
bnTestDatabase.setEnabled(dbPopulated);
|
bnTestDatabase.setEnabled(dbPopulated && !caseOpen);
|
||||||
|
|
||||||
// Solr Indexing
|
// Solr Indexing
|
||||||
bnTestSolr8.setEnabled(solr8Populated);
|
bnTestSolr8.setEnabled(solr8Populated && !caseOpen);
|
||||||
bnTestSolr4.setEnabled(solr4Populated);
|
bnTestSolr4.setEnabled(solr4Populated && !caseOpen);
|
||||||
bnTestZK.setEnabled(zkPopulated);
|
bnTestZK.setEnabled(zkPopulated && !caseOpen);
|
||||||
|
|
||||||
// ActiveMQ Messaging
|
// ActiveMQ Messaging
|
||||||
bnTestMessageService.setEnabled(messageServicePopulated);
|
bnTestMessageService.setEnabled(messageServicePopulated && !caseOpen);
|
||||||
|
|
||||||
if (dbPopulated && messageServicePopulated && zkPopulated && (solr8Populated || solr4Populated)) {
|
if (dbPopulated && messageServicePopulated && zkPopulated && (solr8Populated || solr4Populated)) {
|
||||||
result = true;
|
result = true;
|
||||||
|
@ -27,6 +27,7 @@ import org.openide.util.Lookup;
|
|||||||
import org.openide.util.NbBundle;
|
import org.openide.util.NbBundle;
|
||||||
import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
|
import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
import org.sleuthkit.autopsy.casemodule.Case;
|
||||||
import org.sleuthkit.autopsy.coreutils.Logger;
|
import org.sleuthkit.autopsy.coreutils.Logger;
|
||||||
|
|
||||||
@OptionsPanelController.TopLevelRegistration(categoryName = "#OptionsCategory_Name_Multi_User_Settings",
|
@OptionsPanelController.TopLevelRegistration(categoryName = "#OptionsCategory_Name_Multi_User_Settings",
|
||||||
@ -43,7 +44,7 @@ public final class MultiUserSettingsPanelController extends OptionsPanelControll
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void update() {
|
public void update() {
|
||||||
getPanel().load();
|
getPanel().load(Case.isCaseOpen());
|
||||||
changed = false;
|
changed = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -59,7 +60,7 @@ public final class MultiUserSettingsPanelController extends OptionsPanelControll
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isValid() {
|
public boolean isValid() {
|
||||||
return getPanel().valid();
|
return getPanel().valid(Case.isCaseOpen());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
BIN
docs/doxygen-user/images/activeMQ_node_cleanup.png
Normal file
BIN
docs/doxygen-user/images/activeMQ_node_cleanup.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 31 KiB |
@ -24,20 +24,27 @@ If you need the JRE, install it with the default settings.
|
|||||||
|
|
||||||
\subsection install_activemq_install_mq ActiveMQ Installation
|
\subsection install_activemq_install_mq ActiveMQ Installation
|
||||||
|
|
||||||
1. Extract the contents of the ActiveMQ archive folder to a location of your choice, bearing in mind that the files should be in a location that the running process will have write permissions to the folder. A typical folder choice would be similar to <i>C:\\Program Files\\apache-activemq-5.13.3</i>. Typically, it will ask for administrator permission to move the folder. Allow it if required.
|
<ol>
|
||||||
|
<li>Extract the contents of the ActiveMQ archive to a location of your choice, bearing in mind that the files should be in a location where the running process has write permissions. A typical folder choice would be similar to <i>C:\\Program Files\\apache-activemq-5.13.3</i>. The system may ask for administrator permission to move the folder. Allow it if required.
|
||||||
|
|
||||||
2. Edit the <i>conf\\activemq.xml</i> in the extracted folder to add <i>"&wireFormat.maxInactivityDuration=0"</i> to the URI for the _transportConnector_ named _openwire_. Add the text highlighted in yellow below:
|
<li>Open the <i>conf\\activemq.xml</i> file in the extracted folder in a text editor and make the following changes:
|
||||||
|
<ul>
|
||||||
|
<li> Add <i>"schedulePeriodForDestinationPurge="10000""</i> to the _broker_ tag then add <i>"gcInactiveDestinations="true" inactiveTimoutBeforeGC="30000""</i> to the _policyEntry_ tag. This is highlighted in yellow below:
|
||||||
|
|
||||||
|
\image html activeMQ_node_cleanup.png
|
||||||
|
|
||||||
|
<li>Add <i>"&wireFormat.maxInactivityDuration=0"</i> to the URI for the _transportConnector_ named _openwire_. This is highlighted in yellow below:
|
||||||
<br><br>
|
<br><br>
|
||||||
\image html maxinactivityduration.PNG
|
\image html maxinactivityduration.PNG
|
||||||
<br><br>
|
<br><br>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<li>Install ActiveMQ as a service by navigating to the folder <i>bin\\win64</i>, right-clicking _InstallService.bat_, clicking _Run as administrator_, then click _Yes_.
|
||||||
|
|
||||||
3. Install ActiveMQ as a service by navigating to the folder <i>bin\\win64</i>, right-clicking _InstallService.bat_, clicking _Run as administrator_, then click _Yes_.
|
<li>Start the ActiveMQ service by pressing _Start_, type _services.msc_, and press _Enter_. Find _ActiveMQ_ in the list and press the _Start the service_ link.
|
||||||
|
|
||||||
4. Start the ActiveMQ service by pressing _Start_, type _services.msc_, and press _Enter_. Find _ActiveMQ_ in the list and press the _Start the service_ link.
|
|
||||||
|
|
||||||
5. ActiveMQ should now be installed and configured using the default credentials.
|
|
||||||
|
|
||||||
|
<li>ActiveMQ should now be installed and configured using the default credentials.
|
||||||
|
</ol>
|
||||||
|
|
||||||
\subsection install_activemq_test Testing
|
\subsection install_activemq_test Testing
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user