org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.core;
+
+/**
+ * Application properties that are set once at runtime and are not saved between
+ * invocations of Autopsy.
+ */
+public class RuntimeProperties {
+
+ private static boolean coreComponentsActive = true;
+ private static boolean coreComponentsActiveSet = false;
+
+ /**
+ * Sets or unsets a flag indicating whether or not the core Autopsy UI
+ * components and user interactions with those components via menus, message
+ * boxes, NetBeans progress handles, etc., are enabled.
+ *
+ * This flag exists as a mechanism to allow use of Autopsy as a platform
+ * with the core Autopsy user interface disabled, until such time as the
+ * user interface is made separable and optional.
+ *
+ * @param coreComponentsActive True or false.
+ */
+ public static void setCoreComponentsActive(boolean coreComponentsActive) {
+ if (!coreComponentsActiveSet) {
+ RuntimeProperties.coreComponentsActive = coreComponentsActive;
+ coreComponentsActiveSet = true;
+ }
+ }
+
+ /**
+ * Gets a flag indicating whether or not the core Autopsy UI components and
+ * user interactions with those components via menus, message boxes,
+ * NetBeans progress handles, etc., are enabled.
+ *
+ * This flag exists as a mechanism to allow use of Autopsy as a platform
+ * with the core Autopsy user interface disabled, until such time as the
+ * user interface is made separable and optional.
+ *
+ * @return True or false.
+ */
+ public static boolean coreComponentsAreActive() {
+ return coreComponentsActive;
+ }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/core/ServicesMonitor.java b/Core/src/org/sleuthkit/autopsy/core/ServicesMonitor.java
new file mode 100644
index 0000000000..4c1fb92989
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/core/ServicesMonitor.java
@@ -0,0 +1,411 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2013-2015 Basis Technology Corp.
+ * Contact: carrier sleuthkit org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.core;
+
+import org.sleuthkit.autopsy.core.events.ServiceEvent;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.beans.PropertyChangeListener;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
+import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
+import org.sleuthkit.autopsy.events.AutopsyEventPublisher;
+import org.sleuthkit.autopsy.keywordsearchservice.KeywordSearchService;
+import org.sleuthkit.autopsy.events.MessageServiceConnectionInfo;
+import org.sleuthkit.autopsy.events.MessageServiceException;
+import org.sleuthkit.autopsy.keywordsearchservice.KeywordSearchServiceException;
+import org.sleuthkit.datamodel.CaseDbConnectionInfo;
+import org.sleuthkit.datamodel.SleuthkitCase;
+import org.sleuthkit.datamodel.TskCoreException;
+
+/**
+ * This class periodically checks availability of collaboration resources -
+ * remote database, remote keyword search server, messaging service - and
+ * reports status updates to the user in case of a gap in service.
+ */
+public class ServicesMonitor {
+
+ private AutopsyEventPublisher eventPublisher;
+ private static final Logger logger = Logger.getLogger(ServicesMonitor.class.getName());
+ private final ScheduledThreadPoolExecutor periodicTasksExecutor;
+
+ private static final String PERIODIC_TASK_THREAD_NAME = "services-monitor-periodic-task-%d";
+ private static final int NUMBER_OF_PERIODIC_TASK_THREADS = 1;
+ private static final long CRASH_DETECTION_INTERVAL_MINUTES = 2;
+
+ private static final Set servicesList = Stream.of(ServicesMonitor.Service.values())
+ .map(Service::toString)
+ .collect(Collectors.toSet());
+
+ /**
+ * The service monitor maintains a mapping of each service to it's last
+ * status update.
+ */
+ private final ConcurrentHashMap statusByService;
+
+ /**
+ * Call constructor on start-up so that the first check of services is done
+ * as soon as possible.
+ */
+ private static ServicesMonitor instance = new ServicesMonitor();
+
+ /**
+ * List of services that are being monitored. The service names should be
+ * representative of the service functionality and readable as they get
+ * logged when service outage occurs.
+ */
+ public enum Service {
+
+ /**
+ * Property change event fired when remote case database service status
+ * changes. New value is set to updated ServiceStatus, old value is
+ * null.
+ */
+ REMOTE_CASE_DATABASE("Multi-user case database service"),
+ /**
+ * Property change event fired when remote keyword search service status
+ * changes. New value is set to updated ServiceStatus, old value is
+ * null.
+ */
+ REMOTE_KEYWORD_SEARCH("Multi-user keyword search service"),
+ /**
+ * Property change event fired when messaging service status changes.
+ * New value is set to updated ServiceStatus, old value is null.
+ */
+ MESSAGING("Messaging service");
+
+ private final String displayName;
+
+ private Service(String name) {
+ this.displayName = name;
+ }
+
+ public String getDisplayName() {
+ return displayName;
+ }
+ };
+
+ /**
+ * List of possible service statuses.
+ */
+ public enum ServiceStatus {
+
+ /**
+ * Service is currently up.
+ */
+ UP,
+ /**
+ * Service is currently down.
+ */
+ DOWN
+ };
+
+ public synchronized static ServicesMonitor getInstance() {
+ if (instance == null) {
+ instance = new ServicesMonitor();
+ }
+ return instance;
+ }
+
+ private ServicesMonitor() {
+
+ this.eventPublisher = new AutopsyEventPublisher();
+ this.statusByService = new ConcurrentHashMap<>();
+
+ // First check is triggered immediately on current thread.
+ checkAllServices();
+
+ /**
+ * Start periodic task that check the availability of key collaboration
+ * services.
+ */
+ periodicTasksExecutor = new ScheduledThreadPoolExecutor(NUMBER_OF_PERIODIC_TASK_THREADS, new ThreadFactoryBuilder().setNameFormat(PERIODIC_TASK_THREAD_NAME).build());
+ periodicTasksExecutor.scheduleAtFixedRate(new CrashDetectionTask(), CRASH_DETECTION_INTERVAL_MINUTES, CRASH_DETECTION_INTERVAL_MINUTES, TimeUnit.MINUTES);
+ }
+
+ /**
+ * Updates service status and publishes the service status update if it is
+ * different from previous status. Event is published locally. Logs status
+ * changes.
+ *
+ * @param service Name of the service.
+ * @param status Updated status for the service.
+ * @param details Details of the event.
+ *
+ */
+ public void setServiceStatus(String service, String status, String details) {
+ // if the status update is for an existing service who's status hasn't changed - do nothing.
+ if (statusByService.containsKey(service) && status.equals(statusByService.get(service))) {
+ return;
+ }
+
+ // new service or status has changed - identify service's display name
+ String serviceDisplayName;
+ try {
+ serviceDisplayName = ServicesMonitor.Service.valueOf(service).getDisplayName();
+ } catch (IllegalArgumentException ignore) {
+ // custom service that is not listed in ServicesMonitor.Service enum. Use service name as display name.
+ serviceDisplayName = service;
+ }
+
+ if (status.equals(ServiceStatus.UP.toString())) {
+ logger.log(Level.INFO, "Connection to {0} is up", serviceDisplayName); //NON-NLS
+ MessageNotifyUtil.Notify.info(NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.restoredService.notify.title"),
+ NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.restoredService.notify.msg", serviceDisplayName));
+ } else if (status.equals(ServiceStatus.DOWN.toString())) {
+ logger.log(Level.SEVERE, "Failed to connect to {0}", serviceDisplayName); //NON-NLS
+ MessageNotifyUtil.Notify.error(NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.failedService.notify.title"),
+ NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.failedService.notify.msg", serviceDisplayName));
+ } else {
+ logger.log(Level.INFO, "Status for {0} is {1}", new Object[]{serviceDisplayName, status}); //NON-NLS
+ MessageNotifyUtil.Notify.info(NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.statusChange.notify.title"),
+ NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.statusChange.notify.msg", new Object[]{serviceDisplayName, status}));
+ }
+
+ // update and publish new status
+ statusByService.put(service, status);
+ eventPublisher.publishLocally(new ServiceEvent(service, status, details));
+ }
+
+ /**
+ * Get last status update for a service.
+ *
+ * @param service Name of the service.
+ *
+ * @return ServiceStatus Status for the service.
+ *
+ * @throws ServicesMonitorException If service name is null or service
+ * doesn't exist.
+ */
+ public String getServiceStatus(String service) throws ServicesMonitorException {
+
+ if (service == null) {
+ throw new ServicesMonitorException(NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.nullServiceName.excepton.txt"));
+ }
+
+ // if request is for one of our "core" services - perform an on demand check
+ // to make sure we have the latest status.
+ if (servicesList.contains(service)) {
+ checkServiceStatus(service);
+ }
+
+ String status = statusByService.get(service);
+ if (status == null) {
+ // no such service
+ throw new ServicesMonitorException(NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.unknownServiceName.excepton.txt", service));
+ }
+ return status;
+ }
+
+ /**
+ * Performs service availability status check.
+ *
+ * @param service Name of the service.
+ */
+ private void checkServiceStatus(String service) {
+ if (service.equals(Service.REMOTE_CASE_DATABASE.toString())) {
+ checkDatabaseConnectionStatus();
+ } else if (service.equals(Service.REMOTE_KEYWORD_SEARCH.toString())) {
+ checkKeywordSearchServerConnectionStatus();
+ } else if (service.equals(Service.MESSAGING.toString())) {
+ checkMessagingServerConnectionStatus();
+ }
+ }
+
+ /**
+ * Performs case database service availability status check.
+ */
+ private void checkDatabaseConnectionStatus() {
+ CaseDbConnectionInfo info;
+ try {
+ info = UserPreferences.getDatabaseConnectionInfo();
+ } catch (UserPreferencesException ex) {
+ logger.log(Level.SEVERE, "Error accessing case database connection info", ex); //NON-NLS
+ setServiceStatus(Service.REMOTE_CASE_DATABASE.toString(), ServiceStatus.DOWN.toString(), "Error accessing case database connection info");
+ return;
+ }
+ try {
+ SleuthkitCase.tryConnect(info);
+ setServiceStatus(Service.REMOTE_CASE_DATABASE.toString(), ServiceStatus.UP.toString(), "");
+ } catch (TskCoreException ex) {
+ setServiceStatus(Service.REMOTE_CASE_DATABASE.toString(), ServiceStatus.DOWN.toString(), ex.getMessage());
+ }
+ }
+
+ /**
+ * Performs keyword search service availability status check.
+ */
+ private void checkKeywordSearchServerConnectionStatus() {
+ KeywordSearchService kwsService = Lookup.getDefault().lookup(KeywordSearchService.class);
+ try {
+ if (kwsService != null) {
+ int port = Integer.parseUnsignedInt(UserPreferences.getIndexingServerPort());
+ kwsService.tryConnect(UserPreferences.getIndexingServerHost(), port);
+ setServiceStatus(Service.REMOTE_KEYWORD_SEARCH.toString(), ServiceStatus.UP.toString(), "");
+ } else {
+ setServiceStatus(Service.REMOTE_KEYWORD_SEARCH.toString(), ServiceStatus.DOWN.toString(),
+ NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.KeywordSearchNull"));
+ }
+ } catch (NumberFormatException ex) {
+ String rootCause = NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.InvalidPortNumber");
+ logger.log(Level.SEVERE, "Unable to connect to messaging server: " + rootCause, ex); //NON-NLS
+ setServiceStatus(Service.REMOTE_KEYWORD_SEARCH.toString(), ServiceStatus.DOWN.toString(), rootCause);
+ } catch (KeywordSearchServiceException ex) {
+ String rootCause = ex.getMessage();
+ logger.log(Level.SEVERE, "Unable to connect to messaging server: " + rootCause, ex); //NON-NLS
+ setServiceStatus(Service.REMOTE_KEYWORD_SEARCH.toString(), ServiceStatus.DOWN.toString(), rootCause);
+ }
+ }
+
+ /**
+ * Performs messaging service availability status check.
+ */
+ private void checkMessagingServerConnectionStatus() {
+ MessageServiceConnectionInfo info;
+ try {
+ info = UserPreferences.getMessageServiceConnectionInfo();
+ } catch (UserPreferencesException ex) {
+ logger.log(Level.SEVERE, "Error accessing messaging service connection info", ex); //NON-NLS
+ setServiceStatus(Service.MESSAGING.toString(), ServiceStatus.DOWN.toString(), "Error accessing messaging service connection info");
+ return;
+ }
+
+ try {
+ info.tryConnect();
+ setServiceStatus(Service.MESSAGING.toString(), ServiceStatus.UP.toString(), "");
+ } catch (MessageServiceException ex) {
+ String rootCause = ex.getMessage();
+ logger.log(Level.SEVERE, "Unable to connect to messaging server: " + rootCause, ex); //NON-NLS
+ setServiceStatus(Service.MESSAGING.toString(), ServiceStatus.DOWN.toString(), rootCause);
+ }
+ }
+
+ /**
+ * Adds an event subscriber to this publisher. Subscriber will be subscribed
+ * to all events from this publisher.
+ *
+ * @param subscriber The subscriber to add.
+ */
+ public void addSubscriber(PropertyChangeListener subscriber) {
+ eventPublisher.addSubscriber(servicesList, subscriber);
+ }
+
+ /**
+ * Adds an event subscriber to this publisher.
+ *
+ * @param eventNames The events the subscriber is interested in.
+ * @param subscriber The subscriber to add.
+ */
+ public void addSubscriber(Set eventNames, PropertyChangeListener subscriber) {
+ eventPublisher.addSubscriber(eventNames, subscriber);
+ }
+
+ /**
+ * Adds an event subscriber to this publisher.
+ *
+ * @param eventName The event the subscriber is interested in.
+ * @param subscriber The subscriber to add.
+ */
+ public void addSubscriber(String eventName, PropertyChangeListener subscriber) {
+ eventPublisher.addSubscriber(eventName, subscriber);
+ }
+
+ /**
+ * Removes an event subscriber from this publisher.
+ *
+ * @param eventNames The events the subscriber is no longer interested in.
+ * @param subscriber The subscriber to remove.
+ */
+ public void removeSubscriber(Set eventNames, PropertyChangeListener subscriber) {
+ eventPublisher.removeSubscriber(eventNames, subscriber);
+ }
+
+ /**
+ * Removes an event subscriber from this publisher.
+ *
+ * @param eventName The event the subscriber is no longer interested in.
+ * @param subscriber The subscriber to remove.
+ */
+ public void removeSubscriber(String eventName, PropertyChangeListener subscriber) {
+ eventPublisher.removeSubscriber(eventName, subscriber);
+ }
+
+ /**
+ * Removes an event subscriber to this publisher. Subscriber will be removed
+ * from all event notifications from this publisher.
+ *
+ * @param subscriber The subscriber to remove.
+ */
+ public void removeSubscriber(PropertyChangeListener subscriber) {
+ eventPublisher.removeSubscriber(servicesList, subscriber);
+ }
+
+ /**
+ * Verifies connectivity to all services.
+ */
+ private void checkAllServices() {
+ if (!UserPreferences.getIsMultiUserModeEnabled()) {
+ return;
+ }
+
+ for (String service : servicesList) {
+ checkServiceStatus(service);
+ }
+ }
+
+ /**
+ * A Runnable task that periodically checks the availability of
+ * collaboration resources (remote database, remote keyword search service,
+ * message broker) and reports status to the user in case of a gap in
+ * service.
+ */
+ private final class CrashDetectionTask implements Runnable {
+
+ /**
+ * Monitor the availability of collaboration resources
+ */
+ @Override
+ public void run() {
+ checkAllServices();
+ }
+ }
+
+ /**
+ * Exception thrown when service status query results in an error.
+ */
+ public class ServicesMonitorException extends Exception {
+
+ private static final long serialVersionUID = 1L;
+
+ public ServicesMonitorException(String message) {
+ super(message);
+ }
+
+ public ServicesMonitorException(String message, Throwable cause) {
+ super(message, cause);
+ }
+ }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java b/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java
index 5349915871..a9909593b0 100755
--- a/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java
+++ b/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java
@@ -18,9 +18,20 @@
*/
package org.sleuthkit.autopsy.core;
+import java.util.Base64;
+import java.util.prefs.BackingStoreException;
+import org.sleuthkit.autopsy.events.MessageServiceConnectionInfo;
import java.util.prefs.PreferenceChangeListener;
import java.util.prefs.Preferences;
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.PBEParameterSpec;
+import org.openide.util.NbBundle;
import org.openide.util.NbPreferences;
+import org.sleuthkit.datamodel.CaseDbConnectionInfo;
+import org.sleuthkit.datamodel.TskData.DbType;
/**
* Provides convenient access to a Preferences node for user preferences with
@@ -34,11 +45,50 @@ public final class UserPreferences {
public static final String HIDE_KNOWN_FILES_IN_VIEWS_TREE = "HideKnownFilesInViewsTree"; //NON-NLS
public static final String DISPLAY_TIMES_IN_LOCAL_TIME = "DisplayTimesInLocalTime"; //NON-NLS
public static final String NUMBER_OF_FILE_INGEST_THREADS = "NumberOfFileIngestThreads"; //NON-NLS
+ public static final String IS_MULTI_USER_MODE_ENABLED = "IsMultiUserModeEnabled"; //NON-NLS
+ public static final String EXTERNAL_DATABASE_HOSTNAME_OR_IP = "ExternalDatabaseHostnameOrIp"; //NON-NLS
+ public static final String EXTERNAL_DATABASE_PORTNUMBER = "ExternalDatabasePortNumber"; //NON-NLS
+ public static final String EXTERNAL_DATABASE_NAME = "ExternalDatabaseName"; //NON-NLS
+ public static final String EXTERNAL_DATABASE_USER = "ExternalDatabaseUsername"; //NON-NLS
+ public static final String EXTERNAL_DATABASE_PASSWORD = "ExternalDatabasePassword"; //NON-NLS
+ public static final String EXTERNAL_DATABASE_TYPE = "ExternalDatabaseType"; //NON-NLS
+ public static final String INDEXING_SERVER_HOST = "IndexingServerHost"; //NON-NLS
+ public static final String INDEXING_SERVER_PORT = "IndexingServerPort"; //NON-NLS
+ private static final String MESSAGE_SERVICE_PASSWORD = "MessageServicePassword"; //NON-NLS
+ private static final String MESSAGE_SERVICE_USER = "MessageServiceUser"; //NON-NLS
+ private static final String MESSAGE_SERVICE_HOST = "MessageServiceHost"; //NON-NLS
+ private static final String MESSAGE_SERVICE_PORT = "MessageServicePort"; //NON-NLS
+ public static final String PROCESS_TIME_OUT_ENABLED = "ProcessTimeOutEnabled"; //NON-NLS
+ public static final String PROCESS_TIME_OUT_HOURS = "ProcessTimeOutHours"; //NON-NLS
+ private static final int DEFAULT_PROCESS_TIMEOUT_HR = 60;
+ private static final String DEFAULT_PORT_STRING = "61616";
+ private static final int DEFAULT_PORT_INT = 61616;
// Prevent instantiation.
private UserPreferences() {
}
+ /**
+ * Reload all preferences from disk. This is only needed if the preferences
+ * file is being directly modified on disk while Autopsy is running.
+ *
+ * @throws BackingStoreException
+ */
+ public static void reloadFromStorage() throws BackingStoreException {
+ preferences.sync();
+ }
+
+ /**
+ * Saves the current preferences to storage. This is only needed if the
+ * preferences files are going to be copied to another location while
+ * Autopsy is running.
+ *
+ * @throws BackingStoreException
+ */
+ public static void saveToStorage() throws BackingStoreException {
+ preferences.flush();
+ }
+
public static void addChangeListener(PreferenceChangeListener listener) {
preferences.addPreferenceChangeListener(listener);
}
@@ -87,4 +137,209 @@ public final class UserPreferences {
preferences.putInt(NUMBER_OF_FILE_INGEST_THREADS, value);
}
+ /**
+ * Reads persisted case database connection info.
+ * @return An object encapsulating the database connection info.
+ * @throws org.sleuthkit.autopsy.core.UserPreferencesException
+ */
+ public static CaseDbConnectionInfo getDatabaseConnectionInfo() throws UserPreferencesException {
+ DbType dbType;
+ try {
+ dbType = DbType.valueOf(preferences.get(EXTERNAL_DATABASE_TYPE, "POSTGRESQL"));
+ } catch (Exception ex) {
+ dbType = DbType.SQLITE;
+ }
+ return new CaseDbConnectionInfo(
+ preferences.get(EXTERNAL_DATABASE_HOSTNAME_OR_IP, ""),
+ preferences.get(EXTERNAL_DATABASE_PORTNUMBER, "5432"),
+ preferences.get(EXTERNAL_DATABASE_USER, ""),
+ TextConverter.convertHexTextToText(preferences.get(EXTERNAL_DATABASE_PASSWORD, "")),
+ dbType);
+ }
+
+ /**
+ * Persists case database connection info.
+ *
+ * @param connectionInfo An object encapsulating the database connection
+ * info.
+ * @throws org.sleuthkit.autopsy.core.UserPreferencesException
+ */
+ public static void setDatabaseConnectionInfo(CaseDbConnectionInfo connectionInfo) throws UserPreferencesException {
+ preferences.put(EXTERNAL_DATABASE_HOSTNAME_OR_IP, connectionInfo.getHost());
+ preferences.put(EXTERNAL_DATABASE_PORTNUMBER, connectionInfo.getPort());
+ preferences.put(EXTERNAL_DATABASE_USER, connectionInfo.getUserName());
+ preferences.put(EXTERNAL_DATABASE_PASSWORD, TextConverter.convertTextToHexText(connectionInfo.getPassword()));
+ preferences.put(EXTERNAL_DATABASE_TYPE, connectionInfo.getDbType().toString());
+ }
+
+ public static void setIsMultiUserModeEnabled(boolean enabled) {
+ preferences.putBoolean(IS_MULTI_USER_MODE_ENABLED, enabled);
+ }
+
+ public static boolean getIsMultiUserModeEnabled() {
+ return preferences.getBoolean(IS_MULTI_USER_MODE_ENABLED, false);
+ }
+
+ public static String getIndexingServerHost() {
+ return preferences.get(INDEXING_SERVER_HOST, "");
+ }
+
+ public static void setIndexingServerHost(String hostName) {
+ preferences.put(INDEXING_SERVER_HOST, hostName);
+ }
+
+ public static String getIndexingServerPort() {
+ return preferences.get(INDEXING_SERVER_PORT, "8983");
+ }
+
+ public static void setIndexingServerPort(int port) {
+ preferences.putInt(INDEXING_SERVER_PORT, port);
+ }
+
+ /**
+ * Persists message service connection info.
+ *
+ * @param info An object encapsulating the message service info.
+ * @throws org.sleuthkit.autopsy.core.UserPreferencesException
+ */
+ public static void setMessageServiceConnectionInfo(MessageServiceConnectionInfo info) throws UserPreferencesException {
+ preferences.put(MESSAGE_SERVICE_HOST, info.getHost());
+ preferences.put(MESSAGE_SERVICE_PORT, Integer.toString(info.getPort()));
+ preferences.put(MESSAGE_SERVICE_USER, info.getUserName());
+ preferences.put(MESSAGE_SERVICE_PASSWORD, TextConverter.convertTextToHexText(info.getPassword()));
+ }
+
+ /**
+ * Reads persisted message service connection info.
+ *
+ * @return An object encapsulating the message service info.
+ * @throws org.sleuthkit.autopsy.core.UserPreferencesException
+ */
+ public static MessageServiceConnectionInfo getMessageServiceConnectionInfo() throws UserPreferencesException {
+ int port;
+ try {
+ port = Integer.parseInt(preferences.get(MESSAGE_SERVICE_PORT, DEFAULT_PORT_STRING));
+ } catch (NumberFormatException ex) {
+ // if there is an error parsing the port number, use the default port number
+ port = DEFAULT_PORT_INT;
+ }
+
+ return new MessageServiceConnectionInfo(
+ preferences.get(MESSAGE_SERVICE_HOST, ""),
+ port,
+ preferences.get(MESSAGE_SERVICE_USER, ""),
+ TextConverter.convertHexTextToText(preferences.get(MESSAGE_SERVICE_PASSWORD, "")));
+ }
+
+ /**
+ * Reads persisted process time out value.
+ *
+ * @return int Process time out value (hours).
+ */
+ public static int getProcessTimeOutHrs() {
+ int timeOut = preferences.getInt(PROCESS_TIME_OUT_HOURS, DEFAULT_PROCESS_TIMEOUT_HR);
+ if (timeOut < 0) {
+ timeOut = 0;
+ }
+ return timeOut;
+ }
+
+ /**
+ * Stores persisted process time out value.
+ *
+ * @param value Persisted process time out value (hours).
+ */
+ public static void setProcessTimeOutHrs(int value) {
+ if (value < 0) {
+ value = 0;
+ }
+ preferences.putInt(PROCESS_TIME_OUT_HOURS, value);
+ }
+
+ /**
+ * Reads persisted setting of whether process time out functionality is
+ * enabled.
+ *
+ * @return boolean True if process time out is functionality enabled, false
+ * otherwise.
+ */
+ public static boolean getIsTimeOutEnabled() {
+ boolean enabled = preferences.getBoolean(PROCESS_TIME_OUT_ENABLED, false);
+ return enabled;
+ }
+
+ /**
+ * Stores persisted setting of whether process time out functionality is
+ * enabled.
+ *
+ * @param enabled Persisted setting of whether process time out
+ * functionality is enabled.
+ */
+ public static void setIsTimeOutEnabled(boolean enabled) {
+ preferences.putBoolean(PROCESS_TIME_OUT_ENABLED, enabled);
+ }
+
+
+ /**
+ * Provides ability to convert text to hex text.
+ */
+ static final class TextConverter {
+
+ private static final char[] TMP = "hgleri21auty84fwe".toCharArray();
+ private static final byte[] SALT = {
+ (byte) 0xde, (byte) 0x33, (byte) 0x10, (byte) 0x12,
+ (byte) 0xde, (byte) 0x33, (byte) 0x10, (byte) 0x12,};
+
+ /**
+ * Convert text to hex text.
+ *
+ * @param property Input text string.
+ *
+ * @return Converted hex string.
+ *
+ * @throws org.sleuthkit.autopsy.core.UserPreferencesException
+ */
+ static String convertTextToHexText(String property) throws UserPreferencesException {
+ try {
+ SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("PBEWithMD5AndDES");
+ SecretKey key = keyFactory.generateSecret(new PBEKeySpec(TMP));
+ Cipher pbeCipher = Cipher.getInstance("PBEWithMD5AndDES");
+ pbeCipher.init(Cipher.ENCRYPT_MODE, key, new PBEParameterSpec(SALT, 20));
+ return base64Encode(pbeCipher.doFinal(property.getBytes("UTF-8")));
+ } catch (Exception ex) {
+ throw new UserPreferencesException(
+ NbBundle.getMessage(TextConverter.class, "TextConverter.convert.exception.txt"));
+ }
+ }
+
+ private static String base64Encode(byte[] bytes) {
+ return Base64.getEncoder().encodeToString(bytes);
+ }
+
+ /**
+ * Convert hex text back to text.
+ *
+ * @param property Input hex text string.
+ *
+ * @return Converted text string.
+ *
+ * @throws org.sleuthkit.autopsy.core.UserPreferencesException
+ */
+ static String convertHexTextToText(String property) throws UserPreferencesException {
+ try {
+ SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("PBEWithMD5AndDES");
+ SecretKey key = keyFactory.generateSecret(new PBEKeySpec(TMP));
+ Cipher pbeCipher = Cipher.getInstance("PBEWithMD5AndDES");
+ pbeCipher.init(Cipher.DECRYPT_MODE, key, new PBEParameterSpec(SALT, 20));
+ return new String(pbeCipher.doFinal(base64Decode(property)), "UTF-8");
+ } catch (Exception ex) {
+ throw new UserPreferencesException(
+ NbBundle.getMessage(TextConverter.class, "TextConverter.convertFromHex.exception.txt"));
+ }
+ }
+
+ private static byte[] base64Decode(String property) {
+ return Base64.getDecoder().decode(property);
+ }
+ }
}
diff --git a/Core/src/org/sleuthkit/autopsy/events/ContentTagDeletedEvent.java b/Core/src/org/sleuthkit/autopsy/core/UserPreferencesException.java
similarity index 60%
rename from Core/src/org/sleuthkit/autopsy/events/ContentTagDeletedEvent.java
rename to Core/src/org/sleuthkit/autopsy/core/UserPreferencesException.java
index 6c6d11745f..7d9c22fe0b 100644
--- a/Core/src/org/sleuthkit/autopsy/events/ContentTagDeletedEvent.java
+++ b/Core/src/org/sleuthkit/autopsy/core/UserPreferencesException.java
@@ -16,19 +16,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.sleuthkit.autopsy.events;
-
-import javax.annotation.concurrent.Immutable;
-import org.sleuthkit.autopsy.casemodule.Case;
-import org.sleuthkit.datamodel.ContentTag;
+package org.sleuthkit.autopsy.core;
/**
- * An event that is fired when a ContentTag is deleted.
+ * Exception thrown when text conversion (such as from text to hex text or vice versa) resulted in
+ * an error
*/
-@Immutable
-public class ContentTagDeletedEvent extends TagDeletedEvent {
-
- public ContentTagDeletedEvent(ContentTag deletedTag) {
- super(Case.Events.CONTENT_TAG_DELETED.toString(), deletedTag);
+public class UserPreferencesException extends Exception {
+ private static final long serialVersionUID = 1L;
+
+ public UserPreferencesException(String message) {
+ super(message);
}
+
+ public UserPreferencesException(String message, Throwable cause) {
+ super(message, cause);
+ }
}
diff --git a/Core/src/org/sleuthkit/autopsy/core/events/ServiceEvent.java b/Core/src/org/sleuthkit/autopsy/core/events/ServiceEvent.java
new file mode 100644
index 0000000000..6b09f80908
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/core/events/ServiceEvent.java
@@ -0,0 +1,49 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2013-2015 Basis Technology Corp.
+ * Contact: carrier sleuthkit org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.core.events;
+
+import java.io.Serializable;
+import org.sleuthkit.autopsy.events.AutopsyEvent;
+
+/**
+ * A class for events to be published to registered subscribers of Service
+ * Monitor on this Autopsy node. The class extends PropertyChangeEvent (via
+ * AutopsyEvent) to integrate with legacy use of JavaBeans PropertyChangeEvents
+ * and PropertyChangeListeners as an application event system, and implements
+ * Serializable to allow it to be published over a network in serialized form.
+ */
+public final class ServiceEvent extends AutopsyEvent implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private final String details;
+
+ public ServiceEvent(String serviceName, String status, String details) {
+ super(serviceName, null, status);
+ this.details = details;
+ }
+
+ /**
+ * Gets details string passed as input to ServiceEvent constructor.
+ *
+ * @return String Details of the event.
+ */
+ public String getDetails() {
+ return details;
+ }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/core/layer.xml b/Core/src/org/sleuthkit/autopsy/core/layer.xml
index 2f36280e7a..4c4b88125a 100644
--- a/Core/src/org/sleuthkit/autopsy/core/layer.xml
+++ b/Core/src/org/sleuthkit/autopsy/core/layer.xml
@@ -19,7 +19,7 @@
-
+
@@ -44,7 +44,6 @@
-
@@ -203,6 +202,13 @@
+
+
+
+
+
+
+
@@ -215,6 +221,8 @@
-->
+
+
@@ -227,6 +235,7 @@
+
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowPanel.java
index abba7ce94b..640cc45409 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowPanel.java
@@ -26,7 +26,7 @@ import java.net.URL;
import java.text.MessageFormat;
import java.util.Locale;
import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.sleuthkit.autopsy.coreutils.Logger;
import javax.swing.Icon;
import javax.swing.ImageIcon;
import javax.swing.JPanel;
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.form b/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.form
index 153a137748..14f2a4f112 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.form
@@ -6,8 +6,6 @@
-
-
@@ -58,6 +56,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -89,7 +101,17 @@
-
+
+
+
+
+
+
+
+
+
+
+
@@ -205,5 +227,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.java
index e683de4c0d..9fb5b41089 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.java
@@ -18,7 +18,9 @@
*/
package org.sleuthkit.autopsy.corecomponents;
+import java.text.NumberFormat;
import javax.swing.DefaultComboBoxModel;
+import javax.swing.JFormattedTextField;
import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.core.UserPreferences;
@@ -81,6 +83,19 @@ final class AutopsyOptionsPanel extends javax.swing.JPanel {
useLocalTimeRB.setSelected(useLocalTime);
useGMTTimeRB.setSelected(!useLocalTime);
numberOfFileIngestThreadsComboBox.setSelectedItem(UserPreferences.numberOfFileIngestThreads());
+ if (UserPreferences.getIsTimeOutEnabled()) {
+ // user specified time out
+ jCheckBoxEnableProcTimeout.setSelected(true);
+ jFormattedTextFieldProcTimeOutHrs.setEditable(true);
+ int timeOutHrs = UserPreferences.getProcessTimeOutHrs();
+ jFormattedTextFieldProcTimeOutHrs.setValue((long) timeOutHrs);
+ } else {
+ // never time out
+ jCheckBoxEnableProcTimeout.setSelected(false);
+ jFormattedTextFieldProcTimeOutHrs.setEditable(false);
+ int timeOutHrs = UserPreferences.getProcessTimeOutHrs();
+ jFormattedTextFieldProcTimeOutHrs.setValue((long) timeOutHrs);
+ }
}
void store() {
@@ -89,6 +104,13 @@ final class AutopsyOptionsPanel extends javax.swing.JPanel {
UserPreferences.setHideKnownFilesInViewsTree(viewsHideKnownCB.isSelected());
UserPreferences.setDisplayTimesInLocalTime(useLocalTimeRB.isSelected());
UserPreferences.setNumberOfFileIngestThreads((Integer) numberOfFileIngestThreadsComboBox.getSelectedItem());
+
+ UserPreferences.setIsTimeOutEnabled(jCheckBoxEnableProcTimeout.isSelected());
+ if (jCheckBoxEnableProcTimeout.isSelected()) {
+ // only store time out if it is enabled
+ long timeOutHrs = (long) jFormattedTextFieldProcTimeOutHrs.getValue();
+ UserPreferences.setProcessTimeOutHrs((int) timeOutHrs);
+ }
}
boolean valid() {
@@ -105,7 +127,6 @@ final class AutopsyOptionsPanel extends javax.swing.JPanel {
buttonGroup1 = new javax.swing.ButtonGroup();
buttonGroup3 = new javax.swing.ButtonGroup();
- buttonGroupProcTimeOut = new javax.swing.ButtonGroup();
useBestViewerRB = new javax.swing.JRadioButton();
keepCurrentViewerRB = new javax.swing.JRadioButton();
jLabelSelectFile = new javax.swing.JLabel();
@@ -118,6 +139,10 @@ final class AutopsyOptionsPanel extends javax.swing.JPanel {
jLabelNumThreads = new javax.swing.JLabel();
numberOfFileIngestThreadsComboBox = new javax.swing.JComboBox();
restartRequiredLabel = new javax.swing.JLabel();
+ jLabelSetProcessTimeOut = new javax.swing.JLabel();
+ jCheckBoxEnableProcTimeout = new javax.swing.JCheckBox();
+ jLabelProcessTimeOutUnits = new javax.swing.JLabel();
+ jFormattedTextFieldProcTimeOutHrs = new JFormattedTextField(NumberFormat.getIntegerInstance());
buttonGroup1.add(useBestViewerRB);
useBestViewerRB.setSelected(true);
@@ -150,6 +175,19 @@ final class AutopsyOptionsPanel extends javax.swing.JPanel {
restartRequiredLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/corecomponents/warning16.png"))); // NOI18N
org.openide.awt.Mnemonics.setLocalizedText(restartRequiredLabel, org.openide.util.NbBundle.getMessage(AutopsyOptionsPanel.class, "AutopsyOptionsPanel.restartRequiredLabel.text")); // NOI18N
+ org.openide.awt.Mnemonics.setLocalizedText(jLabelSetProcessTimeOut, org.openide.util.NbBundle.getMessage(AutopsyOptionsPanel.class, "AutopsyOptionsPanel.jLabelSetProcessTimeOut.text")); // NOI18N
+
+ org.openide.awt.Mnemonics.setLocalizedText(jCheckBoxEnableProcTimeout, org.openide.util.NbBundle.getMessage(AutopsyOptionsPanel.class, "AutopsyOptionsPanel.jCheckBoxEnableProcTimeout.text")); // NOI18N
+ jCheckBoxEnableProcTimeout.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ jCheckBoxEnableProcTimeoutActionPerformed(evt);
+ }
+ });
+
+ org.openide.awt.Mnemonics.setLocalizedText(jLabelProcessTimeOutUnits, org.openide.util.NbBundle.getMessage(AutopsyOptionsPanel.class, "AutopsyOptionsPanel.jLabelProcessTimeOutUnits.text")); // NOI18N
+
+ jFormattedTextFieldProcTimeOutHrs.setText(org.openide.util.NbBundle.getMessage(AutopsyOptionsPanel.class, "AutopsyOptionsPanel.jFormattedTextFieldProcTimeOutHrs.text")); // NOI18N
+
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
@@ -180,7 +218,18 @@ final class AutopsyOptionsPanel extends javax.swing.JPanel {
.addComponent(useGMTTimeRB)))
.addComponent(jLabelSelectFile)
.addComponent(jLabelNumThreads))
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addGroup(layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addGap(10, 10, 10)
+ .addComponent(jCheckBoxEnableProcTimeout)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jFormattedTextFieldProcTimeOutHrs, javax.swing.GroupLayout.PREFERRED_SIZE, 27, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jLabelProcessTimeOutUnits))
+ .addComponent(jLabelSetProcessTimeOut))
+ .addGap(0, 0, Short.MAX_VALUE))))
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -208,18 +257,33 @@ final class AutopsyOptionsPanel extends javax.swing.JPanel {
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(numberOfFileIngestThreadsComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(restartRequiredLabel))
- .addContainerGap(155, Short.MAX_VALUE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(jLabelSetProcessTimeOut)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jCheckBoxEnableProcTimeout)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jFormattedTextFieldProcTimeOutHrs, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jLabelProcessTimeOutUnits)))
+ .addContainerGap(103, Short.MAX_VALUE))
);
}// //GEN-END:initComponents
+ private void jCheckBoxEnableProcTimeoutActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCheckBoxEnableProcTimeoutActionPerformed
+ jFormattedTextFieldProcTimeOutHrs.setEditable(jCheckBoxEnableProcTimeout.isSelected());
+ }//GEN-LAST:event_jCheckBoxEnableProcTimeoutActionPerformed
+
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.ButtonGroup buttonGroup1;
private javax.swing.ButtonGroup buttonGroup3;
- private javax.swing.ButtonGroup buttonGroupProcTimeOut;
private javax.swing.JCheckBox dataSourcesHideKnownCB;
+ private javax.swing.JCheckBox jCheckBoxEnableProcTimeout;
+ private javax.swing.JFormattedTextField jFormattedTextFieldProcTimeOutHrs;
private javax.swing.JLabel jLabelHideKnownFiles;
private javax.swing.JLabel jLabelNumThreads;
+ private javax.swing.JLabel jLabelProcessTimeOutUnits;
private javax.swing.JLabel jLabelSelectFile;
+ private javax.swing.JLabel jLabelSetProcessTimeOut;
private javax.swing.JLabel jLabelTimeDisplay;
private javax.swing.JRadioButton keepCurrentViewerRB;
private javax.swing.JComboBox numberOfFileIngestThreadsComboBox;
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanelController.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanelController.java
index c0de3942ea..9253da5df5 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanelController.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanelController.java
@@ -30,7 +30,7 @@ import java.util.logging.Level;
import org.sleuthkit.autopsy.coreutils.Logger;
@OptionsPanelController.TopLevelRegistration(categoryName = "#OptionsCategory_Name_General",
- iconBase = "org/sleuthkit/autopsy/corecomponents/checkbox.png",
+ iconBase = "org/sleuthkit/autopsy/corecomponents/checkbox32.png",
position = 1,
keywords = "#OptionsCategory_Keywords_General",
keywordsCategory = "General")
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
index caa5ecd386..06146d2d8f 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
@@ -147,7 +147,52 @@ AutopsyOptionsPanel.jLabelNumThreads.text=Number of threads to use for file inge
FXVideoPanel.progress.bufferingCancelled=media buffering was canceled
FXVideoPanel.progress.bufferingInterrupted=media buffering was interrupted
FXVideoPanel.progress.errorWritingVideoToDisk=Error writing video to disk
+OptionsCategory_Name_Multi_User_Settings=Multi-user
+OptionsCategory_Keywords_Multi_User_Options=Multi-user Options
+MultiUserSettingsPanel.lbSolrSettings.text=Solr Settings
+MultiUserSettingsPanel.cbEnableMultiUser.text=Enable Multi-user cases
+MultiUserSettingsPanel.lbDatabaseSettings.text=Database Settings
+MultiUserSettingsPanel.validationErrMsg.incomplete=Fill in all values
+MultiUserSettingsPanel.validationErrMsg.invalidDatabasePort=Invalid database port number
+MultiUserSettingsPanel.validationErrMsg.invalidMessageServicePort=Invalid message service port number
+MultiUserSettingsPanel.validationErrMsg.invalidIndexingServerPort=Invalid Solr server port number
+MultiUserSettingsPanel.validationErrMsg.invalidMessgeServiceURI=Message service host and/or port not valid
+AutopsyOptionsPanel.jCheckBoxEnableProcTimeout.text=
+AutopsyOptionsPanel.jFormattedTextFieldProcTimeOutHrs.text=60
+AutopsyOptionsPanel.jLabelProcessTimeOutUnits.text=hour(s)
+AutopsyOptionsPanel.jLabelSetProcessTimeOut.text=Enable timeout to allow modules to automatically terminate after a set amount of time:
DataContentViewerHex.goToOffsetLabel.text=Jump to Offset
DataContentViewerHex.goToOffsetTextField.text=
DataContentViewerHex.goToOffsetTextField.msgDlg=Invalid Offset: {0}
-DataContentViewerHex.setDataView.invalidOffset.negativeOffsetValue=Cannot jump to the resultant offset
\ No newline at end of file
+DataContentViewerHex.setDataView.invalidOffset.negativeOffsetValue=Cannot jump to the resultant offset
+MultiUserSettingsPanel.tbOops.text=
+MultiUserSettingsPanel.lbTestDatabase.text=
+MultiUserSettingsPanel.bnTestDatabase.text=Test
+MultiUserSettingsPanel.tbDbHostname.toolTipText=Hostname or IP Address
+MultiUserSettingsPanel.tbDbHostname.text=
+MultiUserSettingsPanel.tbDbPort.toolTipText=Port Number
+MultiUserSettingsPanel.tbDbPort.text=
+MultiUserSettingsPanel.tbDbUsername.toolTipText=User Name
+MultiUserSettingsPanel.tbDbUsername.text=
+MultiUserSettingsPanel.tbDbPassword.toolTipText=Password
+MultiUserSettingsPanel.tbDbPassword.text=
+MultiUserSettingsPanel.lbTestSolr.text=
+MultiUserSettingsPanel.bnTestSolr.text=Test
+MultiUserSettingsPanel.tbSolrHostname.toolTipText=Hostname or IP Address
+MultiUserSettingsPanel.tbSolrPort.toolTipText=Port Number
+MultiUserSettingsPanel.lbTestMessageService.text=
+MultiUserSettingsPanel.bnTestMessageService.text=Test
+MultiUserSettingsPanel.lbMessageServiceSettings.text=ActiveMQ Message Service Settings
+MultiUserSettingsPanel.tbMsgPort.toolTipText=Port Number
+MultiUserSettingsPanel.tbMsgPort.text=
+MultiUserSettingsPanel.tbMsgUsername.toolTipText=User Name
+MultiUserSettingsPanel.tbMsgUsername.text=
+MultiUserSettingsPanel.tbMsgPassword.toolTipText=Password
+MultiUserSettingsPanel.tbMsgPassword.text=
+MultiUserSettingsPanel.tbMsgHostname.toolTipText=Hostname or IP Address
+MultiUserSettingsPanel.tbMsgHostname.text=
+MultiUserSettingsPanel.lbTestMessageWarning.text=
+MultiUserSettingsPanel.lbTestSolrWarning.text=
+MultiUserSettingsPanel.lbTestDbWarning.text=
+MultiUserSettingsPanel.KeywordSearchNull=Cannot find Keyword Search service
+MultiUserSettingsPanel.InvalidPortNumber=Invalid port number.
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
index c3749660bf..9c1efe9b21 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
@@ -171,7 +171,7 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo
}
/**
- * is the given file a video we can display?
+ * Is the given file a video we can display?
*
* @param file
*
@@ -185,14 +185,13 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo
}
/**
- * is the given file an image that we can display?
+ * Is the given file an image that we can display?
*
* @param file
*
* @return True if an image file that can be displayed
*/
private boolean isImageSupported(AbstractFile file) {
-
if (null == file || file.getSize() == 0) {
return false;
}
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.form b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.form
index e86a2a5daf..f471d230a7 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.form
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.form
@@ -45,11 +45,7 @@
-
-
-
-
-
+
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java
index f1e790f0f8..4f3910357d 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java
@@ -578,6 +578,5 @@ final class DataResultViewerThumbnail extends AbstractDataResultViewer {
}
}
}
-
}
}
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/Installer.java b/Core/src/org/sleuthkit/autopsy/corecomponents/Installer.java
index 66a672c16b..c2e989635e 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/Installer.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/Installer.java
@@ -1,7 +1,7 @@
/*
* Autopsy Forensic Browser
*
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2015 Basis Technology Corp.
* Contact: carrier sleuthkit org
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -69,25 +69,26 @@ public class Installer extends ModuleInstall {
/*
* Open the passed in case, if an aut file was double clicked.
*/
- WindowManager.getDefault().invokeWhenUIReady(new Runnable() {
- @Override
- public void run() {
- Collection processors = Lookup.getDefault().lookupAll(OptionProcessor.class);
- for (OptionProcessor processor : processors) {
- if (processor instanceof OpenFromArguments) {
- OpenFromArguments argsProcessor = (OpenFromArguments) processor;
- String caseFile = argsProcessor.getDefaultArg();
- if (caseFile != null && !caseFile.equals("") && caseFile.endsWith(".aut") && new File(caseFile).exists()) { //NON-NLS
+ WindowManager.getDefault().invokeWhenUIReady(() -> {
+ Collection processors = Lookup.getDefault().lookupAll(OptionProcessor.class);
+ for (OptionProcessor processor : processors) {
+ if (processor instanceof OpenFromArguments) {
+ OpenFromArguments argsProcessor = (OpenFromArguments) processor;
+ final String caseFile = argsProcessor.getDefaultArg();
+ if (caseFile != null && !caseFile.equals("") && caseFile.endsWith(".aut") && new File(caseFile).exists()) { //NON-NLS
+ new Thread(() -> {
+ // Create case.
try {
Case.open(caseFile);
- return;
- } catch (Exception e) {
+ } catch (Exception ex) {
+ logger.log(Level.SEVERE, "Error opening case: ", ex); //NON-NLS
}
- }
+ }).start();
+ return;
}
}
- Case.invokeStartupDialog(); // bring up the startup dialog
}
+ Case.invokeStartupDialog(); // bring up the startup dialog
});
}
@@ -95,18 +96,19 @@ public class Installer extends ModuleInstall {
@Override
public void uninstalled() {
super.uninstalled();
-
}
@Override
public void close() {
- try {
- if (Case.isCaseOpen()) {
- Case.getCurrentCase().closeCase();
+ new Thread(() -> {
+ try {
+ if (Case.isCaseOpen()) {
+ Case.getCurrentCase().closeCase();
+ }
+ } catch (CaseActionException | IllegalStateException unused) {
+ // Exception already logged. Shutting down, no need to do popup.
}
- } catch (CaseActionException ex) {
- logger.log(Level.WARNING, "Error closing case. ", ex); //NON-NLS
- }
+ }).start();
}
private void setupLAF() {
@@ -157,8 +159,8 @@ public class Installer extends ModuleInstall {
}
// Overwrite the Metal menu item keys to use the Aqua versions
- for (Map.Entry entry : uiEntries.entrySet()) {
+ uiEntries.entrySet().stream().forEach((entry) -> {
UIManager.put(entry.getKey(), entry.getValue());
- }
+ });
}
}
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java
index 15997146ea..6872aace78 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java
@@ -239,5 +239,4 @@ public class MediaViewImagePanel extends JPanel implements DataContentViewerMedi
}// //GEN-END:initComponents
// Variables declaration - do not modify//GEN-BEGIN:variables
// End of variables declaration//GEN-END:variables
-
}
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.form
new file mode 100644
index 0000000000..57f1eca7d5
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.form
@@ -0,0 +1,520 @@
+
+
+
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java
new file mode 100644
index 0000000000..0a26244edc
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java
@@ -0,0 +1,862 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.sleuthkit.autopsy.corecomponents;
+
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.Collection;
+import javax.swing.JTextField;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import org.openide.util.NbBundle;
+import org.sleuthkit.datamodel.CaseDbConnectionInfo;
+import org.sleuthkit.datamodel.TskData.DbType;
+import org.sleuthkit.autopsy.core.UserPreferences;
+import org.sleuthkit.autopsy.events.MessageServiceConnectionInfo;
+import org.sleuthkit.autopsy.coreutils.Logger;
+import java.awt.Cursor;
+import java.util.logging.Level;
+import javax.swing.ImageIcon;
+import org.openide.util.ImageUtilities;
+import org.openide.util.Lookup;
+import org.sleuthkit.autopsy.core.UserPreferencesException;
+import org.sleuthkit.autopsy.events.MessageServiceException;
+import org.sleuthkit.autopsy.keywordsearchservice.KeywordSearchService;
+import org.sleuthkit.autopsy.keywordsearchservice.KeywordSearchServiceException;
+import org.sleuthkit.datamodel.SleuthkitCase;
+import org.sleuthkit.datamodel.TskCoreException;
+
+public final class MultiUserSettingsPanel extends javax.swing.JPanel {
+
+ private static final String HOST_NAME_OR_IP_PROMPT = NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbDbHostname.toolTipText");
+ private static final String PORT_PROMPT = NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbDbPort.toolTipText");
+ private static final String USER_NAME_PROMPT = NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbDbUsername.toolTipText");
+ private static final String PASSWORD_PROMPT = NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbDbPassword.toolTipText");
+ private static final String INCOMPLETE_SETTINGS_MSG = NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.validationErrMsg.incomplete");
+ private static final String INVALID_DB_PORT_MSG = NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.validationErrMsg.invalidDatabasePort");
+ private static final String INVALID_MESSAGE_SERVICE_PORT_MSG = NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.validationErrMsg.invalidMessageServicePort");
+ private static final String INVALID_INDEXING_SERVER_PORT_MSG = NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.validationErrMsg.invalidIndexingServerPort");
+ private static final int DEFAULT_MESSAGE_SERVICE_PORT = 61616;
+ private static final long serialVersionUID = 1L;
+ private final MultiUserSettingsPanelController controller;
+ private final Collection textBoxes = new ArrayList<>();
+ private final TextBoxChangedListener textBoxChangedListener;
+ private static final Logger logger = Logger.getLogger(MultiUserSettingsPanel.class.getName());
+ private final ImageIcon goodIcon;
+ private final ImageIcon badIcon;
+
+ /**
+ * Creates new form AutopsyMultiUserSettingsPanel
+ *
+ * @param theController Controller to notify of changes.
+ */
+ public MultiUserSettingsPanel(MultiUserSettingsPanelController theController) {
+ initComponents();
+ controller = theController;
+ setSize(555, 600);
+
+ /**
+ * Add text prompts to all of the text fields.
+ */
+ Collection textPrompts = new ArrayList<>();
+ textPrompts.add(new TextPrompt(HOST_NAME_OR_IP_PROMPT, tbDbHostname));
+ textPrompts.add(new TextPrompt(PORT_PROMPT, tbDbPort));
+ textPrompts.add(new TextPrompt(USER_NAME_PROMPT, tbDbUsername));
+ textPrompts.add(new TextPrompt(PASSWORD_PROMPT, tbDbPassword));
+ textPrompts.add(new TextPrompt(HOST_NAME_OR_IP_PROMPT, tbMsgHostname));
+ textPrompts.add(new TextPrompt(PORT_PROMPT, tbMsgPort));
+ textPrompts.add(new TextPrompt(USER_NAME_PROMPT, tbMsgUsername));
+ textPrompts.add(new TextPrompt(PASSWORD_PROMPT, tbMsgPassword));
+ textPrompts.add(new TextPrompt(HOST_NAME_OR_IP_PROMPT, tbSolrHostname));
+ textPrompts.add(new TextPrompt(PORT_PROMPT, tbSolrPort));
+ configureTextPrompts(textPrompts);
+
+ /* Set each textbox with a "statusIcon" property enabling the
+ DocumentListeners to know which icon to erase when changes are made */
+ tbDbHostname.getDocument().putProperty("statusIcon", lbTestDatabase);
+ tbDbPort.getDocument().putProperty("statusIcon", lbTestDatabase);
+ tbDbUsername.getDocument().putProperty("statusIcon", lbTestDatabase);
+ tbDbPassword.getDocument().putProperty("statusIcon", lbTestDatabase);
+
+ tbSolrHostname.getDocument().putProperty("statusIcon", lbTestSolr);
+ tbSolrPort.getDocument().putProperty("statusIcon", lbTestSolr);
+
+ tbMsgHostname.getDocument().putProperty("statusIcon", lbTestMessageService);
+ tbMsgPort.getDocument().putProperty("statusIcon", lbTestMessageService);
+ tbMsgUsername.getDocument().putProperty("statusIcon", lbTestMessageService);
+ tbMsgPassword.getDocument().putProperty("statusIcon", lbTestMessageService);
+
+ /// Register for notifications when the text boxes get updated.
+ textBoxChangedListener = new TextBoxChangedListener();
+ textBoxes.add(tbDbHostname);
+ textBoxes.add(tbDbPort);
+ textBoxes.add(tbDbUsername);
+ textBoxes.add(tbDbPassword);
+ textBoxes.add(tbMsgHostname);
+ textBoxes.add(tbMsgPort);
+ textBoxes.add(tbMsgUsername);
+ textBoxes.add(tbMsgPassword);
+ textBoxes.add(tbSolrHostname);
+ textBoxes.add(tbSolrPort);
+
+ addDocumentListeners(textBoxes, textBoxChangedListener);
+ goodIcon = new ImageIcon(ImageUtilities.loadImage("org/sleuthkit/autopsy/images/good.png", false));
+ badIcon = new ImageIcon(ImageUtilities.loadImage("org/sleuthkit/autopsy/images/bad.png", false));
+ enableMultiUserComponents(textBoxes, cbEnableMultiUser.isSelected());
+ }
+
+ /**
+ * Sets the foreground color and transparency of a collection of text
+ * prompts.
+ *
+ * @param textPrompts The text prompts to configure.
+ */
+ private static void configureTextPrompts(Collection textPrompts) {
+ float alpha = 0.9f; // Mostly opaque
+ for (TextPrompt textPrompt : textPrompts) {
+ textPrompt.setForeground(Color.LIGHT_GRAY);
+ textPrompt.changeAlpha(alpha);
+ }
+ }
+
+ /**
+ * Adds a change listener to a collection of text fields.
+ *
+ * @param textFields The text fields.
+ * @param listener The change listener.
+ */
+ private static void addDocumentListeners(Collection textFields, TextBoxChangedListener listener) {
+ for (JTextField textField : textFields) {
+ textField.getDocument().addDocumentListener(listener);
+ }
+ }
+
+ /**
+ * 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
+ * regenerated by the Form Editor.
+ */
+ @SuppressWarnings("unchecked")
+ // //GEN-BEGIN:initComponents
+ private void initComponents() {
+
+ pnOverallPanel = new javax.swing.JPanel();
+ pnDatabaseSettings = new javax.swing.JPanel();
+ tbDbHostname = new javax.swing.JTextField();
+ tbDbPort = new javax.swing.JTextField();
+ tbDbUsername = new javax.swing.JTextField();
+ tbDbPassword = new javax.swing.JPasswordField();
+ lbDatabaseSettings = new javax.swing.JLabel();
+ bnTestDatabase = new javax.swing.JButton();
+ lbTestDatabase = new javax.swing.JLabel();
+ lbTestDbWarning = new javax.swing.JLabel();
+ pnSolrSettings = new javax.swing.JPanel();
+ lbSolrSettings = new javax.swing.JLabel();
+ tbSolrHostname = new javax.swing.JTextField();
+ tbSolrPort = new javax.swing.JTextField();
+ bnTestSolr = new javax.swing.JButton();
+ lbTestSolr = new javax.swing.JLabel();
+ lbTestSolrWarning = new javax.swing.JLabel();
+ pnMessagingSettings = new javax.swing.JPanel();
+ lbMessageServiceSettings = new javax.swing.JLabel();
+ tbMsgHostname = new javax.swing.JTextField();
+ tbMsgUsername = new javax.swing.JTextField();
+ tbMsgPort = new javax.swing.JTextField();
+ tbMsgPassword = new javax.swing.JPasswordField();
+ bnTestMessageService = new javax.swing.JButton();
+ lbTestMessageService = new javax.swing.JLabel();
+ lbTestMessageWarning = new javax.swing.JLabel();
+ cbEnableMultiUser = new javax.swing.JCheckBox();
+ tbOops = new javax.swing.JTextField();
+
+ pnDatabaseSettings.setBorder(javax.swing.BorderFactory.createEtchedBorder());
+
+ tbDbHostname.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+ tbDbHostname.setText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbDbHostname.text")); // NOI18N
+ tbDbHostname.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbDbHostname.toolTipText")); // NOI18N
+
+ tbDbPort.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+ tbDbPort.setText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbDbPort.text")); // NOI18N
+ tbDbPort.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbDbPort.toolTipText")); // NOI18N
+
+ tbDbUsername.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+ tbDbUsername.setText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbDbUsername.text")); // NOI18N
+ tbDbUsername.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbDbUsername.toolTipText")); // NOI18N
+
+ tbDbPassword.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+ tbDbPassword.setText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbDbPassword.text")); // NOI18N
+ tbDbPassword.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbDbPassword.toolTipText")); // NOI18N
+
+ lbDatabaseSettings.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+ org.openide.awt.Mnemonics.setLocalizedText(lbDatabaseSettings, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.lbDatabaseSettings.text")); // NOI18N
+ lbDatabaseSettings.setVerticalAlignment(javax.swing.SwingConstants.TOP);
+
+ org.openide.awt.Mnemonics.setLocalizedText(bnTestDatabase, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.bnTestDatabase.text")); // NOI18N
+ bnTestDatabase.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ bnTestDatabaseActionPerformed(evt);
+ }
+ });
+
+ org.openide.awt.Mnemonics.setLocalizedText(lbTestDatabase, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.lbTestDatabase.text")); // NOI18N
+ lbTestDatabase.setAutoscrolls(true);
+
+ lbTestDbWarning.setForeground(new java.awt.Color(255, 0, 0));
+ org.openide.awt.Mnemonics.setLocalizedText(lbTestDbWarning, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.lbTestDbWarning.text")); // NOI18N
+
+ javax.swing.GroupLayout pnDatabaseSettingsLayout = new javax.swing.GroupLayout(pnDatabaseSettings);
+ pnDatabaseSettings.setLayout(pnDatabaseSettingsLayout);
+ pnDatabaseSettingsLayout.setHorizontalGroup(
+ pnDatabaseSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(pnDatabaseSettingsLayout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(pnDatabaseSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(tbDbHostname)
+ .addGroup(pnDatabaseSettingsLayout.createSequentialGroup()
+ .addComponent(lbDatabaseSettings)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(bnTestDatabase)
+ .addGap(18, 18, 18)
+ .addComponent(lbTestDatabase, javax.swing.GroupLayout.PREFERRED_SIZE, 16, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(tbDbPort)
+ .addComponent(tbDbUsername)
+ .addComponent(tbDbPassword)
+ .addGroup(pnDatabaseSettingsLayout.createSequentialGroup()
+ .addComponent(lbTestDbWarning)
+ .addGap(0, 0, Short.MAX_VALUE)))
+ .addContainerGap())
+ );
+ pnDatabaseSettingsLayout.setVerticalGroup(
+ pnDatabaseSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, pnDatabaseSettingsLayout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(pnDatabaseSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(bnTestDatabase)
+ .addComponent(lbTestDatabase, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(lbDatabaseSettings))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(tbDbHostname, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(tbDbPort, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(tbDbUsername, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(tbDbPassword, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(lbTestDbWarning, javax.swing.GroupLayout.PREFERRED_SIZE, 16, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap())
+ );
+
+ pnSolrSettings.setBorder(javax.swing.BorderFactory.createEtchedBorder());
+
+ lbSolrSettings.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+ org.openide.awt.Mnemonics.setLocalizedText(lbSolrSettings, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.lbSolrSettings.text")); // NOI18N
+
+ tbSolrHostname.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+ tbSolrHostname.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbSolrHostname.toolTipText")); // NOI18N
+
+ tbSolrPort.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+ tbSolrPort.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbSolrPort.toolTipText")); // NOI18N
+
+ org.openide.awt.Mnemonics.setLocalizedText(bnTestSolr, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.bnTestSolr.text")); // NOI18N
+ bnTestSolr.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ bnTestSolrActionPerformed(evt);
+ }
+ });
+
+ org.openide.awt.Mnemonics.setLocalizedText(lbTestSolr, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.lbTestSolr.text")); // NOI18N
+
+ lbTestSolrWarning.setForeground(new java.awt.Color(255, 0, 0));
+ org.openide.awt.Mnemonics.setLocalizedText(lbTestSolrWarning, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.lbTestSolrWarning.text")); // NOI18N
+
+ javax.swing.GroupLayout pnSolrSettingsLayout = new javax.swing.GroupLayout(pnSolrSettings);
+ pnSolrSettings.setLayout(pnSolrSettingsLayout);
+ pnSolrSettingsLayout.setHorizontalGroup(
+ pnSolrSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(pnSolrSettingsLayout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(pnSolrSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(tbSolrHostname)
+ .addGroup(pnSolrSettingsLayout.createSequentialGroup()
+ .addComponent(lbSolrSettings)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(bnTestSolr)
+ .addGap(18, 18, 18)
+ .addComponent(lbTestSolr, javax.swing.GroupLayout.PREFERRED_SIZE, 16, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(tbSolrPort)
+ .addGroup(pnSolrSettingsLayout.createSequentialGroup()
+ .addComponent(lbTestSolrWarning)
+ .addGap(0, 0, Short.MAX_VALUE)))
+ .addContainerGap())
+ );
+ pnSolrSettingsLayout.setVerticalGroup(
+ pnSolrSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(pnSolrSettingsLayout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(pnSolrSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(pnSolrSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(bnTestSolr, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(lbSolrSettings))
+ .addComponent(lbTestSolr, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(tbSolrHostname, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(tbSolrPort, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(lbTestSolrWarning, javax.swing.GroupLayout.PREFERRED_SIZE, 16, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap())
+ );
+
+ pnMessagingSettings.setBorder(javax.swing.BorderFactory.createEtchedBorder());
+
+ lbMessageServiceSettings.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+ org.openide.awt.Mnemonics.setLocalizedText(lbMessageServiceSettings, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.lbMessageServiceSettings.text")); // NOI18N
+
+ tbMsgHostname.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+ tbMsgHostname.setText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbMsgHostname.text")); // NOI18N
+ tbMsgHostname.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbMsgHostname.toolTipText")); // NOI18N
+
+ tbMsgUsername.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+ tbMsgUsername.setText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbMsgUsername.text")); // NOI18N
+ tbMsgUsername.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbMsgUsername.toolTipText")); // NOI18N
+
+ tbMsgPort.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+ tbMsgPort.setText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbMsgPort.text")); // NOI18N
+ tbMsgPort.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbMsgPort.toolTipText")); // NOI18N
+
+ tbMsgPassword.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+ tbMsgPassword.setText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbMsgPassword.text")); // NOI18N
+ tbMsgPassword.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbMsgPassword.toolTipText")); // NOI18N
+
+ org.openide.awt.Mnemonics.setLocalizedText(bnTestMessageService, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.bnTestMessageService.text")); // NOI18N
+ bnTestMessageService.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ bnTestMessageServiceActionPerformed(evt);
+ }
+ });
+
+ org.openide.awt.Mnemonics.setLocalizedText(lbTestMessageService, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.lbTestMessageService.text")); // NOI18N
+
+ lbTestMessageWarning.setForeground(new java.awt.Color(255, 0, 0));
+ org.openide.awt.Mnemonics.setLocalizedText(lbTestMessageWarning, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.lbTestMessageWarning.text")); // NOI18N
+
+ javax.swing.GroupLayout pnMessagingSettingsLayout = new javax.swing.GroupLayout(pnMessagingSettings);
+ pnMessagingSettings.setLayout(pnMessagingSettingsLayout);
+ pnMessagingSettingsLayout.setHorizontalGroup(
+ pnMessagingSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(pnMessagingSettingsLayout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(pnMessagingSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(tbMsgHostname)
+ .addGroup(pnMessagingSettingsLayout.createSequentialGroup()
+ .addComponent(lbMessageServiceSettings)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 229, Short.MAX_VALUE)
+ .addComponent(bnTestMessageService)
+ .addGap(18, 18, 18)
+ .addComponent(lbTestMessageService, javax.swing.GroupLayout.PREFERRED_SIZE, 16, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(tbMsgPort)
+ .addComponent(tbMsgUsername)
+ .addComponent(tbMsgPassword)
+ .addGroup(pnMessagingSettingsLayout.createSequentialGroup()
+ .addComponent(lbTestMessageWarning)
+ .addGap(0, 0, Short.MAX_VALUE)))
+ .addContainerGap())
+ );
+ pnMessagingSettingsLayout.setVerticalGroup(
+ pnMessagingSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(pnMessagingSettingsLayout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(pnMessagingSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addGroup(pnMessagingSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(bnTestMessageService, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(lbMessageServiceSettings))
+ .addComponent(lbTestMessageService, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(tbMsgHostname, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(tbMsgPort, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(tbMsgUsername, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(tbMsgPassword, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(lbTestMessageWarning, javax.swing.GroupLayout.PREFERRED_SIZE, 16, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ );
+
+ org.openide.awt.Mnemonics.setLocalizedText(cbEnableMultiUser, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.cbEnableMultiUser.text")); // NOI18N
+ cbEnableMultiUser.addItemListener(new java.awt.event.ItemListener() {
+ public void itemStateChanged(java.awt.event.ItemEvent evt) {
+ cbEnableMultiUserItemStateChanged(evt);
+ }
+ });
+
+ tbOops.setEditable(false);
+ tbOops.setFont(new java.awt.Font("Tahoma", 1, 12)); // NOI18N
+ tbOops.setForeground(new java.awt.Color(255, 0, 0));
+ tbOops.setText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbOops.text")); // NOI18N
+ tbOops.setBorder(null);
+
+ javax.swing.GroupLayout pnOverallPanelLayout = new javax.swing.GroupLayout(pnOverallPanel);
+ pnOverallPanel.setLayout(pnOverallPanelLayout);
+ pnOverallPanelLayout.setHorizontalGroup(
+ pnOverallPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, pnOverallPanelLayout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(pnOverallPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addGroup(pnOverallPanelLayout.createSequentialGroup()
+ .addComponent(cbEnableMultiUser)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(tbOops))
+ .addComponent(pnSolrSettings, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(pnDatabaseSettings, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(pnMessagingSettings, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addContainerGap())
+ );
+ pnOverallPanelLayout.setVerticalGroup(
+ pnOverallPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, pnOverallPanelLayout.createSequentialGroup()
+ .addGroup(pnOverallPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+ .addComponent(tbOops, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(cbEnableMultiUser))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(pnDatabaseSettings, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(pnSolrSettings, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(pnMessagingSettings, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(39, Short.MAX_VALUE))
+ );
+
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
+ this.setLayout(layout);
+ layout.setHorizontalGroup(
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(pnOverallPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 555, javax.swing.GroupLayout.PREFERRED_SIZE)
+ );
+ layout.setVerticalGroup(
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(pnOverallPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 559, javax.swing.GroupLayout.PREFERRED_SIZE)
+ );
+ }// //GEN-END:initComponents
+
+ /**
+ * Enables/disables the multi-user settings, based upon input provided
+ *
+ * @param enabled true means enable, false means disable
+ */
+ private static void enableMultiUserComponents(Collection textFields, boolean enabled) {
+ for (JTextField textField : textFields) {
+ textField.setEnabled(enabled);
+ }
+ }
+
+ private void cbEnableMultiUserItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_cbEnableMultiUserItemStateChanged
+ if (!cbEnableMultiUser.isSelected()) {
+ tbOops.setText("");
+ bnTestDatabase.setEnabled(false);
+ lbTestDatabase.setIcon(null);
+ bnTestSolr.setEnabled(false);
+ lbTestSolr.setIcon(null);
+ bnTestMessageService.setEnabled(false);
+ lbTestMessageService.setIcon(null);
+ lbTestDbWarning.setText("");
+ lbTestSolrWarning.setText("");
+ lbTestMessageWarning.setText("");
+ }
+ enableMultiUserComponents(textBoxes, cbEnableMultiUser.isSelected());
+ controller.changed();
+ }//GEN-LAST:event_cbEnableMultiUserItemStateChanged
+
+ private void bnTestDatabaseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnTestDatabaseActionPerformed
+ lbTestDatabase.setIcon(null);
+ lbTestDbWarning.setText("");
+ setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+ try {
+ CaseDbConnectionInfo info = new CaseDbConnectionInfo(
+ this.tbDbHostname.getText().trim(),
+ this.tbDbPort.getText().trim(),
+ this.tbDbUsername.getText().trim(),
+ new String(this.tbDbPassword.getPassword()),
+ DbType.POSTGRESQL);
+
+ SleuthkitCase.tryConnect(info);
+ lbTestDatabase.setIcon(goodIcon);
+ lbTestDbWarning.setText("");
+ } catch (TskCoreException ex) {
+ lbTestDatabase.setIcon(badIcon);
+ lbTestDbWarning.setText(ex.getMessage());
+ } finally {
+ setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+ }
+ }//GEN-LAST:event_bnTestDatabaseActionPerformed
+
+ private void bnTestMessageServiceActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnTestMessageServiceActionPerformed
+ lbTestMessageService.setIcon(null);
+ lbTestMessageWarning.setText("");
+ setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+
+ int port;
+ try {
+ port = Integer.parseInt(this.tbMsgPort.getText().trim());
+ } catch (NumberFormatException ex) {
+ lbTestMessageService.setIcon(badIcon);
+ lbTestMessageWarning.setText(NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.InvalidPortNumber"));
+ return;
+ }
+
+ MessageServiceConnectionInfo info = new MessageServiceConnectionInfo(
+ this.tbMsgHostname.getText().trim(),
+ port,
+ this.tbMsgUsername.getText().trim(),
+ new String(this.tbMsgPassword.getPassword()));
+ try {
+ info.tryConnect();
+ lbTestMessageService.setIcon(goodIcon);
+ lbTestMessageWarning.setText("");
+ } catch (MessageServiceException ex) {
+ lbTestMessageService.setIcon(badIcon);
+ lbTestMessageWarning.setText(ex.getMessage());
+ } finally {
+ setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+ }
+ }//GEN-LAST:event_bnTestMessageServiceActionPerformed
+
+ private void bnTestSolrActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnTestSolrActionPerformed
+ lbTestSolr.setIcon(null);
+ lbTestSolrWarning.setText("");
+ setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+
+ KeywordSearchService kwsService = Lookup.getDefault().lookup(KeywordSearchService.class);
+ try {
+ if (kwsService != null) {
+ int port = Integer.parseInt(tbSolrPort.getText().trim());
+ kwsService.tryConnect(tbSolrHostname.getText().trim(), port);
+ lbTestSolr.setIcon(goodIcon);
+ lbTestSolrWarning.setText("");
+ } else {
+ lbTestSolr.setIcon(badIcon);
+ lbTestSolrWarning.setText(NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.KeywordSearchNull"));
+ }
+ } catch (NumberFormatException ex) {
+ lbTestSolr.setIcon(badIcon);
+ lbTestSolrWarning.setText(NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.InvalidPortNumber"));
+ } catch (KeywordSearchServiceException ex) {
+ lbTestSolr.setIcon(badIcon);
+ lbTestSolrWarning.setText(ex.getMessage());
+ } finally {
+ setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+ }
+ }//GEN-LAST:event_bnTestSolrActionPerformed
+
+ void load() {
+ lbTestDatabase.setIcon(null);
+ lbTestSolr.setIcon(null);
+ lbTestMessageService.setIcon(null);
+ lbTestDbWarning.setText("");
+ lbTestSolrWarning.setText("");
+ lbTestMessageWarning.setText("");
+
+ try {
+ CaseDbConnectionInfo dbInfo = UserPreferences.getDatabaseConnectionInfo();
+ tbDbHostname.setText(dbInfo.getHost().trim());
+ tbDbPort.setText(dbInfo.getPort().trim());
+ tbDbUsername.setText(dbInfo.getUserName().trim());
+ tbDbPassword.setText(dbInfo.getPassword());
+ } catch (UserPreferencesException ex) {
+ logger.log(Level.SEVERE, "Error accessing case database connection info", ex); //NON-NLS
+ }
+
+ try {
+ MessageServiceConnectionInfo msgServiceInfo = UserPreferences.getMessageServiceConnectionInfo();
+ tbMsgHostname.setText(msgServiceInfo.getHost().trim());
+ tbMsgPort.setText(Integer.toString(msgServiceInfo.getPort()));
+ tbMsgUsername.setText(msgServiceInfo.getUserName().trim());
+ tbMsgPassword.setText(msgServiceInfo.getPassword());
+ } catch (UserPreferencesException ex) {
+ logger.log(Level.SEVERE, "Error accessing case database connection info", ex); //NON-NLS
+ }
+
+ String indexingServerHost = UserPreferences.getIndexingServerHost().trim();
+ if (!indexingServerHost.isEmpty()) {
+ tbSolrHostname.setText(indexingServerHost);
+ }
+ String indexingServerPort = UserPreferences.getIndexingServerPort().trim();
+ if (portNumberIsValid(indexingServerPort)) {
+ tbSolrPort.setText(indexingServerPort);
+ }
+
+ lbTestDatabase.setIcon(null);
+ lbTestSolr.setIcon(null);
+ lbTestMessageService.setIcon(null);
+
+ bnTestDatabase.setEnabled(false);
+ bnTestSolr.setEnabled(false);
+ bnTestMessageService.setEnabled(false);
+
+ cbEnableMultiUser.setSelected(UserPreferences.getIsMultiUserModeEnabled());
+ this.valid(); // trigger validation to enable buttons based on current settings
+ }
+
+ /**
+ * Tests whether or not values have been entered in all of the database
+ * settings text fields.
+ *
+ * @return True or false.
+ */
+ private boolean databaseFieldsArePopulated() {
+ return !tbDbHostname.getText().trim().isEmpty()
+ && !tbDbPort.getText().trim().isEmpty()
+ && !tbDbUsername.getText().trim().isEmpty()
+ && tbDbPassword.getPassword().length != 0;
+ }
+
+ /**
+ * Tests whether or not values have been entered in all of the Solr settings
+ * text fields.
+ *
+ * @return True or false.
+ */
+ private boolean solrFieldsArePopulated() {
+ return !tbSolrHostname.getText().trim().isEmpty()
+ && !tbSolrPort.getText().trim().isEmpty();
+ }
+
+ /**
+ * Tests whether or not values have been entered in all of the message
+ * service settings text fields.
+ *
+ * @return True or false.
+ */
+ private boolean messageServiceFieldsArePopulated() {
+ return !tbMsgHostname.getText().trim().isEmpty()
+ && !tbMsgPort.getText().trim().isEmpty()
+ && !tbMsgUsername.getText().trim().isEmpty()
+ && tbMsgPassword.getPassword().length != 0;
+ }
+
+ void store() {
+ DbType dbType = DbType.SQLITE;
+
+ if (cbEnableMultiUser.isSelected()) {
+ dbType = DbType.POSTGRESQL;
+ }
+
+ UserPreferences.setIsMultiUserModeEnabled(cbEnableMultiUser.isSelected());
+
+ CaseDbConnectionInfo info = new CaseDbConnectionInfo(
+ tbDbHostname.getText().trim(),
+ tbDbPort.getText().trim(),
+ tbDbUsername.getText().trim(),
+ new String(tbDbPassword.getPassword()),
+ dbType);
+
+ try {
+ UserPreferences.setDatabaseConnectionInfo(info);
+ } catch (UserPreferencesException ex) {
+ logger.log(Level.SEVERE, "Error accessing case database connection info", ex); //NON-NLS
+ }
+
+ int port = 0;
+ try {
+ port = Integer.parseInt(this.tbMsgPort.getText().trim());
+ } catch (NumberFormatException ex) {
+ logger.log(Level.SEVERE, "Bad port setting", ex);
+ }
+
+ MessageServiceConnectionInfo msgServiceInfo = new MessageServiceConnectionInfo(
+ tbMsgHostname.getText().trim(),
+ port,
+ tbMsgUsername.getText().trim(),
+ new String(tbMsgPassword.getPassword()));
+
+ try {
+ UserPreferences.setMessageServiceConnectionInfo(msgServiceInfo);
+ } catch (UserPreferencesException ex) {
+ logger.log(Level.SEVERE, "Error accessing messaging service connection info", ex); //NON-NLS
+ }
+
+ UserPreferences.setIndexingServerHost(tbSolrHostname.getText().trim());
+ UserPreferences.setIndexingServerPort(Integer.parseInt(tbSolrPort.getText().trim()));
+
+ }
+
+ /**
+ * Validates that the form is filled out correctly for our usage.
+ *
+ * @return true if it's okay, false otherwise.
+ */
+ boolean valid() {
+ tbOops.setText("");
+
+ if (cbEnableMultiUser.isSelected()) {
+ return checkFieldsAndEnableButtons()
+ && databaseSettingsAreValid()
+ && indexingServerSettingsAreValid()
+ && messageServiceSettingsAreValid();
+ } else {
+ return true;
+ }
+ }
+
+ /**
+ * Tests whether or not all of the settings components are populated and
+ * sets the test buttons appropriately.
+ *
+ * @return True or false.
+ */
+ boolean checkFieldsAndEnableButtons() {
+ boolean result = true;
+
+ boolean dbPopulated = databaseFieldsArePopulated();
+ boolean solrPopulated = solrFieldsArePopulated();
+ boolean messageServicePopulated = messageServiceFieldsArePopulated();
+
+ // PostgreSQL Database
+ bnTestDatabase.setEnabled(dbPopulated);
+
+ // Solr Indexing
+ bnTestSolr.setEnabled(solrPopulated);
+
+ // ActiveMQ Messaging
+ bnTestMessageService.setEnabled(messageServicePopulated);
+
+ if (!dbPopulated || !solrPopulated || !messageServicePopulated) {
+ // We don't even have everything filled out
+ result = false;
+ tbOops.setText(INCOMPLETE_SETTINGS_MSG);
+ }
+ return result;
+ }
+
+ /**
+ * Tests whether or not the database settings are valid.
+ *
+ * @return True or false.
+ */
+ boolean databaseSettingsAreValid() {
+ if (portNumberIsValid(tbDbPort.getText().trim())) {
+ return true;
+ } else {
+ tbOops.setText(INVALID_DB_PORT_MSG);
+ return false;
+ }
+ }
+
+ /**
+ * Tests whether or not the message service settings are valid.
+ *
+ * @return True or false.
+ */
+ boolean messageServiceSettingsAreValid() {
+ if (!portNumberIsValid(tbMsgPort.getText().trim())) {
+ tbOops.setText(INVALID_MESSAGE_SERVICE_PORT_MSG);
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Tests whether or not the indexing server settings are valid.
+ *
+ * @return True or false.
+ */
+ boolean indexingServerSettingsAreValid() {
+ if (!portNumberIsValid(tbSolrPort.getText().trim())) {
+ tbOops.setText(INVALID_INDEXING_SERVER_PORT_MSG);
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Determines whether or not a port number is within the range of valid port
+ * numbers.
+ *
+ * @param portNumber The port number as a string.
+ *
+ * @return True or false.
+ */
+ private static boolean portNumberIsValid(String portNumber) {
+ try {
+ int value = Integer.parseInt(portNumber);
+ if (value < 0 || value > 65535) { // invalid port numbers
+ return false;
+ }
+ } catch (NumberFormatException detailsNotImportant) {
+ return false;
+ }
+ return true;
+ }
+
+ // Variables declaration - do not modify//GEN-BEGIN:variables
+ private javax.swing.JButton bnTestDatabase;
+ private javax.swing.JButton bnTestMessageService;
+ private javax.swing.JButton bnTestSolr;
+ private javax.swing.JCheckBox cbEnableMultiUser;
+ private javax.swing.JLabel lbDatabaseSettings;
+ private javax.swing.JLabel lbMessageServiceSettings;
+ private javax.swing.JLabel lbSolrSettings;
+ private javax.swing.JLabel lbTestDatabase;
+ private javax.swing.JLabel lbTestDbWarning;
+ private javax.swing.JLabel lbTestMessageService;
+ private javax.swing.JLabel lbTestMessageWarning;
+ private javax.swing.JLabel lbTestSolr;
+ private javax.swing.JLabel lbTestSolrWarning;
+ private javax.swing.JPanel pnDatabaseSettings;
+ private javax.swing.JPanel pnMessagingSettings;
+ private javax.swing.JPanel pnOverallPanel;
+ private javax.swing.JPanel pnSolrSettings;
+ private javax.swing.JTextField tbDbHostname;
+ private javax.swing.JPasswordField tbDbPassword;
+ private javax.swing.JTextField tbDbPort;
+ private javax.swing.JTextField tbDbUsername;
+ private javax.swing.JTextField tbMsgHostname;
+ private javax.swing.JPasswordField tbMsgPassword;
+ private javax.swing.JTextField tbMsgPort;
+ private javax.swing.JTextField tbMsgUsername;
+ private javax.swing.JTextField tbOops;
+ private javax.swing.JTextField tbSolrHostname;
+ private javax.swing.JTextField tbSolrPort;
+ // End of variables declaration//GEN-END:variables
+
+ /**
+ * Used to listen for changes in text boxes. It lets the panel know things
+ * have been updated and that validation needs to happen.
+ */
+ class TextBoxChangedListener implements DocumentListener {
+
+ @Override
+ public void changedUpdate(DocumentEvent e) {
+ Object statusIcon = e.getDocument().getProperty("statusIcon");
+ if (statusIcon != null) {
+ ((javax.swing.JLabel) statusIcon).setIcon(null);
+ }
+ controller.changed();
+ }
+
+ @Override
+ public void insertUpdate(DocumentEvent e) {
+ Object statusIcon = e.getDocument().getProperty("statusIcon");
+ if (statusIcon != null) {
+ ((javax.swing.JLabel) statusIcon).setIcon(null);
+ }
+ controller.changed();
+ }
+
+ @Override
+ public void removeUpdate(DocumentEvent e) {
+ Object statusIcon = e.getDocument().getProperty("statusIcon");
+ if (statusIcon != null) {
+ ((javax.swing.JLabel) statusIcon).setIcon(null);
+ }
+ controller.changed();
+ }
+ }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanelController.java b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanelController.java
new file mode 100644
index 0000000000..80b3f9bb58
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanelController.java
@@ -0,0 +1,130 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2013-2014 Basis Technology Corp.
+ * Contact: carrier sleuthkit org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.corecomponents;
+
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import javax.swing.JComponent;
+import org.netbeans.spi.options.OptionsPanelController;
+import org.openide.util.HelpCtx;
+import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
+import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
+import java.util.logging.Level;
+import org.sleuthkit.autopsy.coreutils.Logger;
+
+@OptionsPanelController.TopLevelRegistration(categoryName = "#OptionsCategory_Name_Multi_User_Settings",
+ iconBase = "org/sleuthkit/autopsy/images/User-Group-icon-green32.png",
+ position = 2,
+ keywords = "#OptionsCategory_Keywords_Multi_User_Options",
+ keywordsCategory = "Multi-user")
+public final class MultiUserSettingsPanelController extends OptionsPanelController {
+
+ private MultiUserSettingsPanel panel;
+ private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
+ private boolean changed;
+ private static final Logger logger = Logger.getLogger(MultiUserSettingsPanelController.class.getName());
+
+ @Override
+ public void update() {
+ getPanel().load();
+ changed = false;
+ }
+
+ @Override
+ public void applyChanges() {
+ getPanel().store();
+ changed = false;
+ }
+
+ @Override
+ public void cancel() {
+ }
+
+ @Override
+ public boolean isValid() {
+ return getPanel().valid();
+ }
+
+ @Override
+ public boolean isChanged() {
+ return changed;
+ }
+
+ @Override
+ public HelpCtx getHelpCtx() {
+ return null;
+ }
+
+ @Override
+ public JComponent getComponent(Lookup masterLookup) {
+ return getPanel();
+ }
+
+ @Override
+ public void addPropertyChangeListener(PropertyChangeListener l) {
+ if (pcs.getPropertyChangeListeners().length == 0) {
+ pcs.addPropertyChangeListener(l);
+ }
+ }
+
+ @Override
+ public void removePropertyChangeListener(PropertyChangeListener l) {
+ /**
+ * Note the NetBeans Framework does not appear to call this at all. We
+ * are using NetBeans 7.3.1 Build 201306052037. Perhaps in a future
+ * version of the Framework this will be resolved, but for now, simply
+ * don't unregister anything and add one time only in the
+ * addPropertyChangeListener() method above.
+ */
+ }
+
+ private MultiUserSettingsPanel getPanel() {
+ if (panel == null) {
+ panel = new MultiUserSettingsPanel(this);
+ }
+ return panel;
+ }
+
+ void changed() {
+ if (!changed) {
+ changed = true;
+
+ try {
+ pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, false, true);
+ } catch (Exception e) {
+ logger.log(Level.SEVERE, "GeneralOptionsPanelController listener threw exception", e); //NON-NLS
+ MessageNotifyUtil.Notify.show(
+ NbBundle.getMessage(this.getClass(), "GeneralOptionsPanelController.moduleErr"),
+ NbBundle.getMessage(this.getClass(), "GeneralOptionsPanelController.moduleErr.msg"),
+ MessageNotifyUtil.MessageType.ERROR);
+ }
+ }
+
+ try {
+ pcs.firePropertyChange(OptionsPanelController.PROP_VALID, null, null);
+ } catch (Exception e) {
+ logger.log(Level.SEVERE, "GeneralOptionsPanelController listener threw exception", e); //NON-NLS
+ MessageNotifyUtil.Notify.show(
+ NbBundle.getMessage(this.getClass(), "GeneralOptionsPanelController.moduleErr"),
+ NbBundle.getMessage(this.getClass(), "GeneralOptionsPanelController.moduleErr.msg"),
+ MessageNotifyUtil.MessageType.ERROR);
+ }
+ }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/OfflineHelpAction.java b/Core/src/org/sleuthkit/autopsy/corecomponents/OfflineHelpAction.java
index 2ab921907f..e06d61d778 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/OfflineHelpAction.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/OfflineHelpAction.java
@@ -33,7 +33,7 @@ import org.openide.awt.HtmlBrowser;
import org.openide.util.NbBundle;
import org.openide.util.NbBundle.Messages;
import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.sleuthkit.autopsy.coreutils.Logger;
/**
* Implements a hyperlink to the Offline Documentation.
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/OnlineHelpAction.java b/Core/src/org/sleuthkit/autopsy/corecomponents/OnlineHelpAction.java
index d9190fa51b..aa23919d22 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/OnlineHelpAction.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/OnlineHelpAction.java
@@ -35,7 +35,7 @@ import org.openide.util.NbBundle;
import org.openide.util.NbBundle.Messages;
import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.sleuthkit.autopsy.coreutils.Logger;
/**
* Implements a hyperlink to the Online Documentation.
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/TextPrompt.java b/Core/src/org/sleuthkit/autopsy/corecomponents/TextPrompt.java
new file mode 100644
index 0000000000..01e035bfdf
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/TextPrompt.java
@@ -0,0 +1,206 @@
+package org.sleuthkit.autopsy.corecomponents;
+
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+import javax.swing.border.*;
+import javax.swing.event.*;
+import javax.swing.text.*;
+
+/**
+ * The TextPrompt class will display a prompt over top of a text component when
+ * the Document of the text field is empty. The Show property is used to
+ * determine the visibility of the prompt.
+ *
+ * The Font and foreground Color of the prompt will default to those properties
+ * of the parent text component. You are free to change the properties after
+ * class construction. From:
+ * https://tips4java.wordpress.com/2009/11/29/text-prompt/
+ */
+public final class TextPrompt extends JLabel
+ implements FocusListener, DocumentListener {
+
+ public enum Show {
+
+ ALWAYS,
+ FOCUS_GAINED,
+ FOCUS_LOST;
+ }
+
+ private JTextComponent component;
+ private Document document;
+
+ private Show show;
+ private boolean showPromptOnce;
+ private int focusLost;
+
+ public TextPrompt(String text, JTextComponent component) {
+ this(text, component, Show.ALWAYS);
+ }
+
+ public TextPrompt(String text, JTextComponent component, Show show) {
+ this.component = component;
+ setShow(show);
+ document = component.getDocument();
+
+ setText(text);
+ setFont(component.getFont());
+ setForeground(component.getForeground());
+ setBorder(new EmptyBorder(component.getInsets()));
+ setHorizontalAlignment(JLabel.LEADING);
+
+ component.addFocusListener(this);
+ document.addDocumentListener(this);
+
+ component.setLayout(new BorderLayout());
+ component.add(this);
+ checkForPrompt();
+ }
+
+ /**
+ * Convenience method to change the alpha value of the current foreground
+ * Color to the specifice value.
+ *
+ * @param alpha value in the range of 0 - 1.0.
+ */
+ public void changeAlpha(float alpha) {
+ changeAlpha((int) (alpha * 255));
+ }
+
+ /**
+ * Convenience method to change the alpha value of the current foreground
+ * Color to the specifice value.
+ *
+ * @param alpha value in the range of 0 - 255.
+ */
+ public void changeAlpha(int alpha) {
+ alpha = alpha > 255 ? 255 : alpha < 0 ? 0 : alpha;
+
+ Color foreground = getForeground();
+ int red = foreground.getRed();
+ int green = foreground.getGreen();
+ int blue = foreground.getBlue();
+
+ Color withAlpha = new Color(red, green, blue, alpha);
+ super.setForeground(withAlpha);
+ }
+
+ /**
+ * Convenience method to change the style of the current Font. The style
+ * values are found in the Font class. Common values might be: Font.BOLD,
+ * Font.ITALIC and Font.BOLD + Font.ITALIC.
+ *
+ * @param style value representing the the new style of the Font.
+ */
+ public void changeStyle(int style) {
+ setFont(getFont().deriveFont(style));
+ }
+
+ /**
+ * Get the Show property
+ *
+ * @return the Show property.
+ */
+ public Show getShow() {
+ return show;
+ }
+
+ /**
+ * Set the prompt Show property to control when the promt is shown. Valid
+ * values are:
+ *
+ * Show.AWLAYS (default) - always show the prompt Show.Focus_GAINED - show
+ * the prompt when the component gains focus (and hide the prompt when focus
+ * is lost) Show.Focus_LOST - show the prompt when the component loses focus
+ * (and hide the prompt when focus is gained)
+ *
+ * @param show a valid Show enum
+ */
+ public void setShow(Show show) {
+ this.show = show;
+ }
+
+ /**
+ * Get the showPromptOnce property
+ *
+ * @return the showPromptOnce property.
+ */
+ public boolean getShowPromptOnce() {
+ return showPromptOnce;
+ }
+
+ /**
+ * Show the prompt once. Once the component has gained/lost focus once, the
+ * prompt will not be shown again.
+ *
+ * @param showPromptOnce when true the prompt will only be shown once,
+ * otherwise it will be shown repeatedly.
+ */
+ public void setShowPromptOnce(boolean showPromptOnce) {
+ this.showPromptOnce = showPromptOnce;
+ }
+
+ /**
+ * Check whether the prompt should be visible or not. The visibility will
+ * change on updates to the Document and on focus changes.
+ */
+ private void checkForPrompt() {
+ // Text has been entered, remove the prompt
+
+ if (document.getLength() > 0) {
+ setVisible(false);
+ return;
+ }
+
+ // Prompt has already been shown once, remove it
+ if (showPromptOnce && focusLost > 0) {
+ setVisible(false);
+ return;
+ }
+
+ // Check the Show property and component focus to determine if the
+ // prompt should be displayed.
+ if (component.hasFocus()) {
+ if (show == Show.ALWAYS
+ || show == Show.FOCUS_GAINED) {
+ setVisible(true);
+ } else {
+ setVisible(false);
+ }
+ } else {
+ if (show == Show.ALWAYS
+ || show == Show.FOCUS_LOST) {
+ setVisible(true);
+ } else {
+ setVisible(false);
+ }
+ }
+ }
+
+// Implement FocusListener
+ @Override
+ public void focusGained(FocusEvent e) {
+ checkForPrompt();
+ }
+
+ @Override
+ public void focusLost(FocusEvent e) {
+ focusLost++;
+ checkForPrompt();
+ }
+
+// Implement DocumentListener
+ @Override
+ public void insertUpdate(DocumentEvent e) {
+ checkForPrompt();
+ }
+
+ @Override
+ public void removeUpdate(DocumentEvent e) {
+ checkForPrompt();
+ }
+
+ @Override
+ public void changedUpdate(DocumentEvent e) {
+ }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/checkbox32.png b/Core/src/org/sleuthkit/autopsy/corecomponents/checkbox32.png
new file mode 100644
index 0000000000..e7a371fcbf
Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/corecomponents/checkbox32.png differ
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/AutopsyExceptionHandler.java b/Core/src/org/sleuthkit/autopsy/coreutils/AutopsyExceptionHandler.java
index 405cf3705d..3b7c333bc3 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/AutopsyExceptionHandler.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/AutopsyExceptionHandler.java
@@ -18,14 +18,12 @@
*/
package org.sleuthkit.autopsy.coreutils;
-import java.awt.Component;
import java.util.logging.Filter;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.SimpleFormatter;
import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
import org.openide.util.lookup.ServiceProvider;
import org.netbeans.core.NbErrorManager;
@@ -62,32 +60,12 @@ public class AutopsyExceptionHandler extends Handler {
public void publish(LogRecord record) {
if (isLoggable(record)) {
+ final String title = getTitleForLevelValue(record.getLevel().intValue());
+ final String message = formatExplanation(record);
if (record.getMessage() != null) {
// Throwable was anticipated, caught and logged. Display log message and throwable message.
-
- final int levelValue = record.getLevel().intValue();
-
- final Component parentComponent = null; // Use default window frame.
- final String message = formatExplanation(record);
- final String title = getTitleForLevelValue(levelValue);
- final int messageType = getMessageTypeForLevelValue(levelValue);
-
- // publish() was probably not called from the EDT, so run the message box there instead of here.
- //only show the dialog in dev builds
- if (buildType == Version.Type.DEVELOPMENT) {
- SwingUtilities.invokeLater(new Runnable() {
-
- @Override
- public void run() {
- JOptionPane.showMessageDialog(
- parentComponent,
- message,
- title,
- messageType);
- }
- });
- }
+ MessageNotifyUtil.Notify.error(title, message);
logger.log(Level.SEVERE, "Unexpected error: " + title + ", " + message); //NON-NLS
} else {
// Throwable (unanticipated) error. Use built-in exception handler to offer details, stacktrace.
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java
index e63dd38fb8..b0a04d0d56 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java
@@ -28,6 +28,7 @@ import java.util.Date;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
+import org.sleuthkit.autopsy.core.UserPreferences;
/**
* Executes a command line using an operating system process with a configurable
@@ -41,7 +42,10 @@ public final class ExecUtil {
/**
* The execute() methods do a wait() with a timeout on the executing process
* and query a process terminator each time the timeout expires to determine
- * whether or not to kill the process.
+ * whether or not to kill the process. See
+ * DataSourceIngestModuleProcessTerminator and
+ * FileIngestModuleProcessTerminator as examples of ProcessTerminator
+ * implementations.
*/
public interface ProcessTerminator {
@@ -74,6 +78,24 @@ public final class ExecUtil {
this.startTimeInSeconds = (new Date().getTime()) / 1000;
}
+ /**
+ * Creates a process terminator that can be used to kill a process after
+ * it has run for a given period of time. Maximum allowable run time is
+ * set via Autopsy Options panel. If the process termination
+ * functionality is disabled then the maximum allowable time is set to
+ * MAX_INT seconds.
+ */
+ public TimedProcessTerminator() {
+ if (UserPreferences.getIsTimeOutEnabled() && UserPreferences.getProcessTimeOutHrs() > 0) {
+ // user specified time out
+ this.maxRunTimeInSeconds = UserPreferences.getProcessTimeOutHrs() * 3600;
+ } else {
+ // never time out
+ this.maxRunTimeInSeconds = Long.MAX_VALUE;
+ }
+ this.startTimeInSeconds = (new Date().getTime()) / 1000;
+ }
+
/**
* @inheritDoc
*/
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/FileUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/FileUtil.java
index 5540fd8ef4..71494eae68 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/FileUtil.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/FileUtil.java
@@ -163,8 +163,8 @@ public class FileUtil {
* @return escaped string
*/
public static String escapeFileName(String fileName) {
- //for now escaping / (not valid in file name, at least on Windows)
- //with underscores. Windows/Java seem to ignore \\/ and \\\\/ escapings
- return fileName.replaceAll("/", "_");
+ //for now escaping /:"*?<>| (not valid in file name, at least on Windows)
+ //with underscores. We are only keeping \ as it could be part of the path.
+ return fileName.replaceAll("[/:\"*?<>|]+", "_");
}
}
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/History.java b/Core/src/org/sleuthkit/autopsy/coreutils/History.java
index 50abf7e5cf..409cfe0006 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/History.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/History.java
@@ -18,6 +18,7 @@
*/
package org.sleuthkit.autopsy.coreutils;
+import java.util.Deque;
import java.util.Objects;
import javafx.beans.property.Property;
import javafx.beans.property.ReadOnlyBooleanProperty;
@@ -143,7 +144,6 @@ public class History {
* @throws IllegalArgumentException if newState == null
*/
synchronized public void advance(T newState) throws IllegalArgumentException {
-
if (newState != null && Objects.equals(currentState.get(), newState) == false) {
if (currentState.get() != null) {
historyStack.push(currentState.get());
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java b/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java
index 26fffc6319..c9e337a29c 100755
--- a/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java
@@ -56,7 +56,6 @@ import org.sleuthkit.datamodel.ReadContentInputStream;
import org.sleuthkit.datamodel.TskCoreException;
/**
- *
* Utilities for working with Images and creating thumbnails. Reuses thumbnails
* by storing them in the case's cache directory.
*/
@@ -140,9 +139,6 @@ public class ImageUtils {
= Executors.newSingleThreadExecutor(new BasicThreadFactory.Builder()
.namingPattern("icon saver-%d").build());
- private ImageUtils() {
- }
-
public static List getSupportedImageExtensions() {
return Collections.unmodifiableList(SUPPORTED_IMAGE_EXTENSIONS);
}
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java b/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java
index e0ef048b13..dd2508a15d 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java
@@ -1,7 +1,7 @@
/*
* Autopsy Forensic Browser
*
- * Copyright 2012-2014 Basis Technology Corp.
+ * Copyright 2012-2015 Basis Technology Corp.
* Contact: carrier sleuthkit org
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,17 +18,20 @@
*/
package org.sleuthkit.autopsy.coreutils;
-import java.io.File;
import java.io.IOException;
+import java.nio.file.Paths;
import java.util.logging.FileHandler;
import java.util.logging.Formatter;
import java.util.logging.Handler;
import java.sql.Timestamp;
import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
import java.util.logging.LogRecord;
/**
* Autopsy specialization of the Java Logger class with custom file handlers.
+ * Note that the custom loggers are not obtained from the global log manager.
*/
public final class Logger extends java.util.logging.Logger {
@@ -37,66 +40,81 @@ public final class Logger extends java.util.logging.Logger {
private static final int LOG_FILE_COUNT = 10;
private static final String LOG_WITHOUT_STACK_TRACES = "autopsy.log"; //NON-NLS
private static final String LOG_WITH_STACK_TRACES = "autopsy_traces.log"; //NON-NLS
- private static final Handler console = new java.util.logging.ConsoleHandler();
- private static final Object fileHandlerLock = new Object();
- private static FileHandler userFriendlyLogFile = createFileHandler(PlatformUtil.getLogDirectory(), LOG_WITHOUT_STACK_TRACES);
- private static FileHandler developersLogFile = createFileHandler(PlatformUtil.getLogDirectory(), LOG_WITH_STACK_TRACES);
+ private static final Map namesToLoggers = new HashMap<>();
+ private static final Handler consoleHandler = new java.util.logging.ConsoleHandler();
+ private static FileHandler userFriendlyHandler = createFileHandlerWithoutTraces(PlatformUtil.getLogDirectory());
+ private static FileHandler developerFriendlyHandler = createFileHandlerWithTraces(PlatformUtil.getLogDirectory());
- private static FileHandler createFileHandler(String logDirectory, String fileName) {
+ /**
+ * Creates a custom file handler with a custom message formatter that does
+ * not include stack traces.
+ *
+ * @param logDirectory The directory where the log files should reside.
+ *
+ * @return A custom file handler.
+ */
+ private static FileHandler createFileHandlerWithoutTraces(String logDirectory) {
+ String logFilePath = Paths.get(logDirectory, LOG_WITHOUT_STACK_TRACES).toString();
try {
- FileHandler f = new FileHandler(logDirectory + File.separator + fileName, LOG_SIZE, LOG_FILE_COUNT);
- f.setEncoding(LOG_ENCODING);
- switch (fileName) {
- case LOG_WITHOUT_STACK_TRACES:
- f.setFormatter(new Formatter() {
- @Override
- public String format(LogRecord record) {
- synchronized (fileHandlerLock) {
- return (new Date(record.getMillis())).toString() + " "
- + record.getSourceClassName() + " "
- + record.getSourceMethodName() + "\n"
- + record.getLevel() + ": "
- + this.formatMessage(record) + "\n";
- }
- }
- });
- break;
- case LOG_WITH_STACK_TRACES:
- f.setFormatter(new Formatter() {
- @Override
- public String format(LogRecord record) {
- synchronized (fileHandlerLock) {
- if (record.getThrown() != null) {
+ FileHandler fileHandler = new FileHandler(logFilePath, LOG_SIZE, LOG_FILE_COUNT);
+ fileHandler.setEncoding(LOG_ENCODING);
+ fileHandler.setFormatter(new Formatter() {
+ @Override
+ public String format(LogRecord record) {
+ return (new Date(record.getMillis())).toString() + " "
+ + record.getSourceClassName() + " "
+ + record.getSourceMethodName() + "\n"
+ + record.getLevel() + ": "
+ + this.formatMessage(record) + "\n";
+ }
+ });
+ return fileHandler;
+ } catch (IOException ex) {
+ throw new RuntimeException(String.format("Error initializing file handler for %s", logFilePath), ex); //NON-NLS
+ }
+ }
- StackTraceElement ele[] = record.getThrown().getStackTrace();
- String StackTrace = "";
- for (StackTraceElement ele1 : ele) {
- StackTrace += "\t" + ele1.toString() + "\n";
- }
-
- return (new Timestamp(record.getMillis())).toString() + " "
- + record.getSourceClassName() + " "
- + record.getSourceMethodName() + "\n"
- + record.getLevel() + ": "
- + this.formatMessage(record) + "\n"
- + record.getThrown().toString() + ":\n"
- + StackTrace
- + "\n";
- } else {
- return (new Timestamp(record.getMillis())).toString() + " "
- + record.getSourceClassName() + " "
- + record.getSourceMethodName() + "\n"
- + record.getLevel() + ": "
- + this.formatMessage(record) + "\n";
- }
- }
+ /**
+ * Creates a custom file handler with a custom message formatter that
+ * incldues stack traces.
+ *
+ * @param logDirectory The directory where the log files should reside.
+ *
+ * @return A custom file handler.
+ */
+ private static FileHandler createFileHandlerWithTraces(String logDirectory) {
+ String logFilePath = Paths.get(logDirectory, LOG_WITH_STACK_TRACES).toString();
+ try {
+ FileHandler fileHandler = new FileHandler(logFilePath, LOG_SIZE, LOG_FILE_COUNT);
+ fileHandler.setEncoding(LOG_ENCODING);
+ fileHandler.setFormatter(new Formatter() {
+ @Override
+ public String format(LogRecord record) {
+ if (record.getThrown() != null) {
+ String stackTrace = ""; //NON-NLS
+ for (StackTraceElement traceElem : record.getThrown().getStackTrace()) {
+ stackTrace += "\t" + traceElem.toString() + "\n"; //NON-NLS
}
- });
- break;
- }
- return f;
- } catch (IOException e) {
- throw new RuntimeException("Error initializing " + fileName + " file handler", e); //NON-NLS
+ return (new Timestamp(record.getMillis())).toString() + " " //NON-NLS
+ + record.getSourceClassName() + " " //NON-NLS
+ + record.getSourceMethodName() + "\n" //NON-NLS
+ + record.getLevel() + ": " //NON-NLS
+ + this.formatMessage(record) + "\n" //NON-NLS
+ + record.getThrown().toString() + ":\n" //NON-NLS
+ + stackTrace
+ + "\n"; //NON-NLS
+ } else {
+ return (new Timestamp(record.getMillis())).toString() + " " //NON-NLS
+ + record.getSourceClassName() + " " //NON-NLS
+ + record.getSourceMethodName() + "\n" //NON-NLS
+ + record.getLevel() + ": " //NON-NLS
+ + this.formatMessage(record) + "\n"; //NON-NLS
+ }
+ }
+ });
+ return fileHandler;
+ } catch (IOException ex) {
+ throw new RuntimeException(String.format("Error initializing file handler for %s", logFilePath), ex); //NON-NLS
}
}
@@ -105,63 +123,88 @@ public final class Logger extends java.util.logging.Logger {
*
* @param directoryPath The path to the desired log directory as a string.
*/
- public static void setLogDirectory(String directoryPath) {
- if (null != directoryPath && !directoryPath.isEmpty()) {
- File directory = new File(directoryPath);
- if (directory.exists() && directory.canWrite()) {
- synchronized (fileHandlerLock) {
- userFriendlyLogFile.close();
- userFriendlyLogFile = createFileHandler(directoryPath, LOG_WITHOUT_STACK_TRACES);
- developersLogFile.close();
- developersLogFile = createFileHandler(directoryPath, LOG_WITH_STACK_TRACES);
- }
- }
+ synchronized public static void setLogDirectory(String directoryPath) {
+ /*
+ * Create file handlers for the new directory and swap them into all of
+ * the existing loggers using thread-safe Logger methods. The new
+ * handlers are added before the old handlers so that no messages will
+ * be lost, but this makes it possible for log messages to be written
+ * via the old handlers if logging calls are interleaved with the
+ * add/remove handler calls (currently, the base class handlers
+ * collection is a CopyOnWriteArrayList).
+ */
+ FileHandler newUserFriendlyHandler = createFileHandlerWithoutTraces(directoryPath);
+ FileHandler newDeveloperFriendlyHandler = createFileHandlerWithTraces(directoryPath);
+ for (Logger logger : namesToLoggers.values()) {
+ logger.addHandler(newUserFriendlyHandler);
+ logger.addHandler(newDeveloperFriendlyHandler);
+ logger.removeHandler(userFriendlyHandler);
+ logger.removeHandler(userFriendlyHandler);
}
+
+ /*
+ * Close the old file handlers and save references to the new handlers
+ * so they can be added to any new loggers. This swap is why this method
+ * and the two overloads of getLogger() are synchronized, serializing
+ * access to userFriendlyHandler and developerFriendlyHandler.
+ */
+ userFriendlyHandler.close();
+ userFriendlyHandler = newUserFriendlyHandler;
+ developerFriendlyHandler.close();
+ developerFriendlyHandler = newDeveloperFriendlyHandler;
}
/**
- * Factory method to retrieve a org.sleuthkit.autopsy.coreutils.Logger
- * instance derived from java.util.logging.Logger. Hides the base class
- * factory method.
+ * Finds or creates a customized logger. Hides the base class factory
+ * method.
*
- * @param name A name for the logger. This should be a dot-separated name
- * and should normally be based on the package name or class
- * name.
+ * @param name A name for the logger. This should normally be a
+ * dot-separated name based on a package name or class name.
*
* @return org.sleuthkit.autopsy.coreutils.Logger instance
*/
- public static Logger getLogger(String name) {
- return new Logger(name, null);
+ synchronized public static Logger getLogger(String name) {
+ return getLogger(name, null);
}
/**
- * Factory method to retrieve a org.sleuthkit.autopsy.coreutils.Logger
- * instance derived from java.util.logging.Logger. Hides the base class
- * factory method.
+ * Finds or creates a customized logger. Hides the base class factory
+ * method.
*
- * @param name A name for the logger. This should be a
- * dot-separated name and should normally be based
- * on the package name or class name.
- * @param resourceBundleName - name of ResourceBundle to be used for
+ * @param name A name for the logger. This should normally be
+ * a dot-separated name based on a package name or
+ * class name.
+ * @param resourceBundleName Name of ResourceBundle to be used for
* localizing messages for this logger. May be
- * null if none of the messages require
- * localization.
+ * null.
*
* @return org.sleuthkit.autopsy.coreutils.Logger instance
*/
- public static Logger getLogger(String name, String resourceBundleName) {
- return new Logger(name, resourceBundleName);
+ synchronized public static Logger getLogger(String name, String resourceBundleName) {
+ if (!namesToLoggers.containsKey(name)) {
+ Logger logger = new Logger(name, resourceBundleName);
+ logger.addHandler(userFriendlyHandler);
+ logger.addHandler(developerFriendlyHandler);
+ namesToLoggers.put(name, logger);
+ }
+ return namesToLoggers.get(name);
}
+ /**
+ * Constructs a customized logger.
+ *
+ * @param name A name for the logger. This should normally be
+ * a dot-separated name based on a package name or
+ * class name.
+ * @param resourceBundleName Name of ResourceBundle to be used for
+ * localizing messages for this logger. May be
+ * null.
+ */
private Logger(String name, String resourceBundleName) {
super(name, resourceBundleName);
+ super.setUseParentHandlers(false);
if (Version.getBuildType() == Version.Type.DEVELOPMENT) {
- super.addHandler(console);
- }
- synchronized (fileHandlerLock) {
- super.setUseParentHandlers(false);
- super.addHandler(userFriendlyLogFile);
- super.addHandler(developersLogFile);
+ super.addHandler(consoleHandler);
}
}
}
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/ModuleSettings.java b/Core/src/org/sleuthkit/autopsy/coreutils/ModuleSettings.java
index 2aa0990993..7f874395e3 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/ModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/ModuleSettings.java
@@ -39,6 +39,7 @@ public class ModuleSettings {
private final static String moduleDirPath = PlatformUtil.getUserConfigDirectory();
public static final String DEFAULT_CONTEXT = "GeneralContext"; //NON-NLS
public static final String MAIN_SETTINGS = "Case"; //NON-NLS
+ public static final String CURRENT_CASE_TYPE = "Current_Case_Type"; //NON-NLS
/**
* the constructor
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/NetworkUtils.java b/Core/src/org/sleuthkit/autopsy/coreutils/NetworkUtils.java
new file mode 100644
index 0000000000..5564fa3f59
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/NetworkUtils.java
@@ -0,0 +1,44 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2012-2015 Basis Technology Corp.
+ * Contact: carrier sleuthkit org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.coreutils;
+
+import java.net.UnknownHostException;
+
+public class NetworkUtils {
+
+ /**
+ * Set the host name variable. Sometimes the network can be finicky, so the
+ * answer returned by getHostName() could throw an exception or be null.
+ * Have it read the environment variable if getHostName() is unsuccessful.
+ */
+ public static String getLocalHostName() {
+ String hostName = "";
+ try {
+ hostName = java.net.InetAddress.getLocalHost().getHostName();
+ } catch (UnknownHostException ex) {
+ // getLocalHost().getHostName() can fail in some situations.
+ // Use environment variable if so.
+ hostName = System.getenv("COMPUTERNAME");
+ }
+ if (hostName == null || hostName.isEmpty()) {
+ hostName = System.getenv("COMPUTERNAME");
+ }
+ return hostName;
+ }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/PathValidator.java b/Core/src/org/sleuthkit/autopsy/coreutils/PathValidator.java
new file mode 100644
index 0000000000..41b5c19d62
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/PathValidator.java
@@ -0,0 +1,58 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2013-2014 Basis Technology Corp.
+ * Contact: carrier sleuthkit org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.coreutils;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.sleuthkit.autopsy.casemodule.Case;
+
+/**
+ * Validates absolute path (e.g. to a data source or case output folder)
+ * depending on case type.
+ */
+public final class PathValidator {
+
+ private static final Pattern driveLetterPattern = Pattern.compile("^[Cc]:.*$");
+
+ public static boolean isValid(String path, Case.CaseType caseType) {
+
+ if (caseType == Case.CaseType.MULTI_USER_CASE) {
+ // check that path is not on "C:" drive
+ if (pathOnCDrive(path)) {
+ return false;
+ }
+ } else {
+ // single user case - no validation needed
+ }
+
+ return true;
+ }
+
+ /**
+ * Checks whether a file path contains drive letter defined by pattern.
+ *
+ * @param filePath Input file absolute path
+ *
+ * @return true if path matches the pattern, false otherwise.
+ */
+ private static boolean pathOnCDrive(String filePath) {
+ Matcher m = driveLetterPattern.matcher(filePath);
+ return m.find();
+ }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/TimeStampUtils.java b/Core/src/org/sleuthkit/autopsy/coreutils/TimeStampUtils.java
new file mode 100644
index 0000000000..05e8cb9a52
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/TimeStampUtils.java
@@ -0,0 +1,97 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2015 Basis Technology Corp.
+ * Contact: carrier sleuthkit org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.coreutils;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Class offers utility functions to identify and process time stamped folders.
+ */
+public final class TimeStampUtils {
+
+ // Pattern to identify whether case name contains a generated time stamp.
+ // Sample case name with time stamp: Case 1_2015_02_02_12_10_31 for case "Case 1"
+ private static final Pattern timeStampPattern = Pattern.compile("\\d{4}_\\d{2}_\\d{2}_\\d{2}_\\d{2}_\\d{2}$");
+ private static final int LENGTH_OF_DATE_TIME_STAMP = 20; // length of the above time stamp
+ private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy_MM_dd_HH_mm_ss");
+
+ /**
+ * Checks whether a string ends with a time stamp defined by pattern.
+ *
+ * @param inputString Input string
+ *
+ * @return true if string ends with a time stamp, false otherwise.
+ */
+ public static boolean endsWithTimeStamp(String inputString) {
+ Matcher m = timeStampPattern.matcher(inputString);
+ return m.find();
+ }
+
+ /**
+ * Returns length of time stamp string.
+ *
+ * @return length of time stamp string.
+ */
+ public static int getTimeStampLength() {
+ return LENGTH_OF_DATE_TIME_STAMP;
+ }
+
+ /**
+ * Create a timestamp using the current time
+ *
+ * @return the timestamp as a String
+ */
+ public static String createTimeStamp() {
+ return dateFormat.format(Calendar.getInstance().getTime());
+ }
+
+ /**
+ * Remove a timestamp if it exists
+ *
+ * @param input the String to remove the trailing timestamp from
+ *
+ * @return the String without timestamp
+ */
+ public static String removeTimeStamp(String input) {
+ String result = input;
+ if (input != null && endsWithTimeStamp(input)) {
+ result = input.substring(0, input.length() - getTimeStampLength());
+ }
+ return result;
+ }
+
+ /**
+ * Return the timestamp portion of the name passed in
+ *
+ * @param input the name to check for a timestamp
+ *
+ * @return the timestamp only, or empty String if none
+ */
+ public static String getTimeStampOnly(String input) {
+ String result = "";
+ if (input != null && endsWithTimeStamp(input)) {
+ result = input.substring(input.length() - getTimeStampLength(), input.length());
+ }
+ return result;
+ }
+
+}
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/TimestampingFormatter.java b/Core/src/org/sleuthkit/autopsy/coreutils/TimestampingFormatter.java
deleted file mode 100644
index bbde8529f8..0000000000
--- a/Core/src/org/sleuthkit/autopsy/coreutils/TimestampingFormatter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Autopsy Forensic Browser
- *
- * Copyright 2011 Basis Technology Corp.
- * Contact: carrier sleuthkit org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.sleuthkit.autopsy.coreutils;
-
-import java.text.DateFormat;
-import java.util.Date;
-import java.util.Locale;
-import java.util.logging.Formatter;
-import java.util.logging.LogRecord;
-
-/*
- * Formatter to wrap another formatter and prepend a timestampe to each
- * formatted string Not currently used.
- */
-class TimestampingFormatter extends Formatter {
-
- Formatter original;
- DateFormat timestampFormat = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG, Locale.US);
- String lineSeparator = System.getProperty("line.separator");
-
- TimestampingFormatter(Formatter original) {
- this.original = original;
- }
-
- @Override
- public String format(LogRecord record) {
- long millis = record.getMillis();
- String timestamp = timestampFormat.format(new Date(millis));
-
- return timestamp + lineSeparator + original.format(record);
- }
-}
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/UNCPathUtilities.java b/Core/src/org/sleuthkit/autopsy/coreutils/UNCPathUtilities.java
new file mode 100644
index 0000000000..c919eab11b
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/UNCPathUtilities.java
@@ -0,0 +1,308 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2015 Basis Technology Corp.
+ * Contact: carrier sleuthkit org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.coreutils;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Scanner;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+
+public class UNCPathUtilities {
+
+ private static Map drives;
+ private static final String MAPPED_DRIVES = "_mapped_drives.txt"; //NON-NLS
+ private static final String TEMP_FOLDER = "TEMP";
+ private static final String DATA_TRIGGER = "----------"; //NON-NLS
+ private static final String OK_TXT = "OK"; //NON-NLS
+ private static final String COLON = ":"; //NON-NLS
+ private static final String UNC_PATH_START = "\\\\"; //NON-NLS
+ private static final String C_DRIVE = "C:"; //NON-NLS
+ private static final int DRIVE_LEN = 2;
+ private static final int STARTING_OFFSET = 0;
+ private static final int REPLACEMENT_SIZE = 2;
+ private static final int FIRST_ITEM = 0;
+ private final String nameString;
+
+ /**
+ * Constructor
+ */
+ public UNCPathUtilities() {
+ // get UUID for this instance
+ this.nameString = UUID.randomUUID().toString();
+ drives = getMappedDrives();
+ }
+
+ /**
+ * This method converts a passed in path to UNC if it is not already UNC.
+ * The UNC path will end up in one of the following two forms:
+ * \\hostname\somefolder\otherfolder or \\IP_ADDRESS\somefolder\otherfolder
+ *
+ * This is accomplished by checking the mapped drives list the operating
+ * system maintains and substituting where required. If the drive of the
+ * path passed in does not exist in the cached mapped drives list, you can
+ * force a rescan of the mapped drives list with rescanDrives(), then call
+ * this method again. This would be of use if the end user added a mapped
+ * drive while your dialog was up, for example.
+ *
+ * @param inputPath a String of the path to convert
+ *
+ * @return returns a successfully converted inputPath or null if unable to
+ * find a matching drive and convert it to UNC
+ */
+ synchronized public String mappedDriveToUNC(String inputPath) {
+ if (inputPath != null) {
+ // If it is a C:, do not attempt to convert. This is for the single-user case.
+ if (inputPath.toUpperCase().startsWith(C_DRIVE)) {
+ return null;
+ }
+ if (false == isUNC(inputPath)) {
+ String uncPath = null;
+ try {
+ String currentDrive = Paths.get(inputPath).getRoot().toString().substring(STARTING_OFFSET, REPLACEMENT_SIZE);
+ String uncMapping = drives.get(currentDrive);
+ if (uncMapping != null) {
+ uncPath = uncMapping + inputPath.substring(REPLACEMENT_SIZE, inputPath.length());
+ }
+ } catch (Exception ex) {
+ // Didn't work. Skip it.
+ }
+ return uncPath;
+ } else {
+ return inputPath;
+ }
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * This method converts a passed in path to UNC if it is not already UNC.
+ * The UNC path will end up in one of the following two forms:
+ * \\hostname\somefolder\otherfolder or \\IP_ADDRESS\somefolder\otherfolder
+ *
+ * This is accomplished by checking the mapped drives list the operating
+ * system maintains and substituting where required. If the drive of the
+ * path passed in does not exist in the cached mapped drives list, you can
+ * force a rescan of the mapped drives list with rescanDrives(), then call
+ * this method again. This would be of use if the end user added a mapped
+ * drive while your dialog was up, for example.
+ *
+ * @param inputPath the path to convert
+ *
+ * @return returns a successfully converted inputPath or null if unable to
+ * find a matching drive and convert it to UNC
+ */
+ synchronized public Path mappedDriveToUNC(Path inputPath) {
+ if (inputPath != null) {
+ String uncPath = UNCPathUtilities.this.mappedDriveToUNC(inputPath.toString());
+ if (uncPath == null) {
+ return null;
+ } else {
+ return Paths.get(uncPath);
+ }
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * Tests if the drive in the passed in path is a mapped drive.
+ *
+ * @param inputPath the Path to test.
+ *
+ * @return true if the passed in drive is mapped, false otherwise
+ */
+ synchronized public boolean isDriveMapped(Path inputPath) {
+ if (inputPath != null) {
+ return isDriveMapped(inputPath.toString());
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * Tests if the drive in the passed in path is a mapped drive.
+ *
+ * @param inputPath the Path to test.
+ *
+ * @return true if the passed in drive is mapped, false otherwise
+ */
+ synchronized public boolean isDriveMapped(String inputPath) {
+ if (inputPath != null) {
+ String shortenedPath = inputPath.substring(STARTING_OFFSET, DRIVE_LEN);
+ for (String s : drives.keySet()) {
+ if (shortenedPath.equals(s)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Takes a UNC path that may have an IP address in it and converts it to
+ * hostname, if it can resolve the hostname. Given
+ * \\10.11.12.13\some\folder, the result will be \\TEDS_COMPUTER\some\folder
+ * if the IP address 10.11.12.13 belongs to a machine with the hostname
+ * TEDS_COMPUTER and the local machine is able to resolve the hostname.
+ *
+ * @param inputPath the path to convert to a hostname UNC path
+ *
+ * @return the successfully converted path or null if unable to resolve
+ */
+ synchronized public Path ipToHostName(Path inputPath) {
+ if (inputPath != null) {
+ return Paths.get(ipToHostName(inputPath.toString()));
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * Takes a UNC path that may have an IP address in it and converts it to
+ * hostname, if it can resolve the hostname. Given
+ * \\10.11.12.13\some\folder, the result will be \\TEDS_COMPUTER\some\folder
+ * if the IP address 10.11.12.13 belongs to a machine with the hostname
+ * TEDS_COMPUTER and the local machine is able to resolve the hostname.
+ *
+ * @param inputPath a String of the path to convert to a hostname UNC path
+ *
+ * @return the successfully converted path or null if unable to resolve
+ */
+ synchronized public String ipToHostName(String inputPath) {
+ if (inputPath != null) {
+ String result = null;
+ try {
+ if (isUNC(Paths.get(inputPath))) {
+ String potentialIP = Paths.get(inputPath.substring(REPLACEMENT_SIZE)).getName(FIRST_ITEM).toString();
+ String hostname = InetAddress.getByName(potentialIP).getHostName();
+ result = inputPath.replaceAll(potentialIP, hostname);
+ }
+ } catch (Exception ex) {
+ // Could not resolve hostname for IP address, return null result
+ }
+ return result;
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * Test if a Path is UNC. It is considered UNC if it begins with \\
+ *
+ * @param inputPath the path to check
+ *
+ * @return true if the passed in Path is UNC, false otherwise
+ */
+ synchronized public static boolean isUNC(Path inputPath) {
+ if (inputPath != null) {
+ return isUNC(inputPath.toString());
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * Test if a String path is UNC. It is considered UNC if it begins with \\
+ *
+ * @param inputPath the String of the path to check
+ *
+ * @return true if the passed in Path is UNC, false otherwise
+ */
+ synchronized public static boolean isUNC(String inputPath) {
+ if (inputPath != null) {
+ return inputPath.startsWith(UNC_PATH_START);
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * Updates the list of mapped drives this class contains. This list is used
+ * to resolve mappedDriveToUNC and isDriveMapped calls. This is useful to
+ * call if the user has potentially added mapped drives to their system
+ * after the module calling mappedDriveToUNC has already begun running. Note
+ * this uses system I/O, so call it with some care.
+ *
+ */
+ synchronized public void rescanDrives() {
+ drives = getMappedDrives();
+ }
+
+ /**
+ * Populates the list of mapped drives this class contains. The list is used
+ * to resolve mappedDriveToUNC and isDriveMapped calls. Note this uses
+ * system I/O, so call it with some care.
+ *
+ * @return the hashmap
+ */
+ synchronized private Map getMappedDrives() {
+ Map driveMap = new HashMap<>();
+ File mappedDrive = Paths.get(System.getenv(TEMP_FOLDER), nameString + MAPPED_DRIVES).toFile();
+ try {
+ Files.deleteIfExists(mappedDrive.toPath());
+ ProcessBuilder builder = new ProcessBuilder("cmd", "/c", "net", "use"); //NON-NLS
+ builder.redirectOutput(mappedDrive);
+ builder.redirectError(mappedDrive);
+ Process p = builder.start(); // throws IOException
+ p.waitFor(10, TimeUnit.SECONDS);
+ try (Scanner scanner = new Scanner(mappedDrive)) {
+ // parse the data and place it in the hashmap
+ while (scanner.hasNext()) {
+ String entry1 = scanner.next();
+ if (entry1.startsWith(DATA_TRIGGER)) {
+ continue;
+ }
+ String entry2 = scanner.next();
+ if (entry2.startsWith(DATA_TRIGGER)) {
+ continue;
+ }
+ String entry3 = scanner.next();
+ if (entry3.startsWith(DATA_TRIGGER)) {
+ continue;
+ }
+ scanner.nextLine();
+ if (entry1.length() == DRIVE_LEN && !entry1.equals(OK_TXT) && entry1.endsWith(COLON)) {
+ driveMap.put(entry1, entry2); // if there was no leading status, populate drive
+ } else if (entry2.length() == DRIVE_LEN && entry2.endsWith(COLON)) {
+ driveMap.put(entry2, entry3); // if there was a leading status, populate drive
+ }
+ }
+ }
+ } catch (IOException | InterruptedException ex) {
+ // if we couldn't do it, no big deal
+ Logger.getLogger(UNCPathUtilities.class.getName()).log(Level.WARNING, "Unable to parse 'net use' output", ex); //NON-NLS
+ } finally {
+ try {
+ Files.deleteIfExists(mappedDrive.toPath());
+ } catch (IOException ex) {
+ // if we couldn't do it, no big deal
+ }
+ }
+ return driveMap;
+ }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java
index fad5cde64c..a1ef63eac1 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java
@@ -18,12 +18,18 @@
*/
package org.sleuthkit.autopsy.datamodel;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import org.openide.nodes.Children;
import java.util.Map;
import java.util.logging.Level;
import org.apache.commons.lang3.StringUtils;
import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.ingest.IngestManager;
+import org.sleuthkit.autopsy.ingest.ModuleContentEvent;
import org.sleuthkit.datamodel.AbstractFile;
+import org.sleuthkit.datamodel.Content;
import org.sleuthkit.datamodel.TskCoreException;
/**
@@ -41,8 +47,53 @@ public abstract class AbstractAbstractFileNode extends A
*/
AbstractAbstractFileNode(T abstractFile) {
super(abstractFile);
+ String name = abstractFile.getName();
+ int dotIndex = name.lastIndexOf(".");
+ if (dotIndex > 0) {
+ String ext = name.substring(dotIndex).toLowerCase();
+
+ // If this is an archive file we will listen for ingest events
+ // that will notify us when new content has been identified.
+ for (String s : FileTypeExtensions.getArchiveExtensions()) {
+ if (ext.equals(s)) {
+ IngestManager.getInstance().addIngestModuleEventListener(pcl);
+ }
+ }
+ }
+
}
+ private final PropertyChangeListener pcl = (PropertyChangeEvent evt) -> {
+ String eventType = evt.getPropertyName();
+
+ // Is this a content changed event?
+ if (eventType.equals(IngestManager.IngestModuleEvent.CONTENT_CHANGED.toString())) {
+ if ((evt.getOldValue() instanceof ModuleContentEvent) == false) {
+ return;
+ }
+ ModuleContentEvent moduleContentEvent = (ModuleContentEvent) evt.getOldValue();
+ if ((moduleContentEvent.getSource() instanceof Content) == false) {
+ return;
+ }
+ Content newContent = (Content) moduleContentEvent.getSource();
+
+ // Does the event indicate that content has been added to *this* file?
+ if (getContent().getId() == newContent.getId()) {
+ // If so, refresh our children.
+ try {
+ Children parentsChildren = getParentNode().getChildren();
+ if (parentsChildren != null) {
+ ((ContentChildren) parentsChildren).refreshChildren();
+ parentsChildren.getNodesCount();
+ }
+ } catch (NullPointerException ex) {
+ // Skip
+ }
+
+ }
+ }
+ };
+
// Note: this order matters for the search result, changed it if the order of property headers on the "KeywordSearchNode"changed
public static enum AbstractFilePropertyType {
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentChildren.java
index b151c0192a..3f8dcfdb07 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentChildren.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentChildren.java
@@ -116,6 +116,16 @@ class ContentChildren extends AbstractContentChildren {
@Override
protected void removeNotify() {
super.removeNotify();
- setKeys(new ArrayList());
+ setKeys(new ArrayList<>());
+ }
+
+ /**
+ * Refresh the list of children due to a change in one (or more) of our
+ * children (e.g. archive files can change as new content is extracted from
+ * them).
+ */
+ void refreshChildren() {
+ List children = getDisplayChildren(parent);
+ setKeys(children);
}
}
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/DataSourcesNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/DataSourcesNode.java
index 0c7cecd8d0..4d3331fac1 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/DataSourcesNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/DataSourcesNode.java
@@ -59,7 +59,6 @@ public class DataSourcesNode extends DisplayableItemNode {
/*
* Custom Keys implementation that listens for new data sources being added.
*/
- // @@@ This can become private once DirectoryTree doesn't want to refresh the entire tree
public static class DataSourcesNodeChildren extends AbstractContentChildren {
private static final Logger logger = Logger.getLogger(DataSourcesNodeChildren.class.getName());
@@ -107,9 +106,6 @@ public class DataSourcesNode extends DisplayableItemNode {
/**
* Refresh all content keys This creates new nodes of keys have changed.
*/
- // I think this goes away once we get more listeners in place
- // It was added as an interim stage
- @Deprecated
public void refreshContentKeys() {
for (Content key : currentKeys) {
refreshKey(key);
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/DeletedContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/DeletedContent.java
index 6d57c3e674..9d6e745c29 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/DeletedContent.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/DeletedContent.java
@@ -1,7 +1,7 @@
/*
* Autopsy Forensic Browser
*
- * Copyright 2013-2014 Basis Technology Corp.
+ * Copyright 2013-2015 Basis Technology Corp.
* Contact: carrier sleuthkit org
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -183,16 +183,42 @@ public class DeletedContent implements AutopsyVisitableItem {
@Override
public void propertyChange(PropertyChangeEvent evt) {
String eventType = evt.getPropertyName();
-
- // new file was added
if (eventType.equals(IngestManager.IngestModuleEvent.CONTENT_CHANGED.toString())) {
- // @@@ COULD CHECK If the new file is deleted before notifying...
- update();
+ /**
+ * + // @@@ COULD CHECK If the new file is deleted
+ * before notifying... Checking for a current case is a
+ * stop gap measure + update(); until a different way of
+ * handling the closing of cases is worked out.
+ * Currently, remote events may be received for a case
+ * that is already closed.
+ */
+ try {
+ Case.getCurrentCase();
+ // new file was added
+ // @@@ COULD CHECK If the new file is deleted before notifying...
+ update();
+ } catch (IllegalStateException notUsed) {
+ /**
+ * Case is closed, do nothing.
+ */
+ }
} else if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString())
- || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) {
- update();
- } else if (eventType.equals(Case.Events.DATA_SOURCE_ADDED.toString())) {
- update();
+ || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())
+ || eventType.equals(Case.Events.DATA_SOURCE_ADDED.toString())) {
+ /**
+ * Checking for a current case is a stop gap measure
+ * until a different way of handling the closing of
+ * cases is worked out. Currently, remote events may be
+ * received for a case that is already closed.
+ */
+ try {
+ Case.getCurrentCase();
+ update();
+ } catch (IllegalStateException notUsed) {
+ /**
+ * Case is closed, do nothing.
+ */
+ }
} else if (eventType.equals(Case.Events.CURRENT_CASE.toString())) {
// case was closed. Remove listeners so that we don't get called with a stale case handle
if (evt.getNewValue() == null) {
@@ -210,6 +236,7 @@ public class DeletedContent implements AutopsyVisitableItem {
}
@Override
+
protected boolean createKeys(List list) {
list.addAll(Arrays.asList(DeletedContent.DeletedContentFilter.values()));
return true;
@@ -222,8 +249,7 @@ public class DeletedContent implements AutopsyVisitableItem {
public class DeletedContentNode extends DisplayableItemNode {
- private DeletedContent.DeletedContentFilter filter;
- private final Logger logger = Logger.getLogger(DeletedContentNode.class.getName());
+ private final DeletedContent.DeletedContentFilter filter;
// Use version that has observer for updates
@Deprecated
@@ -296,8 +322,8 @@ public class DeletedContent implements AutopsyVisitableItem {
static class DeletedContentChildren extends ChildFactory.Detachable {
- private SleuthkitCase skCase;
- private DeletedContent.DeletedContentFilter filter;
+ private final SleuthkitCase skCase;
+ private final DeletedContent.DeletedContentFilter filter;
private static final Logger logger = Logger.getLogger(DeletedContentChildren.class.getName());
private static final int MAX_OBJECTS = 10001;
private final Observable notifier;
@@ -339,7 +365,6 @@ public class DeletedContent implements AutopsyVisitableItem {
List queryList = runFsQuery();
if (queryList.size() == MAX_OBJECTS) {
queryList.remove(queryList.size() - 1);
-
// only show the dialog once - not each time we refresh
if (maxFilesDialogShown == false) {
maxFilesDialogShown = true;
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java b/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java
index 6a02438ea0..a28992c978 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java
@@ -205,14 +205,46 @@ public class EmailExtracted implements AutopsyVisitableItem {
@Override
public void propertyChange(PropertyChangeEvent evt) {
String eventType = evt.getPropertyName();
-
if (eventType.equals(IngestManager.IngestModuleEvent.DATA_ADDED.toString())) {
- if (((ModuleDataEvent) evt.getOldValue()).getArtifactType() == BlackboardArtifact.ARTIFACT_TYPE.TSK_EMAIL_MSG) {
- emailResults.update();
+ /**
+ * Checking for a current case is a stop gap measure until a
+ * different way of handling the closing of cases is worked
+ * out. Currently, remote events may be received for a case
+ * that is already closed.
+ */
+ try {
+ Case.getCurrentCase();
+ /**
+ * Even with the check above, it is still possible that
+ * the case will be closed in a different thread before
+ * this code executes. If that happens, it is possible
+ * for the event to have a null oldValue.
+ */
+ ModuleDataEvent eventData = (ModuleDataEvent) evt.getOldValue();
+ if (null != eventData && eventData.getArtifactType() == BlackboardArtifact.ARTIFACT_TYPE.TSK_EMAIL_MSG) {
+ emailResults.update();
+ }
+ } catch (IllegalStateException notUsed) {
+ /**
+ * Case is closed, do nothing.
+ */
}
} else if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString())
|| eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) {
- emailResults.update();
+ /**
+ * Checking for a current case is a stop gap measure until a
+ * different way of handling the closing of cases is worked
+ * out. Currently, remote events may be received for a case
+ * that is already closed.
+ */
+ try {
+ Case.getCurrentCase();
+ emailResults.update();
+ } catch (IllegalStateException notUsed) {
+ /**
+ * Case is closed, do nothing.
+ */
+ }
} else if (eventType.equals(Case.Events.CURRENT_CASE.toString())) {
// case was closed. Remove listeners so that we don't get called with a stale case handle
if (evt.getNewValue() == null) {
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
index 86aecf3d57..4fa27c8131 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
@@ -1,7 +1,7 @@
/*
* Autopsy Forensic Browser
*
- * Copyright 2011-2014 Basis Technology Corp.
+ * Copyright 2011-2015 Basis Technology Corp.
* Contact: carrier sleuthkit org
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -127,7 +127,7 @@ public class ExtractedContent implements AutopsyVisitableItem {
*/
private class TypeFactory extends ChildFactory.Detachable {
- private final ArrayList doNotShow;
+ private final ArrayList doNotShow = new ArrayList<>();
// maps the artifact type to its child node
private final HashMap typeNodeList = new HashMap<>();
@@ -135,7 +135,6 @@ public class ExtractedContent implements AutopsyVisitableItem {
super();
// these are shown in other parts of the UI tree
- doNotShow = new ArrayList<>();
doNotShow.add(BlackboardArtifact.ARTIFACT_TYPE.TSK_GEN_INFO);
doNotShow.add(BlackboardArtifact.ARTIFACT_TYPE.TSK_EMAIL_MSG);
doNotShow.add(BlackboardArtifact.ARTIFACT_TYPE.TSK_HASHSET_HIT);
@@ -144,25 +143,50 @@ public class ExtractedContent implements AutopsyVisitableItem {
doNotShow.add(BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT);
}
- private final PropertyChangeListener pcl = new PropertyChangeListener() {
- @Override
- public void propertyChange(PropertyChangeEvent evt) {
- String eventType = evt.getPropertyName();
-
- if (eventType.equals(IngestManager.IngestModuleEvent.DATA_ADDED.toString())) {
+ private final PropertyChangeListener pcl = (PropertyChangeEvent evt) -> {
+ String eventType = evt.getPropertyName();
+ if (eventType.equals(IngestManager.IngestModuleEvent.DATA_ADDED.toString())) {
+ /**
+ * This is a stop gap measure until a different way of handling
+ * the closing of cases is worked out. Currently, remote events
+ * may be received for a case that is already closed.
+ */
+ try {
+ Case.getCurrentCase();
+ /**
+ * Due to some unresolved issues with how cases are closed,
+ * it is possible for the event to have a null oldValue if
+ * the event is a remote event.
+ */
final ModuleDataEvent event = (ModuleDataEvent) evt.getOldValue();
- if (doNotShow.contains(event.getArtifactType()) == false) {
+ if (null != event && doNotShow.contains(event.getArtifactType()) == false) {
refresh(true);
}
- } else if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString())
- || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) {
+ } catch (IllegalStateException notUsed) {
+ /**
+ * Case is closed, do nothing.
+ */
+ }
+ } else if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString())
+ || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) {
+ /**
+ * This is a stop gap measure until a different way of handling
+ * the closing of cases is worked out. Currently, remote events
+ * may be received for a case that is already closed.
+ */
+ try {
+ Case.getCurrentCase();
refresh(true);
- } else if (eventType.equals(Case.Events.CURRENT_CASE.toString())) {
- // case was closed. Remove listeners so that we don't get called with a stale case handle
- if (evt.getNewValue() == null) {
- removeNotify();
- skCase = null;
- }
+ } catch (IllegalStateException notUsed) {
+ /**
+ * Case is closed, do nothing.
+ */
+ }
+ } else if (eventType.equals(Case.Events.CURRENT_CASE.toString())) {
+ // case was closed. Remove listeners so that we don't get called with a stale case handle
+ if (evt.getNewValue() == null) {
+ removeNotify();
+ skCase = null;
}
}
};
@@ -184,33 +208,30 @@ public class ExtractedContent implements AutopsyVisitableItem {
@Override
protected boolean createKeys(List list) {
- if (skCase == null) {
- return false;
- }
+ if (skCase != null) {
+ try {
+ List inUse = skCase.getBlackboardArtifactTypesInUse();
+ inUse.removeAll(doNotShow);
+ Collections.sort(inUse,
+ new Comparator() {
+ @Override
+ public int compare(BlackboardArtifact.ARTIFACT_TYPE a, BlackboardArtifact.ARTIFACT_TYPE b) {
+ return a.getDisplayName().compareTo(b.getDisplayName());
+ }
+ });
+ list.addAll(inUse);
- try {
- List inUse = skCase.getBlackboardArtifactTypesInUse();
- inUse.removeAll(doNotShow);
- Collections.sort(inUse,
- new Comparator() {
- @Override
- public int compare(BlackboardArtifact.ARTIFACT_TYPE a, BlackboardArtifact.ARTIFACT_TYPE b) {
- return a.getDisplayName().compareTo(b.getDisplayName());
- }
- });
- list.addAll(inUse);
-
- // the create node method will get called only for new types
- // refresh the counts if we already created them from a previous update
- for (BlackboardArtifact.ARTIFACT_TYPE art : inUse) {
- TypeNode node = typeNodeList.get(art);
- if (node != null) {
- node.updateDisplayName();
+ // the create node method will get called only for new types
+ // refresh the counts if we already created them from a previous update
+ for (BlackboardArtifact.ARTIFACT_TYPE art : inUse) {
+ TypeNode node = typeNodeList.get(art);
+ if (node != null) {
+ node.updateDisplayName();
+ }
}
+ } catch (TskCoreException ex) {
+ Logger.getLogger(TypeFactory.class.getName()).log(Level.SEVERE, "Error getting list of artifacts in use: " + ex.getLocalizedMessage()); //NON-NLS
}
- } catch (TskCoreException ex) {
- Logger.getLogger(TypeFactory.class.getName()).log(Level.SEVERE, "Error getting list of artifacts in use: " + ex.getLocalizedMessage()); //NON-NLS
- return false;
}
return true;
}
@@ -335,6 +356,8 @@ public class ExtractedContent implements AutopsyVisitableItem {
return "mismatch-16.png"; //NON-NLS
case TSK_OS_INFO:
return "computer.png"; //NON-NLS
+ case TSK_FACE_DETECTED:
+ return "face.png"; //NON-NLS
}
return "artifact-icon.png"; //NON-NLS
@@ -362,15 +385,46 @@ public class ExtractedContent implements AutopsyVisitableItem {
@Override
public void propertyChange(PropertyChangeEvent evt) {
String eventType = evt.getPropertyName();
-
if (eventType.equals(IngestManager.IngestModuleEvent.DATA_ADDED.toString())) {
- final ModuleDataEvent event = (ModuleDataEvent) evt.getOldValue();
- if (event.getArtifactType() == type) {
- refresh(true);
+ /**
+ * Checking for a current case is a stop gap measure until a
+ * different way of handling the closing of cases is worked
+ * out. Currently, remote events may be received for a case
+ * that is already closed.
+ */
+ try {
+ Case.getCurrentCase();
+ /**
+ * Even with the check above, it is still possible that
+ * the case will be closed in a different thread before
+ * this code executes. If that happens, it is possible
+ * for the event to have a null oldValue.
+ */
+ final ModuleDataEvent event = (ModuleDataEvent) evt.getOldValue();
+ if (null != event && event.getArtifactType() == type) {
+ refresh(true);
+ }
+ } catch (IllegalStateException notUsed) {
+ /**
+ * Case is closed, do nothing.
+ */
}
} else if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString())
|| eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) {
- refresh(true);
+ /**
+ * Checking for a current case is a stop gap measure until a
+ * different way of handling the closing of cases is worked
+ * out. Currently, remote events may be received for a case
+ * that is already closed.
+ */
+ try {
+ Case.getCurrentCase();
+ refresh(true);
+ } catch (IllegalStateException notUsed) {
+ /**
+ * Case is closed, do nothing.
+ */
+ }
}
}
};
@@ -389,15 +443,13 @@ public class ExtractedContent implements AutopsyVisitableItem {
@Override
protected boolean createKeys(List list) {
- if (skCase == null) {
- return false;
- }
-
- try {
- List arts = skCase.getBlackboardArtifacts(type.getTypeID());
- list.addAll(arts);
- } catch (TskException ex) {
- Logger.getLogger(ArtifactFactory.class.getName()).log(Level.SEVERE, "Couldn't get blackboard artifacts from database", ex); //NON-NLS
+ if (skCase != null) {
+ try {
+ List arts = skCase.getBlackboardArtifacts(type.getTypeID());
+ list.addAll(arts);
+ } catch (TskException ex) {
+ Logger.getLogger(ArtifactFactory.class.getName()).log(Level.SEVERE, "Couldn't get blackboard artifacts from database", ex); //NON-NLS
+ }
}
return true;
}
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileSize.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileSize.java
index cbae247d55..817db770b7 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/FileSize.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileSize.java
@@ -1,7 +1,7 @@
/*
* Autopsy Forensic Browser
*
- * Copyright 2013-2014 Basis Technology Corp.
+ * Copyright 2013-2015 Basis Technology Corp.
* Contact: carrier sleuthkit org
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -182,15 +182,40 @@ public class FileSize implements AutopsyVisitableItem {
public void propertyChange(PropertyChangeEvent evt) {
String eventType = evt.getPropertyName();
- // new file was added
if (eventType.equals(IngestManager.IngestModuleEvent.CONTENT_CHANGED.toString())) {
- // @@@ could check the size here and only fire off updates if we know the file meets the min size criteria
- update();
+ /**
+ * Checking for a current case is a stop gap measure
+ * until a different way of handling the closing of
+ * cases is worked out. Currently, remote events may be
+ * received for a case that is already closed.
+ */
+ try {
+ // new file was added
+ // @@@ could check the size here and only fire off updates if we know the file meets the min size criteria
+ Case.getCurrentCase();
+ update();
+ } catch (IllegalStateException notUsed) {
+ /**
+ * Case is closed, do nothing.
+ */
+ }
} else if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString())
- || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) {
- update();
- } else if (eventType.equals(Case.Events.DATA_SOURCE_ADDED.toString())) {
- update();
+ || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())
+ || eventType.equals(Case.Events.DATA_SOURCE_ADDED.toString())) {
+ /**
+ * Checking for a current case is a stop gap measure
+ * until a different way of handling the closing of
+ * cases is worked out. Currently, remote events may be
+ * received for a case that is already closed.
+ */
+ try {
+ Case.getCurrentCase();
+ update();
+ } catch (IllegalStateException notUsed) {
+ /**
+ * Case is closed, do nothing.
+ */
+ }
} else if (eventType.equals(Case.Events.CURRENT_CASE.toString())) {
// case was closed. Remove listeners so that we don't get called with a stale case handle
if (evt.getNewValue() == null) {
@@ -348,11 +373,7 @@ public class FileSize implements AutopsyVisitableItem {
@Override
protected boolean createKeys(List list) {
- List l = runFsQuery();
- if (l == null) {
- return false;
- }
- list.addAll(l);
+ list.addAll(runFsQuery());
return true;
}
@@ -371,8 +392,7 @@ public class FileSize implements AutopsyVisitableItem {
break;
default:
- logger.log(Level.SEVERE, "Unsupported filter type to get files by size: {0}", filter); //NON-NLS
- return null;
+ throw new IllegalArgumentException("Unsupported filter type to get files by size: " + filter); //NON-NLS
}
// ignore unalloc block files
query = query + " AND (type != " + TskData.TSK_DB_FILES_TYPE_ENUM.UNALLOC_BLOCKS.getFileType() + ")"; //NON-NLS
@@ -383,19 +403,15 @@ public class FileSize implements AutopsyVisitableItem {
private List runFsQuery() {
List ret = new ArrayList<>();
- String query = makeQuery(filter);
- if (query == null) {
- return null;
- }
-
try {
+ String query = makeQuery(filter);
+
ret = skCase.findAllFilesWhere(query);
- } catch (TskCoreException e) {
- logger.log(Level.SEVERE, "Error getting files for the file size view using: " + query, e); //NON-NLS
+ } catch (Exception e) {
+ logger.log(Level.SEVERE, "Error getting files for the file size view: " + e.getMessage()); //NON-NLS
}
return ret;
-
}
/**
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeNode.java
index f6d9713f58..f6b97a74e1 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeNode.java
@@ -220,9 +220,9 @@ public class FileTypeNode extends DisplayableItemNode {
if (UserPreferences.hideKnownFilesInViewsTree()) {
query.append(" AND (known IS NULL OR known != ").append(TskData.FileKnown.KNOWN.getFileKnownValue()).append(")"); //NON-NLS
}
- query.append(" AND (0"); //NON-NLS
+ query.append(" AND (NULL"); //NON-NLS
for (String s : filter.getFilter()) {
- query.append(" OR name LIKE '%").append(s).append("'"); //NON-NLS
+ query.append(" OR LOWER(name) LIKE LOWER('%").append(s).append("')"); //NON-NLS
}
query.append(')');
return query.toString();
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesNode.java
index 863d9aab5e..a268489167 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesNode.java
@@ -1,7 +1,7 @@
/*
* Autopsy Forensic Browser
*
- * Copyright 2011-2014 Basis Technology Corp.
+ * Copyright 2011-2015 Basis Technology Corp.
* Contact: carrier sleuthkit org
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -152,15 +152,24 @@ public class FileTypesNode extends DisplayableItemNode {
@Override
public void propertyChange(PropertyChangeEvent evt) {
String eventType = evt.getPropertyName();
-
- // new file was added
- if (eventType.equals(IngestManager.IngestModuleEvent.CONTENT_CHANGED.toString())) {
- update();
- } else if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString())
- || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) {
- update();
- } else if (eventType.equals(Case.Events.DATA_SOURCE_ADDED.toString())) {
- update();
+ if (eventType.equals(IngestManager.IngestModuleEvent.CONTENT_CHANGED.toString())
+ || eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString())
+ || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())
+ || eventType.equals(Case.Events.DATA_SOURCE_ADDED.toString())) {
+ /**
+ * Checking for a current case is a stop gap measure
+ * until a different way of handling the closing of
+ * cases is worked out. Currently, remote events may be
+ * received for a case that is already closed.
+ */
+ try {
+ Case.getCurrentCase();
+ update();
+ } catch (IllegalStateException notUsed) {
+ /**
+ * Case is closed, do nothing.
+ */
+ }
} else if (eventType.equals(Case.Events.CURRENT_CASE.toString())) {
// case was closed. Remove listeners so that we don't get called with a stale case handle
if (evt.getNewValue() == null) {
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java b/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java
index d8b9d8e7c5..6f75877c94 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java
@@ -1,7 +1,7 @@
/*
* Autopsy Forensic Browser
*
- * Copyright 2011-2014 Basis Technology Corp.
+ * Copyright 2011-2015 Basis Technology Corp.
* Contact: carrier sleuthkit org
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -184,14 +184,45 @@ public class HashsetHits implements AutopsyVisitableItem {
@Override
public void propertyChange(PropertyChangeEvent evt) {
String eventType = evt.getPropertyName();
-
if (eventType.equals(IngestManager.IngestModuleEvent.DATA_ADDED.toString())) {
- if (((ModuleDataEvent) evt.getOldValue()).getArtifactType() == ARTIFACT_TYPE.TSK_HASHSET_HIT) {
- hashsetResults.update();
+ /**
+ * Checking for a current case is a stop gap measure until a
+ * different way of handling the closing of cases is worked
+ * out. Currently, remote events may be received for a case
+ * that is already closed.
+ */
+ try {
+ Case.getCurrentCase();
+ /**
+ * Due to some unresolved issues with how cases are
+ * closed, it is possible for the event to have a null
+ * oldValue if the event is a remote event.
+ */
+ ModuleDataEvent eventData = (ModuleDataEvent) evt.getOldValue();
+ if (null != eventData && eventData.getArtifactType() == ARTIFACT_TYPE.TSK_HASHSET_HIT) {
+ hashsetResults.update();
+ }
+ } catch (IllegalStateException notUsed) {
+ /**
+ * Case is closed, do nothing.
+ */
}
} else if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString())
|| eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) {
- hashsetResults.update();
+ /**
+ * Checking for a current case is a stop gap measure until a
+ * different way of handling the closing of cases is worked
+ * out. Currently, remote events may be received for a case
+ * that is already closed.
+ */
+ try {
+ Case.getCurrentCase();
+ hashsetResults.update();
+ } catch (IllegalStateException notUsed) {
+ /**
+ * Case is closed, do nothing.
+ */
+ }
} else if (eventType.equals(Case.Events.CURRENT_CASE.toString())) {
// case was closed. Remove listeners so that we don't get called with a stale case handle
if (evt.getNewValue() == null) {
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java b/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java
index 0e7e2ba324..c4c0080679 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java
@@ -1,7 +1,7 @@
/*
* Autopsy Forensic Browser
*
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2015 Basis Technology Corp.
* Contact: carrier sleuthkit org
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -175,15 +175,47 @@ public class InterestingHits implements AutopsyVisitableItem {
@Override
public void propertyChange(PropertyChangeEvent evt) {
String eventType = evt.getPropertyName();
-
if (eventType.equals(IngestManager.IngestModuleEvent.DATA_ADDED.toString())) {
- if ((((ModuleDataEvent) evt.getOldValue()).getArtifactType() == BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT)
- || (((ModuleDataEvent) evt.getOldValue()).getArtifactType() == BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT)) {
- interestingResults.update();
+ /**
+ * Checking for a current case is a stop gap measure until a
+ * different way of handling the closing of cases is worked
+ * out. Currently, remote events may be received for a case
+ * that is already closed.
+ */
+ try {
+ Case.getCurrentCase();
+ /**
+ * Even with the check above, it is still possible that
+ * the case will be closed in a different thread before
+ * this code executes. If that happens, it is possible
+ * for the event to have a null oldValue.
+ */
+ ModuleDataEvent eventData = (ModuleDataEvent) evt.getOldValue();
+ if (null != eventData && (eventData.getArtifactType() == BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT
+ || eventData.getArtifactType() == BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT)) {
+ interestingResults.update();
+ }
+ } catch (IllegalStateException notUsed) {
+ /**
+ * Case is closed, do nothing.
+ */
}
} else if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString())
|| eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) {
- interestingResults.update();
+ /**
+ * Checking for a current case is a stop gap measure until a
+ * different way of handling the closing of cases is worked
+ * out. Currently, remote events may be received for a case
+ * that is already closed.
+ */
+ try {
+ Case.getCurrentCase();
+ interestingResults.update();
+ } catch (IllegalStateException notUsed) {
+ /**
+ * Case is closed, do nothing.
+ */
+ }
} else if (eventType.equals(Case.Events.CURRENT_CASE.toString())) {
// case was closed. Remove listeners so that we don't get called with a stale case handle
if (evt.getNewValue() == null) {
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java b/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java
index 68886f3b5c..9ff5ad2d5d 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java
@@ -1,7 +1,7 @@
/*
* Autopsy Forensic Browser
*
- * Copyright 2011-2014 Basis Technology Corp.
+ * Copyright 2011-2015 Basis Technology Corp.
* Contact: carrier sleuthkit org
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -247,14 +247,46 @@ public class KeywordHits implements AutopsyVisitableItem {
@Override
public void propertyChange(PropertyChangeEvent evt) {
String eventType = evt.getPropertyName();
-
if (eventType.equals(IngestManager.IngestModuleEvent.DATA_ADDED.toString())) {
- if (((ModuleDataEvent) evt.getOldValue()).getArtifactType() == BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT) {
- keywordResults.update();
+ /**
+ * Checking for a current case is a stop gap measure until a
+ * different way of handling the closing of cases is worked
+ * out. Currently, remote events may be received for a case
+ * that is already closed.
+ */
+ try {
+ Case.getCurrentCase();
+ /**
+ * Even with the check above, it is still possible that
+ * the case will be closed in a different thread before
+ * this code executes. If that happens, it is possible
+ * for the event to have a null oldValue.
+ */
+ ModuleDataEvent eventData = (ModuleDataEvent) evt.getOldValue();
+ if (null != eventData && eventData.getArtifactType() == BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT) {
+ keywordResults.update();
+ }
+ } catch (IllegalStateException notUsed) {
+ /**
+ * Case is closed, do nothing.
+ */
}
} else if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString())
|| eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) {
- keywordResults.update();
+ /**
+ * Checking for a current case is a stop gap measure until a
+ * different way of handling the closing of cases is worked
+ * out. Currently, remote events may be received for a case
+ * that is already closed.
+ */
+ try {
+ Case.getCurrentCase();
+ keywordResults.update();
+ } catch (IllegalStateException notUsed) {
+ /**
+ * Case is closed, do nothing.
+ */
+ }
} else if (eventType.equals(Case.Events.CURRENT_CASE.toString())) {
// case was closed. Remove listeners so that we don't get called with a stale case handle
if (evt.getNewValue() == null) {
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesChildren.java
index 46739ee2a7..391a49f757 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesChildren.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesChildren.java
@@ -20,7 +20,6 @@ package org.sleuthkit.autopsy.datamodel;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Statement;
import java.util.Arrays;
import java.util.Calendar;
import java.util.List;
@@ -78,7 +77,7 @@ class RecentFilesChildren extends ChildFactory {
//TODO add a generic query to SleuthkitCase
private String createMaxQuery(String attr) {
- return "SELECT MAX(" + attr + ") from tsk_files WHERE " + attr + " < " + System.currentTimeMillis() / 1000; //NON-NLS
+ return "SELECT MAX(" + attr + ") FROM tsk_files WHERE " + attr + " < " + System.currentTimeMillis() / 1000; //NON-NLS
}
@SuppressWarnings("deprecation")
@@ -87,6 +86,7 @@ class RecentFilesChildren extends ChildFactory {
try (CaseDbQuery dbQuery = skCase.executeQuery(query)) {
ResultSet resultSet = dbQuery.getResultSet();
+ resultSet.next();
result = resultSet.getLong(1);
} catch (TskCoreException | SQLException ex) {
logger.log(Level.WARNING, "Couldn't get recent files results: ", ex); //NON-NLS
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/Reports.java b/Core/src/org/sleuthkit/autopsy/datamodel/Reports.java
index d9da8d8b1b..013aa71ec0 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/Reports.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/Reports.java
@@ -1,7 +1,7 @@
/*
* Autopsy Forensic Browser
*
- * Copyright 2014 Basis Technology Corp.
+ * Copyright 2011-2015 Basis Technology Corp.
* Contact: carrier sleuthkit org
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -101,8 +101,21 @@ public final class Reports implements AutopsyVisitableItem {
@Override
public void propertyChange(PropertyChangeEvent evt) {
String eventType = evt.getPropertyName();
- if (eventType.equals(Case.Events.REPORT_ADDED.toString()) || eventType.equals(Case.Events.REPORT_DELETED.toString())) {
- ReportNodeFactory.this.refresh(true);
+ if (eventType.equals(Case.Events.REPORT_ADDED.toString())) {
+ /**
+ * Checking for a current case is a stop gap measure
+ * until a different way of handling the closing of
+ * cases is worked out. Currently, remote events may be
+ * received for a case that is already closed.
+ */
+ try {
+ Case.getCurrentCase();
+ ReportNodeFactory.this.refresh(true);
+ } catch (IllegalStateException notUsed) {
+ /**
+ * Case is closed, do nothing.
+ */
+ }
}
}
});
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/Tags.java b/Core/src/org/sleuthkit/autopsy/datamodel/Tags.java
index b09c11c9c9..aa9eec9b5f 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/Tags.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/Tags.java
@@ -1,7 +1,7 @@
/*
* Autopsy Forensic Browser
*
- * Copyright 2013 Basis Technology Corp.
+ * Copyright 2011-2015 Basis Technology Corp.
* Contact: carrier sleuthkit org
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -120,11 +120,38 @@ public class Tags implements AutopsyVisitableItem {
|| eventType.equals(Case.Events.BLACKBOARD_ARTIFACT_TAG_DELETED.toString())
|| eventType.equals(Case.Events.CONTENT_TAG_ADDED.toString())
|| eventType.equals(Case.Events.CONTENT_TAG_DELETED.toString())) {
- refresh(true);
- tagResults.update();
- } else if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString()) || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) {
- refresh(true);
- tagResults.update();
+ /**
+ * Checking for a current case is a stop gap measure until a
+ * different way of handling the closing of cases is worked
+ * out. Currently, remote events may be received for a case
+ * that is already closed.
+ */
+ try {
+ Case.getCurrentCase();
+ refresh(true);
+ tagResults.update();
+ } catch (IllegalStateException notUsed) {
+ /**
+ * Case is closed, do nothing.
+ */
+ }
+ } else if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString())
+ || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) {
+ /**
+ * Checking for a current case is a stop gap measure until a
+ * different way of handling the closing of cases is worked
+ * out. Currently, remote events may be received for a case
+ * that is already closed.
+ */
+ try {
+ Case.getCurrentCase();
+ refresh(true);
+ tagResults.update();
+ } catch (IllegalStateException notUsed) {
+ /**
+ * Case is closed, do nothing.
+ */
+ }
} else if (eventType.equals(Case.Events.CURRENT_CASE.toString())) {
// case was closed. Remove listeners so that this can be garbage collected
if (evt.getNewValue() == null) {
@@ -435,7 +462,7 @@ public class Tags implements AutopsyVisitableItem {
BlackboardArtifactTagNodeFactory(TagName tagName) {
super();
this.tagName = tagName;
- tagResults.addObserver(this);
+ tagResults.addObserver(this);
}
@Override
@@ -454,7 +481,8 @@ public class Tags implements AutopsyVisitableItem {
// The blackboard artifact tags to be wrapped are used as the keys.
return new BlackboardArtifactTagNode(key);
}
- @Override
+
+ @Override
public void update(Observable o, Object arg) {
refresh(true);
}
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/VolumeNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/VolumeNode.java
index 4e8e2e24fe..eb4b76a233 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/VolumeNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/VolumeNode.java
@@ -18,13 +18,21 @@
*/
package org.sleuthkit.autopsy.datamodel;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.List;
import javax.swing.Action;
+import org.openide.nodes.Children;
import org.openide.nodes.Sheet;
import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.directorytree.ExplorerNodeActionVisitor;
import org.sleuthkit.autopsy.directorytree.NewWindowViewAction;
+import org.sleuthkit.autopsy.ingest.IngestManager;
+import org.sleuthkit.autopsy.ingest.ModuleContentEvent;
+import org.sleuthkit.datamodel.Content;
+import org.sleuthkit.datamodel.TskCoreException;
+import org.sleuthkit.datamodel.VirtualDirectory;
import org.sleuthkit.datamodel.Volume;
/**
@@ -60,8 +68,46 @@ public class VolumeNode extends AbstractContentNode {
this.setDisplayName(tempVolName);
this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/vol-icon.png"); //NON-NLS
+ // Listen for ingest events so that we can detect new added files (e.g. carved)
+ IngestManager.getInstance().addIngestModuleEventListener(pcl);
+
}
+ private final PropertyChangeListener pcl = (PropertyChangeEvent evt) -> {
+ String eventType = evt.getPropertyName();
+
+ // See if the new file is a child of ours
+ if (eventType.equals(IngestManager.IngestModuleEvent.CONTENT_CHANGED.toString())) {
+ if ((evt.getOldValue() instanceof ModuleContentEvent) == false) {
+ return;
+ }
+ ModuleContentEvent moduleContentEvent = (ModuleContentEvent) evt.getOldValue();
+ if ((moduleContentEvent.getSource() instanceof Content) == false) {
+ return;
+ }
+ Content newContent = (Content) moduleContentEvent.getSource();
+
+ try {
+ Content parent = newContent.getParent();
+ if (parent != null) {
+ // Is this a new carved file?
+ if (parent.getName().equals(VirtualDirectory.NAME_CARVED)) {
+ // Was this new carved file produced from this volume?
+ if (parent.getParent().getId() == getContent().getId()) {
+ Children children = getChildren();
+ if (children != null) {
+ ((ContentChildren) children).refreshChildren();
+ children.getNodesCount();
+ }
+ }
+ }
+ }
+ } catch (TskCoreException ex) {
+ // Do nothing.
+ }
+ }
+ };
+
/**
* Right click action for volume node
*
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java b/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
index ac9594c776..e4c34ebce9 100755
--- a/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
@@ -239,6 +239,11 @@ public class DataResultFilterNode extends FilterNode {
actions.add(AddContentTagAction.getInstance());
actions.add(AddBlackboardArtifactTagAction.getInstance());
actions.addAll(ContextMenuExtensionPoint.getActions());
+ } else {
+ // There's no specific file associated with the artifact, but
+ // we can still tag the artifact itself
+ actions.add(null);
+ actions.add(AddBlackboardArtifactTagAction.getInstance());
}
return actions;
}
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
index a5a2468cf7..da49e1546f 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
@@ -1,7 +1,7 @@
/*
* Autopsy Forensic Browser
*
- * Copyright 2011-2014 Basis Technology Corp.
+ * Copyright 2011-2015 Basis Technology Corp.
* Contact: carrier sleuthkit org
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,13 +27,13 @@ import java.beans.PropertyVetoException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.logging.Level;
import java.util.prefs.PreferenceChangeEvent;
import java.util.prefs.PreferenceChangeListener;
import javax.swing.Action;
-import javax.swing.JPanel;
import javax.swing.SwingUtilities;
import javax.swing.tree.TreeSelectionModel;
import org.openide.explorer.ExplorerManager;
@@ -49,8 +49,10 @@ import org.openide.util.NbBundle;
import org.openide.windows.TopComponent;
import org.openide.windows.WindowManager;
import org.sleuthkit.autopsy.casemodule.Case;
+import org.sleuthkit.autopsy.core.RuntimeProperties;
import org.sleuthkit.autopsy.core.UserPreferences;
import org.sleuthkit.autopsy.corecomponentinterfaces.BlackboardResultViewer;
+import org.sleuthkit.autopsy.corecomponentinterfaces.CoreComponentControl;
import org.sleuthkit.autopsy.corecomponentinterfaces.DataExplorer;
import org.sleuthkit.autopsy.corecomponents.DataResultTopComponent;
import org.sleuthkit.autopsy.corecomponents.TableFilterNode;
@@ -83,21 +85,14 @@ import org.sleuthkit.datamodel.TskException;
// Registered as a service provider for DataExplorer in layer.xml
public final class DirectoryTreeTopComponent extends TopComponent implements DataExplorer, ExplorerManager.Provider, BlackboardResultViewer {
- private transient ExplorerManager em = new ExplorerManager();
+ private final transient ExplorerManager em = new ExplorerManager();
private static DirectoryTreeTopComponent instance;
- private DataResultTopComponent dataResult = new DataResultTopComponent(true, NbBundle.getMessage(this.getClass(),
+ private final DataResultTopComponent dataResult = new DataResultTopComponent(true, NbBundle.getMessage(this.getClass(),
"DirectoryTreeTopComponent.title.text"));
- private LinkedList backList;
- private LinkedList forwardList;
- /**
- * path to the icon used by the component and its open action
- */
-// static final String ICON_PATH = "SET/PATH/TO/ICON/HERE";
+ private final LinkedList backList;
+ private final LinkedList forwardList;
private static final String PREFERRED_ID = "DirectoryTreeTopComponent"; //NON-NLS
- private PropertyChangeSupport pcs;
- // for error handling
- private JPanel caller;
- private String className = this.getClass().toString();
+ private final PropertyChangeSupport pcs;
private static final Logger logger = Logger.getLogger(DirectoryTreeTopComponent.class.getName());
private RootContentChildren contentChildren;
@@ -143,7 +138,7 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
}
}
});
- Case.addPropertyChangeListener(this);
+ Case.addEventSubscriber(new HashSet<>(Arrays.asList(Case.Events.CURRENT_CASE.toString(), Case.Events.DATA_SOURCE_ADDED.toString())), this);
this.em.addPropertyChangeListener(this);
IngestManager.getInstance().addIngestJobEventListener(this);
IngestManager.getInstance().addIngestModuleEventListener(this);
@@ -529,70 +524,71 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
*/
@Override
public void propertyChange(PropertyChangeEvent evt) {
- String changed = evt.getPropertyName();
- Object oldValue = evt.getOldValue();
- Object newValue = evt.getNewValue();
+ if (RuntimeProperties.coreComponentsAreActive()) {
+ String changed = evt.getPropertyName();
+ if (changed.equals(Case.Events.CURRENT_CASE.toString())) { // changed current case
+ // When a case is closed, the old value of this property is the
+ // closed Case object and the new value is null. When a case is
+ // opened, the old value is null and the new value is the new Case
+ // object.
+ // @@@ This needs to be revisited. Perhaps case closed and case
+ // opened events instead of property change events would be a better
+ // solution. Either way, more probably needs to be done to clean up
+ // data model objects when a case is closed.
+ if (evt.getOldValue() != null && evt.getNewValue() == null) {
+ // The current case has been closed. Reset the ExplorerManager.
+ SwingUtilities.invokeLater(() -> {
+ Node emptyNode = new AbstractNode(Children.LEAF);
+ em.setRootContext(emptyNode);
+ });
+ } else if (evt.getNewValue() != null) {
+ // A new case has been opened. Reset the ExplorerManager.
+ Case newCase = (Case) evt.getNewValue();
+ final String newCaseName = newCase.getName();
+ SwingUtilities.invokeLater(() -> {
+ em.getRootContext().setName(newCaseName);
+ em.getRootContext().setDisplayName(newCaseName);
- // change in the case name
- if (changed.equals(Case.Events.NAME.toString())) {
- // set the main title of the window
- String oldCaseName = oldValue.toString();
- String newCaseName = newValue.toString();
-
- // update the case name
- if ((!oldCaseName.equals("")) && (!newCaseName.equals(""))) {
- // change the root name and display name
- em.getRootContext().setName(newCaseName);
- em.getRootContext().setDisplayName(newCaseName);
- }
- } // changed current case
- else if (changed.equals(Case.Events.CURRENT_CASE.toString())) {
- // When a case is closed, the old value of this property is the
- // closed Case object and the new value is null. When a case is
- // opened, the old value is null and the new value is the new Case
- // object.
- // @@@ This needs to be revisited. Perhaps case closed and case
- // opened events instead of property change events would be a better
- // solution. Either way, more probably needs to be done to clean up
- // data model objects when a case is closed.
- if (oldValue != null && newValue == null) {
- // The current case has been closed. Reset the ExplorerManager.
- Node emptyNode = new AbstractNode(Children.LEAF);
- em.setRootContext(emptyNode);
- } else if (newValue != null) {
- // A new case has been opened. Reset the forward and back
- // buttons. Note that a call to CoreComponentControl.openCoreWindows()
- // by the new Case object will lead to a componentOpened() call
- // that will repopulate the tree.
- // @@@ The repopulation of the tree in this fashion also merits
- // reconsideration.
- resetHistory();
- }
- } // if the image is added to the case
- else if (changed.equals(Case.Events.DATA_SOURCE_ADDED.toString())) {
- // we don't need to do anything in here.
- // DataSourcesNode is listening for these events and updates itself
- } // change in node selection
- else if (changed.equals(ExplorerManager.PROP_SELECTED_NODES)) {
- respondSelection((Node[]) oldValue, (Node[]) newValue);
- } else if (changed.equals(IngestManager.IngestModuleEvent.DATA_ADDED.toString())) {
- // nothing to do here.
- // all nodes should be listening for these events and update accordingly.
- } else if (changed.equals(IngestManager.IngestJobEvent.COMPLETED.toString())
- || changed.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) {
- SwingUtilities.invokeLater(new Runnable() {
- @Override
- public void run() {
- refreshDataSourceTree();
+ // Reset the forward and back
+ // buttons. Note that a call to CoreComponentControl.openCoreWindows()
+ // by the new Case object will lead to a componentOpened() call
+ // that will repopulate the tree.
+ // @@@ The repopulation of the tree in this fashion also merits
+ // reconsideration.
+ resetHistory();
+ });
}
- });
- } else if (changed.equals(IngestManager.IngestModuleEvent.CONTENT_CHANGED.toString())) {
- SwingUtilities.invokeLater(new Runnable() {
- @Override
- public void run() {
- refreshDataSourceTree();
+ } // if the image is added to the case
+ else if (changed.equals(Case.Events.DATA_SOURCE_ADDED.toString())) {
+ /**
+ * Checking for a current case is a stop gap measure until a
+ * different way of handling the closing of cases is worked out.
+ * Currently, remote events may be received for a case that is
+ * already closed.
+ */
+ try {
+ Case currentCase = Case.getCurrentCase();
+ // We only need to trigger openCoreWindows() when the
+ // first data source is added.
+ if (currentCase.getDataSources().size() == 1) {
+ SwingUtilities.invokeLater(() -> {
+ CoreComponentControl.openCoreWindows();
+ });
+ }
+ } catch (IllegalStateException | TskCoreException notUsed) {
+ /**
+ * Case is closed, do nothing.
+ */
}
- });
+ } // change in node selection
+ else if (changed.equals(ExplorerManager.PROP_SELECTED_NODES)) {
+ SwingUtilities.invokeLater(() -> {
+ respondSelection((Node[]) evt.getOldValue(), (Node[]) evt.getNewValue());
+ });
+ } else if (changed.equals(IngestManager.IngestModuleEvent.DATA_ADDED.toString())) {
+ // nothing to do here.
+ // all nodes should be listening for these events and update accordingly.
+ }
}
}
@@ -773,7 +769,7 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
Node imagesNode = imagesNodeOrig.getNode();
- DataSourcesNode.DataSourcesNodeChildren contentRootChildren = (DataSourcesNode.DataSourcesNodeChildren) imagesNode.getChildren();
+ DataSourcesNode.DataSourcesNodeChildren contentRootChildren = (DataSourcesNode.DataSourcesNodeChildren) imagesNode.getChildren();
contentRootChildren.refreshContentKeys();
//final TreeView tree = getTree();
@@ -782,56 +778,6 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
}
- /**
- * Refreshes the nodes in the tree to reflect updates in the database should
- * be called in the gui thread
- */
-// public void refreshResultsTree(final BlackboardArtifact.ARTIFACT_TYPE... types) {
-// //save current selection
-// Node selectedNode = getSelectedNode();
-// final String[] selectedPath = NodeOp.createPath(selectedNode, em.getRootContext());
-//
-// //TODO: instead, we should choose a specific key to refresh? Maybe?
-// //contentChildren.refreshKeys();
-//
-// Children dirChilds = em.getRootContext().getChildren();
-//
-// Node results = dirChilds.findChild(ResultsNode.NAME);
-// if (results == null) {
-// logger.log(Level.SEVERE, "Cannot find Results filter node, won't refresh the bb tree"); //NON-NLS
-// return;
-// }
-//
-// OriginalNode original = results.getLookup().lookup(OriginalNode.class);
-// ResultsNode resultsNode = (ResultsNode) original.getNode();
-// RootContentChildren resultsNodeChilds = (RootContentChildren) resultsNode.getChildren();
-// resultsNodeChilds.refreshKeys(types);
-//
-//
-// final TreeView tree = getTree();
-// // @@@ tree.expandNode(results);
-//
-// Children resultsChilds = results.getChildren();
-// if (resultsChilds == null) {
-// return;
-// }
-//
-// Node childNode = resultsChilds.findChild(KeywordHits.NAME);
-// if (childNode == null) {
-// return;
-// }
-// // @@@tree.expandNode(childNode);
-//
-// childNode = resultsChilds.findChild(ExtractedContent.NAME);
-// if (childNode == null) {
-// return;
-// }
-// tree.expandNode(childNode);
-//
-// //restores selection if it was under the Results node
-// //@@@ setSelectedNode(selectedPath, ResultsNode.NAME);
-//
-// }
/**
* Set the selected node using a path to a previously selected node.
*
@@ -1002,10 +948,6 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
new BlackboardArtifactNode(art)).actionPerformed(null);
}
-// private class HistoryManager {
-// private Stack past, future;
-//
-// }
@Override
public void addOnFinishedListener(PropertyChangeListener l) {
DirectoryTreeTopComponent.this.addPropertyChangeListener(l);
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ExtractAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ExtractAction.java
index 95563ac502..a9b82e4680 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/ExtractAction.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/ExtractAction.java
@@ -24,8 +24,6 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.ExecutionException;
import java.util.logging.Level;
import org.openide.util.NbBundle;
@@ -101,7 +99,7 @@ public final class ExtractAction extends AbstractAction {
JFileChooser fileChooser = new JFileChooser();
fileChooser.setCurrentDirectory(new File(Case.getCurrentCase().getExportDirectory()));
// If there is an attribute name, change the ":". Otherwise the extracted file will be hidden
- fileChooser.setSelectedFile(new File(selectedFile.getName().replace(':', '_')));
+ fileChooser.setSelectedFile(new File(FileUtil.escapeFileName(selectedFile.getName())));
if (fileChooser.showSaveDialog((Component) e.getSource()) == JFileChooser.APPROVE_OPTION) {
ArrayList fileExtractionTasks = new ArrayList<>();
fileExtractionTasks.add(new FileExtractionTask(selectedFile, fileChooser.getSelectedFile()));
@@ -136,7 +134,7 @@ public final class ExtractAction extends AbstractAction {
ArrayList fileExtractionTasks = new ArrayList<>();
for (AbstractFile source : selectedFiles) {
// If there is an attribute name, change the ":". Otherwise the extracted file will be hidden
- fileExtractionTasks.add(new FileExtractionTask(source, new File(destinationFolder, source.getId() + "-" + source.getName().replace(':', '_'))));
+ fileExtractionTasks.add(new FileExtractionTask(source, new File(destinationFolder, source.getId() + "-" + FileUtil.escapeFileName(source.getName()))));
}
runExtractionTasks(e, fileExtractionTasks);
}
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ExtractUnallocAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ExtractUnallocAction.java
index 02ad08379d..d4738fb675 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/ExtractUnallocAction.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/ExtractUnallocAction.java
@@ -121,7 +121,7 @@ final class ExtractUnallocAction extends AbstractAction {
}
};
- fc.setCurrentDirectory(new File(Case.getCurrentCase().getCaseDirectory() + File.separator + "Export"));
+ fc.setCurrentDirectory(new File(Case.getCurrentCase().getExportDirectory()));
fc.setDialogTitle(
NbBundle.getMessage(this.getClass(), "ExtractUnallocAction.dlgTitle.selectDirToSaveTo.msg"));
fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
@@ -503,7 +503,7 @@ final class ExtractUnallocAction extends AbstractAction {
this.ImageId = img.getId();
this.ImageName = img.getName();
this.FileName = this.ImageName + "-Unalloc-" + this.ImageId + "-" + 0 + ".dat"; //NON-NLS
- this.FileInstance = new File(Case.getCurrentCase().getCaseDirectory() + File.separator + "Export" + File.separator + this.FileName);
+ this.FileInstance = new File(Case.getCurrentCase().getExportDirectory() + File.separator + this.FileName);
this.SizeInBytes = calcSizeInBytes();
}
@@ -523,7 +523,7 @@ final class ExtractUnallocAction extends AbstractAction {
this.ImageId = 0;
}
this.FileName = this.ImageName + "-Unalloc-" + this.ImageId + "-" + VolumeId + ".dat"; //NON-NLS
- this.FileInstance = new File(Case.getCurrentCase().getCaseDirectory() + File.separator + "Export" + File.separator + this.FileName);
+ this.FileInstance = new File(Case.getCurrentCase().getExportDirectory() + File.separator + this.FileName);
this.llf = getUnallocFiles(volu);
Collections.sort(llf, new SortObjId());
this.SizeInBytes = calcSizeInBytes();
diff --git a/Core/src/org/sleuthkit/autopsy/events/AutopsyEvent.java b/Core/src/org/sleuthkit/autopsy/events/AutopsyEvent.java
index fdaf727867..63a0222e54 100644
--- a/Core/src/org/sleuthkit/autopsy/events/AutopsyEvent.java
+++ b/Core/src/org/sleuthkit/autopsy/events/AutopsyEvent.java
@@ -1,19 +1,98 @@
/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2015 Basis Technology Corp.
+ * Contact: carrier sleuthkit org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.sleuthkit.autopsy.events;
import java.beans.PropertyChangeEvent;
+import java.io.Serializable;
+import javax.annotation.concurrent.Immutable;
/**
- * This is a place holder class to be overwritten by the version in the
- * Collaborative branch.
+ * A base class for events to be published to registered subscribers on both
+ * this Autopsy node and other Autopsy nodes. The class extends
+ * PropertyChangeEvent to integrate with legacy use of JavaBeans
+ * PropertyChangeEvents and PropertyChangeListeners as an application event
+ * system, and implements Serializable to allow it to be published over a
+ * network in serialized form.
*/
-abstract class AutopsyEvent extends PropertyChangeEvent {
+@Immutable
+public class AutopsyEvent extends PropertyChangeEvent implements Serializable {
- AutopsyEvent(Object source, String propertyName, Object oldValue, Object newValue) {
- super(source, propertyName, oldValue, newValue);
+ private static final long serialVersionUID = 1L;
+ private SourceType sourceType;
+
+ /**
+ * Events have a source field set to local or remote to allow event
+ * subscribers to filter events by source type.
+ */
+ public enum SourceType {
+
+ LOCAL,
+ REMOTE
+ };
+
+ /**
+ * Constructs an event that can be published to registered subscribers on
+ * both this Autopsy node and other Autopsy nodes.
+ *
+ * @param eventName The event name.
+ * @param oldValue The "old" value to associate with the event. May be
+ * null.
+ * @param newValue The "new" value to associate with the event. May be
+ * null.
+ */
+ public AutopsyEvent(String eventName, Object oldValue, Object newValue) {
+ super(SourceType.LOCAL.toString(), eventName, oldValue, newValue);
+ this.sourceType = SourceType.LOCAL;
}
+
+ /**
+ * Gets the source type (local or remote).
+ *
+ * @return SourceType The source type of the event, local or remote.
+ */
+ public SourceType getSourceType() {
+ return sourceType;
+ }
+
+ /**
+ * Gets the source type (local or remote) as a string. This is for clients
+ * that do not have access to the AutopsyEvent type, and is necessary
+ * because the events package is not currently a public package within the
+ * Autopsy-Core NetBeans Module (NBM).
+ *
+ * @return A string, either "LOCAL" or "REMOTE", as an Object.
+ */
+ @Override
+ public Object getSource() {
+ return sourceType.toString();
+ }
+
+ /**
+ * Sets the source type (local or remote). This field is mutable in this way
+ * to allow an event to be published both locally and remotely without
+ * requiring the construction of two separate objects. It is for use by the
+ * event publishing classes within this package only.
+ *
+ * @param sourceType The source type of the event, local or remote.
+ */
+ void setSourceType(SourceType sourceType) {
+ this.sourceType = sourceType;
+ }
+
}
diff --git a/Core/src/org/sleuthkit/autopsy/events/TagAddedEvent.java b/Core/src/org/sleuthkit/autopsy/events/AutopsyEventException.java
similarity index 54%
rename from Core/src/org/sleuthkit/autopsy/events/TagAddedEvent.java
rename to Core/src/org/sleuthkit/autopsy/events/AutopsyEventException.java
index 217af496cc..5f1ce611ed 100644
--- a/Core/src/org/sleuthkit/autopsy/events/TagAddedEvent.java
+++ b/Core/src/org/sleuthkit/autopsy/events/AutopsyEventException.java
@@ -19,28 +19,37 @@
package org.sleuthkit.autopsy.events;
import javax.annotation.concurrent.Immutable;
-import org.sleuthkit.autopsy.casemodule.Case;
-import org.sleuthkit.datamodel.Tag;
/**
- * Base Class for events that are fired when a Tag is added
+ * Provides a generic events system exception for clients of the events package.
*/
@Immutable
-abstract class TagAddedEvent extends TagEvent {
+public final class AutopsyEventException extends Exception {
- protected TagAddedEvent(String propertyName, T newValue) {
- super(Case.class, propertyName, null, newValue);
+ /**
+ * Constructs a new exception with null as its message.
+ */
+ AutopsyEventException() {
+ super();
}
/**
- * get the Tag that was added
+ * Constructs a new exception with the specified message.
*
- * @return the tTag
+ * @param message The message.
*/
- @SuppressWarnings("unchecked")
- @Override
- public T getTag() {
- return (T) getNewValue();
+ AutopsyEventException(String message) {
+ super(message);
+ }
+
+ /**
+ * Constructs a new exception with the specified message and cause.
+ *
+ * @param message The message.
+ * @param cause The cause.
+ */
+ AutopsyEventException(String message, Throwable cause) {
+ super(message, cause);
}
}
diff --git a/Core/src/org/sleuthkit/autopsy/events/AutopsyEventPublisher.java b/Core/src/org/sleuthkit/autopsy/events/AutopsyEventPublisher.java
new file mode 100644
index 0000000000..80c23d924f
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/events/AutopsyEventPublisher.java
@@ -0,0 +1,170 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2011-2015 Basis Technology Corp.
+ * Contact: carrier sleuthkit org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.events;
+
+import java.beans.PropertyChangeListener;
+import java.net.URISyntaxException;
+import java.util.Set;
+import java.util.logging.Level;
+import javax.jms.JMSException;
+import org.sleuthkit.autopsy.core.UserPreferencesException;
+import org.sleuthkit.autopsy.core.UserPreferences;
+import org.sleuthkit.autopsy.coreutils.Logger;
+
+/**
+ * Provides thread-safe support for publishing events to registered subscribers
+ * on both this Autopsy node and other Autopsy nodes. Subscribers are
+ * constrained to be PropertyChangeListeners to integrate with the legacy use of
+ * JavaBeans PropertyChangeEvents and PropertyChangeListeners as an application
+ * event system.
+ */
+public final class AutopsyEventPublisher {
+
+ /**
+ * Composed of thread-safe objects.
+ */
+ private static final Logger logger = Logger.getLogger(AutopsyEventPublisher.class.getName());
+ private final LocalEventPublisher localPublisher;
+ private RemoteEventPublisher remotePublisher;
+
+ /**
+ * Constructs an object for publishing events to registered subscribers on
+ * both this Autopsy node and other Autopsy nodes. Communication with other
+ * nodes is not turned on by default - call openRemoteEventChannel() after
+ * construction.
+ */
+ public AutopsyEventPublisher() {
+ localPublisher = new LocalEventPublisher();
+ }
+
+ /**
+ * Opens the event channel used for publishing events to and receiving
+ * events from other Autopsy nodes. Only one channel may be open at a time.
+ *
+ * @param channelName The name of the event channel.
+ *
+ * @throws AutopsyEventException if the channel was not opened.
+ */
+ public void openRemoteEventChannel(String channelName) throws AutopsyEventException {
+ if (null != remotePublisher) {
+ closeRemoteEventChannel();
+ }
+ try {
+ remotePublisher = new RemoteEventPublisher(channelName, localPublisher, UserPreferences.getMessageServiceConnectionInfo());
+ } catch (URISyntaxException | JMSException ex) {
+ String message = "Failed to open remote event channel"; //NON-NLS
+ logger.log(Level.SEVERE, message, ex);
+ throw new AutopsyEventException(message, ex);
+ } catch (UserPreferencesException ex) {
+ String message = "Error accessing messaging service connection info"; //NON-NLS
+ logger.log(Level.SEVERE, message, ex);
+ throw new AutopsyEventException(message, ex);
+ }
+ }
+
+ /**
+ * Closes the event channel used for publishing events to and receiving
+ * events from other Autopsy nodes.
+ */
+ public void closeRemoteEventChannel() {
+ if (null != remotePublisher) {
+ try {
+ remotePublisher.stop();
+ } catch (JMSException ex) {
+ logger.log(Level.SEVERE, "Error closing remote event channel", ex); //NON-NLS
+ }
+ remotePublisher = null;
+ }
+ }
+
+ /**
+ * Adds an event subscriber to this publisher.
+ *
+ * @param eventNames The events the subscriber is interested in.
+ * @param subscriber The subscriber to add.
+ */
+ public void addSubscriber(Set eventNames, PropertyChangeListener subscriber) {
+ localPublisher.addSubscriber(eventNames, subscriber);
+ }
+
+ /**
+ * Adds an event subscriber to this publisher.
+ *
+ * @param eventName The event the subscriber is interested in.
+ * @param subscriber The subscriber to add.
+ */
+ public void addSubscriber(String eventName, PropertyChangeListener subscriber) {
+ localPublisher.addSubscriber(eventName, subscriber);
+ }
+
+ /**
+ * Removes an event subscriber from this publisher.
+ *
+ * @param eventNames The events the subscriber is no longer interested in.
+ * @param subscriber The subscriber to remove.
+ */
+ public void removeSubscriber(Set eventNames, PropertyChangeListener subscriber) {
+ localPublisher.removeSubscriber(eventNames, subscriber);
+ }
+
+ /**
+ * Removes an event subscriber from this publisher.
+ *
+ * @param eventName The event the subscriber is no longer interested in.
+ * @param subscriber The subscriber to remove.
+ */
+ public void removeSubscriber(String eventName, PropertyChangeListener subscriber) {
+ localPublisher.removeSubscriber(eventName, subscriber);
+ }
+
+ /**
+ * Publishes an event to this Autopsy node and other Autopsy nodes.
+ *
+ * @param event The event to publish.
+ */
+ public void publish(AutopsyEvent event) {
+ publishLocally(event);
+ publishRemotely(event);
+ }
+
+ /**
+ * Publishes an event to this Autopsy node only.
+ *
+ * @param event The event to publish.
+ */
+ public void publishLocally(AutopsyEvent event) {
+ localPublisher.publish(event);
+ }
+
+ /**
+ * Publishes an event to other Autopsy nodes only.
+ *
+ * @param event The event to publish.
+ */
+ public void publishRemotely(AutopsyEvent event) {
+ if (null != remotePublisher) {
+ try {
+ remotePublisher.publish(event);
+ } catch (JMSException ex) {
+ logger.log(Level.SEVERE, String.format("Failed to publish %s event remotely", event.getPropertyName()), ex); //NON-NLS
+ }
+ }
+ }
+
+}
diff --git a/Core/src/org/sleuthkit/autopsy/events/Bundle.properties b/Core/src/org/sleuthkit/autopsy/events/Bundle.properties
new file mode 100755
index 0000000000..4c869740bd
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/events/Bundle.properties
@@ -0,0 +1,10 @@
+MessageServiceConnectionInfo.ConnectionCheck.Everything=Invalid hostname, port number, username, and/or password.
+MessageServiceConnectionInfo.ConnectionCheck.Hostname=Invalid hostname.
+MessageServiceConnectionInfo.ConnectionCheck.Port=Invalid port number.
+MessageServiceConnectionInfo.ConnectionCheck.Username=Invalid username.
+MessageServiceConnectionInfo.ConnectionCheck.Password=Invalid password.
+MessageServiceConnectionInfo.ConnectionCheck.UsernameAndPassword=Invalid username and/or password.
+MessageServiceConnectionInfo.ConnectionCheck.HostnameOrPort=Invalid hostname and/or port number.
+MessageServiceConnectionInfo.MissingHostname=Missing hostname.
+MessageServiceConnectionInfo.MissingUsername=Missing username.
+MessageServiceConnectionInfo.MissingPassword=Missing password.
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/events/LocalEventPublisher.java b/Core/src/org/sleuthkit/autopsy/events/LocalEventPublisher.java
new file mode 100644
index 0000000000..3972bed895
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/events/LocalEventPublisher.java
@@ -0,0 +1,116 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2011-2015 Basis Technology Corp.
+ * Contact: carrier sleuthkit org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.events;
+
+import java.beans.PropertyChangeListener;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Level;
+import org.sleuthkit.autopsy.coreutils.Logger;
+
+/**
+ * Provides thread-safe support for publishing events to registered subscribers
+ * on this Autopsy node. Subscribers are constrained to be
+ * PropertyChangeListeners to integrate with the legacy use of JavaBeans
+ * PropertyChangeEvents and PropertyChangeListeners as an application event
+ * system.
+ */
+final class LocalEventPublisher {
+
+ private static final Logger logger = Logger.getLogger(LocalEventPublisher.class.getName());
+ private final Map> subscribersByEvent;
+
+ /**
+ * Constructs an object for publishing events to registered subscribers on
+ * this Autopsy node.
+ */
+ LocalEventPublisher() {
+ subscribersByEvent = new ConcurrentHashMap<>();
+ }
+
+ /**
+ * Adds an event subscriber to this publisher.
+ *
+ * @param eventNames The events the subscriber is interested in.
+ * @param subscriber The subscriber to add.
+ */
+ void addSubscriber(Set eventNames, PropertyChangeListener subscriber) {
+ for (String eventName : eventNames) {
+ addSubscriber(eventName, subscriber);
+ }
+ }
+
+ /**
+ * Adds an event subscriber to this publisher.
+ *
+ * @param eventName The event the subscriber is interested in.
+ * @param subscriber The subscriber to add.
+ */
+ void addSubscriber(String eventName, PropertyChangeListener subscriber) {
+ subscribersByEvent.putIfAbsent(eventName, ConcurrentHashMap.newKeySet());
+ Set subscribers = subscribersByEvent.get(eventName);
+ subscribers.add(subscriber);
+ }
+
+ /**
+ * Removes an event subscriber from this publisher.
+ *
+ * @param eventNames The events the subscriber is no longer interested in.
+ * @param subscriber The subscriber to remove.
+ */
+ void removeSubscriber(Set eventNames, PropertyChangeListener subscriber) {
+ for (String eventName : eventNames) {
+ removeSubscriber(eventName, subscriber);
+ }
+ }
+
+ /**
+ * Removes an event subscriber from this publisher.
+ *
+ * @param eventNames The event the subscriber is no longer interested in.
+ * @param subscriber The subscriber to remove.
+ */
+ void removeSubscriber(String eventName, PropertyChangeListener subscriber) {
+ Set subscribers = subscribersByEvent.getOrDefault(eventName, null);
+ if (null != subscribers) {
+ subscribers.remove(subscriber);
+ }
+ }
+
+ /**
+ * Publishes an event to all registered subscribers, even if a subscriber
+ * throws an exception.
+ *
+ * @param event The event to be published.
+ */
+ void publish(AutopsyEvent event) {
+ Set subscribers = subscribersByEvent.getOrDefault(event.getPropertyName(), null);
+ if (null != subscribers) {
+ for (PropertyChangeListener subscriber : subscribers) {
+ try {
+ subscriber.propertyChange(event);
+ } catch (Exception ex) {
+ logger.log(Level.SEVERE, "Exception thrown by subscriber", ex);
+ }
+ }
+ }
+ }
+
+}
diff --git a/Core/src/org/sleuthkit/autopsy/events/MessageServiceConnectionInfo.java b/Core/src/org/sleuthkit/autopsy/events/MessageServiceConnectionInfo.java
new file mode 100644
index 0000000000..95b40963c0
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/events/MessageServiceConnectionInfo.java
@@ -0,0 +1,178 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2015 Basis Technology Corp.
+ * Contact: carrier sleuthkit org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.events;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import javax.annotation.concurrent.Immutable;
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.util.MissingResourceException;
+import org.openide.util.NbBundle;
+
+/**
+ * Connection info for a Java Message Service (JMS) provider. Thread-safe.
+ */
+@Immutable
+public final class MessageServiceConnectionInfo {
+
+ private static final String MESSAGE_SERVICE_URI = "tcp://%s:%s?wireFormat.maxInactivityDuration=0";
+ private static final String CONNECTION_TIMED_OUT = "connection timed out";
+ private static final String CONNECTION_REFUSED = "connection refused";
+ private static final String PASSWORD_OR_USERNAME_BAD = "user name [";
+ private static final int IS_REACHABLE_TIMEOUT_MS = 1000;
+ private final String userName;
+ private final String password;
+ private final String host;
+ private final int port;
+
+ /**
+ * Constructs an object containing connection info for a Java Message
+ * Service (JMS) provider.
+ *
+ * @param host The host to use for a message service connection. May be
+ * a host name or an IP address.
+ * @param port The port number to use for a message service connection.
+ * @param userName The user name to use for a message service connection.
+ * @param password The password to use for a message service connection.
+ *
+ */
+ public MessageServiceConnectionInfo(String host, int port, String userName, String password) {
+ this.host = host;
+ this.port = port;
+ this.userName = userName;
+ this.password = password;
+ }
+
+ /**
+ * Gets the user name to use for a message service connection.
+ *
+ * @return The user name as a string.
+ */
+ public String getUserName() {
+ return userName;
+ }
+
+ /**
+ * Gets the password to use for a message service connection.
+ *
+ * @return The password as a string.
+ */
+ public String getPassword() {
+ return password;
+ }
+
+ /**
+ * Gets the host to use for a message service connection. May be a host name
+ * or an IP address.
+ *
+ * @return The host as a string.
+ */
+ public String getHost() {
+ return host;
+ }
+
+ /**
+ * Gets the port number to use for a message service connection.
+ *
+ * @return The port as an int.
+ */
+ public int getPort() {
+ return port;
+ }
+
+ /**
+ * Gets the TCP URI to use for a message service connection.
+ *
+ * @return The URI.
+ *
+ * @throws URISyntaxException if the connection info is not for a valid TCP
+ * URI.
+ */
+ URI getURI() throws URISyntaxException {
+ return new URI(String.format(MESSAGE_SERVICE_URI, getHost(), Integer.toString(getPort())));
+ }
+
+ /**
+ * Verifies connection to messaging service. Throws if we cannot communicate
+ * with messaging service.
+ *
+ * When issues occur, it attempts to diagnose them by looking at the
+ * exception messages, returning the appropriate user-facing text for the
+ * exception received. This method expects the Exceptions messages to be in
+ * English and compares against English text.
+ *
+ * @throws org.sleuthkit.autopsy.events.MessageServiceException
+ */
+ public void tryConnect() throws MessageServiceException {
+ if (host == null || host.isEmpty()) {
+ throw new MessageServiceException(NbBundle.getMessage(MessageServiceConnectionInfo.class, "MessageServiceConnectionInfo.MissingHostname")); //NON-NLS
+ } else if (userName == null || userName.isEmpty()) {
+ throw new MessageServiceException(NbBundle.getMessage(MessageServiceConnectionInfo.class, "MessageServiceConnectionInfo.MissingUsername")); //NON-NLS
+ } else if (password == null || password.isEmpty()) {
+ throw new MessageServiceException(NbBundle.getMessage(MessageServiceConnectionInfo.class, "MessageServiceConnectionInfo.MissingPassword")); //NON-NLS
+ }
+ try {
+ ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(getUserName(), getPassword(), getURI());
+ Connection connection = connectionFactory.createConnection(getUserName(), getPassword());
+ connection.start();
+ connection.close();
+ } catch (URISyntaxException ex) {
+ // The hostname or port seems bad
+ throw new MessageServiceException(NbBundle.getMessage(MessageServiceConnectionInfo.class, "MessageServiceConnectionInfo.ConnectionCheck.HostnameOrPort")); //NON-NLS
+ } catch (JMSException ex) {
+ String result;
+ Throwable cause = ex.getCause();
+ if (cause != null) {
+ // there is more information from another exception
+ String msg = cause.getMessage();
+ if (msg.startsWith(CONNECTION_TIMED_OUT)) {
+ // The hostname or IP address seems bad
+ result = NbBundle.getMessage(MessageServiceConnectionInfo.class, "MessageServiceConnectionInfo.ConnectionCheck.Hostname"); //NON-NLS
+ } else if (msg.toLowerCase().startsWith(CONNECTION_REFUSED)) {
+ // The port seems bad
+ result = NbBundle.getMessage(MessageServiceConnectionInfo.class, "MessageServiceConnectionInfo.ConnectionCheck.Port"); //NON-NLS
+ } else if (msg.toLowerCase().startsWith(PASSWORD_OR_USERNAME_BAD)) {
+ // The username or password seems bad
+ result = NbBundle.getMessage(MessageServiceConnectionInfo.class, "MessageServiceConnectionInfo.ConnectionCheck.UsernameAndPassword"); //NON-NLS
+ } else {
+ // Could be either hostname or port number
+ result = NbBundle.getMessage(MessageServiceConnectionInfo.class, "MessageServiceConnectionInfo.ConnectionCheck.HostnameOrPort"); //NON-NLS
+ }
+ } else {
+ // there is no more information from another exception
+ try {
+ if (InetAddress.getByName(getHost()).isReachable(IS_REACHABLE_TIMEOUT_MS)) {
+ // if we can reach the host, then it's probably a port problem
+ result = NbBundle.getMessage(MessageServiceConnectionInfo.class, "MessageServiceConnectionInfo.ConnectionCheck.Port"); //NON-NLS
+ } else {
+ result = NbBundle.getMessage(MessageServiceConnectionInfo.class, "MessageServiceConnectionInfo.ConnectionCheck.Hostname"); //NON-NLS
+ }
+ } catch (IOException | MissingResourceException any) {
+ // it may be anything
+ result = NbBundle.getMessage(MessageServiceConnectionInfo.class, "MessageServiceConnectionInfo.ConnectionCheck.Everything"); //NON-NLS
+ }
+ }
+ throw new MessageServiceException(result);
+ }
+ }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/events/TagDeletedEvent.java b/Core/src/org/sleuthkit/autopsy/events/MessageServiceException.java
old mode 100644
new mode 100755
similarity index 50%
rename from Core/src/org/sleuthkit/autopsy/events/TagDeletedEvent.java
rename to Core/src/org/sleuthkit/autopsy/events/MessageServiceException.java
index 6a0a1c5668..f6079cb08d
--- a/Core/src/org/sleuthkit/autopsy/events/TagDeletedEvent.java
+++ b/Core/src/org/sleuthkit/autopsy/events/MessageServiceException.java
@@ -16,30 +16,38 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.sleuthkit.autopsy.events;
-import javax.annotation.concurrent.Immutable;
-import org.sleuthkit.autopsy.casemodule.Case;
-import org.sleuthkit.datamodel.Tag;
-
/**
- * Base Class for events that are fired when a Tag is deleted
+ * Provides a system exception for the Message Service.
*/
-@Immutable
-abstract class TagDeletedEvent extends TagEvent {
+public class MessageServiceException extends Exception {
+ private static final long serialVersionUID = 1L;
- protected TagDeletedEvent(String propertyName, T oldValue) {
- super(Case.class, propertyName, oldValue, null);
+ /**
+ * Constructs a new exception with null as its message.
+ */
+ public MessageServiceException() {
+ super();
}
/**
- * get the Tag that was deleted
+ * Constructs a new exception with the specified message.
*
- * @return the Tag
+ * @param message The message.
*/
- @SuppressWarnings("unchecked")
- @Override
- public T getTag() {
- return (T) getOldValue();
+ public MessageServiceException(String message) {
+ super(message);
+ }
+
+ /**
+ * Constructs a new exception with the specified message and cause.
+ *
+ * @param message The message.
+ * @param cause The cause.
+ */
+ public MessageServiceException(String message, Throwable cause) {
+ super(message, cause);
}
}
diff --git a/Core/src/org/sleuthkit/autopsy/events/RemoteEventPublisher.java b/Core/src/org/sleuthkit/autopsy/events/RemoteEventPublisher.java
new file mode 100644
index 0000000000..58a567e415
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/events/RemoteEventPublisher.java
@@ -0,0 +1,158 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2011-2015 Basis Technology Corp.
+ * Contact: carrier sleuthkit org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.events;
+
+import java.net.URISyntaxException;
+import java.util.logging.Level;
+import javax.jms.Connection;
+import javax.jms.DeliveryMode;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
+import javax.jms.ObjectMessage;
+import javax.jms.Session;
+import javax.jms.Topic;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.sleuthkit.autopsy.coreutils.Logger;
+
+/**
+ * Provides thread-safe support for publishing events to registered subscribers
+ * on other Autopsy nodes and for publishing events from other Autopsy nodes.
+ * Subscribers on this node are constrained to be PropertyChangeListeners to
+ * integrate with the legacy use of JavaBeans PropertyChangeEvents and
+ * PropertyChangeListeners as an application event system.
+ */
+final class RemoteEventPublisher {
+
+ private static final Logger logger = Logger.getLogger(RemoteEventPublisher.class.getName());
+ private static final String ALL_MESSAGE_SELECTOR = "All";
+ private final LocalEventPublisher localPublisher;
+ private final Connection connection;
+ private final Session session;
+ private final MessageProducer producer;
+ private final MessageConsumer consumer;
+ private final MessageReceiver receiver;
+
+ /**
+ * Constructs an object for publishing events to registered subscribers on
+ * other Autopsy nodes and for publishing events from other Autopsy nodes.
+ *
+ * @param eventChannelName The name of the event channel to be used for
+ * communication with other Autopsy nodes.
+ * @param localPublisher An event publisher that will be used to publish
+ * events from other Autopsy nodes on this node.
+ * @param info Connection info for the message service.
+ *
+ * @throws URISyntaxException if the URI in the connection info is
+ * malformed.
+ * @throws JMSException if the connection to the message service
+ * cannot be made.
+ */
+ RemoteEventPublisher(String eventChannelName, LocalEventPublisher localPublisher, MessageServiceConnectionInfo info) throws URISyntaxException, JMSException {
+ try {
+ this.localPublisher = localPublisher;
+ ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(info.getUserName(), info.getPassword(), info.getURI());
+ connection = connectionFactory.createConnection();
+ connection.start();
+ session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Topic topic = session.createTopic(eventChannelName);
+ producer = session.createProducer(topic);
+ producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
+ consumer = session.createConsumer(topic, "events = '" + ALL_MESSAGE_SELECTOR + "'", true);
+ receiver = new MessageReceiver();
+ consumer.setMessageListener(receiver);
+ } catch (URISyntaxException | JMSException ex) {
+ logger.log(Level.SEVERE, "Failed to connect to event channel", ex);
+ try {
+ stop();
+ } catch (JMSException ignored) {
+ /**
+ * Not surprising if there is some error here, but it was worth
+ * trying to clean up.
+ */
+ }
+ throw ex;
+ }
+ }
+
+ /**
+ * Stops this publisher, causing it to disconnect from the message service.
+ *
+ * @throws JMSException if there is a problem closing the session or the
+ * connection.
+ */
+ synchronized void stop() throws JMSException {
+ if (null != producer) {
+ producer.close();
+ }
+ if (null != consumer) {
+ consumer.close();
+ }
+ if (null != session) {
+ session.close();
+ }
+ if (null != connection) {
+ connection.close();
+ }
+ }
+
+ /**
+ * Sends an event message to the message service.
+ *
+ * @param event The event to publish.
+ */
+ synchronized void publish(AutopsyEvent event) throws JMSException {
+ ObjectMessage message = session.createObjectMessage();
+ message.setStringProperty("events", ALL_MESSAGE_SELECTOR);
+ message.setObject(event);
+ producer.send(message);
+ }
+
+ /**
+ * Receives event messages from the message service and publishes them
+ * locally.
+ */
+ private final class MessageReceiver implements MessageListener {
+
+ /**
+ * Receives an event message from the message service and publishes it
+ * locally. Called by a JMS thread.
+ *
+ * @param message The message.
+ */
+ @Override
+ public void onMessage(Message message) {
+ try {
+ if (message instanceof ObjectMessage) {
+ ObjectMessage objectMessage = (ObjectMessage) message;
+ Object object = objectMessage.getObject();
+ if (object instanceof AutopsyEvent) {
+ AutopsyEvent event = (AutopsyEvent) object;
+ event.setSourceType(AutopsyEvent.SourceType.REMOTE);
+ localPublisher.publish(event);
+ }
+ }
+ } catch (Exception ex) {
+ logger.log(Level.SEVERE, "Error receiving message", ex);
+ }
+ }
+ }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/events/TagEvent.java b/Core/src/org/sleuthkit/autopsy/events/TagEvent.java
deleted file mode 100644
index b80725782d..0000000000
--- a/Core/src/org/sleuthkit/autopsy/events/TagEvent.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.sleuthkit.autopsy.events;
-
-import org.sleuthkit.datamodel.Tag;
-
-/**
- *
- */
-abstract public class TagEvent extends AutopsyEvent {
-
- public TagEvent(Object source, String propertyName, Object oldValue, Object newValue) {
- super(source, propertyName, oldValue, newValue);
- }
-
- /**
- * get the Tag that this event is for
- *
- * @return the Tag
- */
- public abstract T getTag();
-
-}
diff --git a/Core/src/org/sleuthkit/autopsy/examples/SampleExecutableDataSourceIngestModule.java b/Core/src/org/sleuthkit/autopsy/examples/SampleExecutableDataSourceIngestModule.java
index b65de71c98..b76bd08bc7 100755
--- a/Core/src/org/sleuthkit/autopsy/examples/SampleExecutableDataSourceIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/examples/SampleExecutableDataSourceIngestModule.java
@@ -84,7 +84,7 @@ public class SampleExecutableDataSourceIngestModule implements DataSourceIngestM
this.context = context;
if (refCounter.incrementAndGet(context.getJobId()) == 1) {
// Create an output directory for this job.
- outputDirPath = Case.getCurrentCase().getModulesOutputDirAbsPath() + File.separator + moduleName; //NON-NLS
+ outputDirPath = Case.getCurrentCase().getModuleDirectory() + File.separator + moduleName; //NON-NLS
File outputDir = new File(outputDirPath);
if (outputDir.exists() == false) {
outputDir.mkdirs();
diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/Bundle.properties b/Core/src/org/sleuthkit/autopsy/filesearch/Bundle.properties
index ea78d740c9..99c61a24ca 100644
--- a/Core/src/org/sleuthkit/autopsy/filesearch/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/filesearch/Bundle.properties
@@ -47,6 +47,7 @@ FileSearchPanel.search.results.msg=File Search\: {0} matches found
FileSearchPanel.search.results.details=Large number of matches may impact performance on some operations
FileSearchPanel.search.exception.noFilterSelected.msg=At least one filter must be selected.
FileSearchPanel.search.validationErr.msg=Validation Error\: {0}
+FileSearchPanel.emptyWhereClause.text=Invalid options, nothing to show.
KnownStatusSearchFilter.noneSelectedMsg.text=At least one known status must be selected\!
NameSearchFilter.emptyNameMsg.text=Must enter something for name search.
SearchNode.getName.text=Search Result
diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchFilter.java b/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchFilter.java
index cc6258848d..be8a799556 100644
--- a/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchFilter.java
+++ b/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchFilter.java
@@ -1,7 +1,7 @@
/*
* Autopsy Forensic Browser
*
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2015 Basis Technology Corp.
* Contact: carrier sleuthkit org
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,8 +37,8 @@ import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JSeparator;
import javax.swing.ListCellRenderer;
+import javax.swing.SwingUtilities;
import javax.swing.border.EmptyBorder;
-
import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.casemodule.Case;
@@ -72,7 +72,7 @@ class DateSearchFilter extends AbstractFileSearchFilter {
@Override
public String getPredicate() throws FilterValidationException {
- String addQuery = "1";
+ String query = "NULL";
DateSearchPanel panel = this.getComponent();
// first, get the selected timeZone from the dropdown list
@@ -92,7 +92,7 @@ class DateSearchFilter extends AbstractFileSearchFilter {
startDate = Calendar.getInstance(new SimpleTimeZone(0, "GMT")); //NON-NLS
startDate.setTime(temp); // convert to GMT
} catch (ParseException ex) {
- // for now, no need to show the error message to the user her
+ // for now, no need to show the error message to the user here
}
if (!startDateValue.equals("")) {
if (startDate != null) {
@@ -120,6 +120,13 @@ class DateSearchFilter extends AbstractFileSearchFilter {
}
}
+ // If they put the dates in backwards, help them out.
+ if (fromDate > toDate) {
+ long temp = toDate;
+ toDate = fromDate;
+ fromDate = temp;
+ }
+
final boolean modifiedChecked = panel.getModifiedCheckBox().isSelected();
final boolean changedChecked = panel.getChangedCheckBox().isSelected();
final boolean accessedChecked = panel.getAccessedCheckBox().isSelected();
@@ -127,30 +134,27 @@ class DateSearchFilter extends AbstractFileSearchFilter {
if (modifiedChecked || changedChecked || accessedChecked || createdChecked) {
- String subQuery = "0";
-
if (modifiedChecked) {
- subQuery += " or mtime between " + fromDate + " and " + toDate; //NON-NLS
+ query += " OR (mtime BETWEEN " + fromDate + " AND " + toDate + ")"; //NON-NLS
}
if (changedChecked) {
- subQuery += " or ctime between " + fromDate + " and " + toDate; //NON-NLS
+ query += " OR (ctime BETWEEN " + fromDate + " AND " + toDate + ")"; //NON-NLS
}
if (accessedChecked) {
- subQuery += " or atime between " + fromDate + " and " + toDate; //NON-NLS
+ query += " OR (atime BETWEEN " + fromDate + " AND " + toDate + ")"; //NON-NLS
}
if (createdChecked) {
- subQuery += " or crtime between " + fromDate + " and " + toDate; //NON-NLS
+ query += " OR (crtime BETWEEN " + fromDate + " AND " + toDate + ")"; //NON-NLS
}
- addQuery += " and (" + subQuery + ")"; //NON-NLS
} else {
throw new FilterValidationException(NONE_SELECTED_MESSAGE);
}
- return addQuery;
+ return query;
}
@@ -160,7 +164,7 @@ class DateSearchFilter extends AbstractFileSearchFilter {
private static List createTimeZoneList() {
- List