diff --git a/Core/ivysettings.xml b/Core/ivysettings.xml index fd792f6844..06c2d9308f 100644 --- a/Core/ivysettings.xml +++ b/Core/ivysettings.xml @@ -4,6 +4,7 @@ + diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml index 2cab2a535f..9b960955aa 100644 --- a/Core/nbproject/project.xml +++ b/Core/nbproject/project.xml @@ -323,6 +323,7 @@ + com.basistech.df.cybertriage.autopsy.ctoptions.subpanel net.sf.sevenzipjbinding net.sf.sevenzipjbinding.impl net.sf.sevenzipjbinding.simple diff --git a/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/CTCloudException.java b/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/CTCloudException.java index 698afc3297..52d586ee53 100644 --- a/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/CTCloudException.java +++ b/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/CTCloudException.java @@ -24,11 +24,9 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; /** - * - * @author rishwanth + * An exception thrown due to an error that occurs while making a CT Cloud REST + * API request. */ - - public class CTCloudException extends Exception{ private final ErrorCode errorCode; diff --git a/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/CTCloudHttpClient.java b/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/CTCloudHttpClient.java index b5d62f91de..91a180e9bc 100644 --- a/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/CTCloudHttpClient.java +++ b/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/CTCloudHttpClient.java @@ -65,7 +65,7 @@ import org.apache.http.impl.client.WinHttpClients; import org.sleuthkit.autopsy.coreutils.Version; /** - * Actually makes the http requests to CT cloud. + * Makes the http requests to CT cloud. */ public class CTCloudHttpClient { @@ -293,12 +293,10 @@ public class CTCloudHttpClient { } /** - * Creates and returns a CloseableHttpClient SYSTEM and MANUAL looks up from - * runtime proxy config settings. These are updated accordingly from the - * Proxy Config UI. This allows us to keep the CreateConnection call fairly - * simple and not have to deal with the System Proxy settings and such. - * - * @return + * Creates a connection to CT Cloud with the given arguments. + * @param proxySettings The network proxy settings. + * @param sslContext The ssl context or null. + * @return The connection to CT Cloud. */ private static CloseableHttpClient createConnection(ProxySettingArgs proxySettings, SSLContext sslContext) { HttpClientBuilder builder = getHttpClientBuilder(proxySettings); diff --git a/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/Constants.java b/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/Constants.java index ddda5b4508..9587b3cd44 100644 --- a/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/Constants.java +++ b/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/Constants.java @@ -20,6 +20,9 @@ package com.basistech.df.cybertriage.autopsy.ctapi; import java.net.URI; +/** + * Constants regarding connections to cyber triage cloud. + */ final public class Constants { public static final String CYBER_TRIAGE = "CyberTriage"; diff --git a/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/ProxySettings.java b/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/ProxySettings.java index 2d3f0d667f..f710a6ab1b 100644 --- a/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/ProxySettings.java +++ b/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/ProxySettings.java @@ -18,8 +18,6 @@ */ package com.basistech.df.cybertriage.autopsy.ctapi; - - import java.net.*; import java.util.*; import java.util.logging.Level; diff --git a/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/json/DecryptedLicenseResponse.java b/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/json/DecryptedLicenseResponse.java index 5be0996a9e..c6f91721ef 100644 --- a/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/json/DecryptedLicenseResponse.java +++ b/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/json/DecryptedLicenseResponse.java @@ -41,6 +41,7 @@ public class DecryptedLicenseResponse { private final String limitType; private final String timezone; private final String customerEmail; + private final String customerName; @JsonCreator public DecryptedLicenseResponse( @@ -55,7 +56,8 @@ public class DecryptedLicenseResponse { @JsonProperty("product") String product, @JsonProperty("limitType") String limitType, @JsonProperty("timezone") String timezone, - @JsonProperty("customerEmail") String customerEmail + @JsonProperty("customerEmail") String customerEmail, + @JsonProperty("customerName") String customerName ) { this.boostLicenseId = boostLicenseId; this.licenseHostId = licenseHostId; @@ -67,6 +69,7 @@ public class DecryptedLicenseResponse { this.limitType = limitType; this.timezone = timezone; this.customerEmail = customerEmail; + this.customerName = customerName; } public String getBoostLicenseId() { @@ -108,4 +111,8 @@ public class DecryptedLicenseResponse { public String getCustomerEmail() { return customerEmail; } + + public String getCustomerName() { + return customerName; + } } diff --git a/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/util/ObjectMapperUtil.java b/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/util/ObjectMapperUtil.java index d59d8f8307..5562141255 100644 --- a/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/util/ObjectMapperUtil.java +++ b/Core/src/com/basistech/df/cybertriage/autopsy/ctapi/util/ObjectMapperUtil.java @@ -26,8 +26,6 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import java.io.IOException; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.time.DateTimeException; import java.time.Instant; import java.time.LocalDate; @@ -37,7 +35,6 @@ import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatterBuilder; import java.time.format.DateTimeParseException; -import java.util.Date; import java.util.Locale; import java.util.function.Function; @@ -58,7 +55,6 @@ public class ObjectMapperUtil { public ObjectMapper getDefaultObjectMapper() { ObjectMapper defaultMapper = new ObjectMapper(); - // defaultMapper.configure(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); defaultMapper.registerModule(new JavaTimeModule()); return defaultMapper; } diff --git a/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/CTOptionsPanel.java b/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/CTOptionsPanel.java index 6eb72dd73e..745aa1d03d 100644 --- a/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/CTOptionsPanel.java +++ b/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/CTOptionsPanel.java @@ -35,7 +35,7 @@ import org.openide.util.Lookup; import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSettingsPanel; /** - * Options panel for CyberTriage. + * Options panel for Cyber Triage. */ public class CTOptionsPanel extends IngestModuleGlobalSettingsPanel { @@ -46,7 +46,8 @@ public class CTOptionsPanel extends IngestModuleGlobalSettingsPanel { private final List subPanels; /** - * Creates new form CTOptions + * Creates new form CTOptions loading any CTOptionsSubPanel instances to be + * displayed. */ public CTOptionsPanel() { initComponents(); diff --git a/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/CTMalwareScannerOptionsPanel.java b/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/CTMalwareScannerOptionsPanel.java index b380dded42..34db819373 100644 --- a/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/CTMalwareScannerOptionsPanel.java +++ b/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/CTMalwareScannerOptionsPanel.java @@ -48,7 +48,8 @@ import org.openide.windows.WindowManager; import org.sleuthkit.autopsy.core.UserPreferences; /** - * Options panel for CyberTriage options for importing a CyberTriage incident + * Options panel to be displayed in the CTOptionsPanel for settings regarding + * Cyber Triage Malware Scanner settings and license setup. */ @ServiceProvider(service = CTOptionsSubPanel.class) public class CTMalwareScannerOptionsPanel extends CTOptionsSubPanel { @@ -75,7 +76,7 @@ public class CTMalwareScannerOptionsPanel extends CTOptionsSubPanel { private volatile AuthTokenFetcher authTokenFetcher = null; /** - * Creates new form CTIncidentImportOptionsPanel + * Main constructor. */ public CTMalwareScannerOptionsPanel() { initComponents(); @@ -461,15 +462,15 @@ public class CTMalwareScannerOptionsPanel extends CTOptionsSubPanel { } else { this.licenseInfoExpiresLabel.setVisible(true); this.licenseInfoExpiresLabel.setText(Bundle.CTMalwareScannerOptionsPanel_licenseInfo_expires( - this.licenseInfo.getDecryptedLicense().getExpirationDate() == null - ? "" - : LICENSE_EXPIRES_FORMAT.format(this.licenseInfo.getDecryptedLicense().getExpirationDate()))); + this.licenseInfo.getDecryptedLicense().getExpirationDate() == null + ? "" + : LICENSE_EXPIRES_FORMAT.format(this.licenseInfo.getDecryptedLicense().getExpirationDate()))); this.licenseInfoIdLabel.setVisible(true); - this.licenseInfoIdLabel.setText(Bundle.CTMalwareScannerOptionsPanel_licenseInfo_id(this.licenseInfo.getDecryptedLicense().getBoostLicenseId())); + this.licenseInfoIdLabel.setText(Bundle.CTMalwareScannerOptionsPanel_licenseInfo_id(StringUtils.defaultString(this.licenseInfo.getDecryptedLicense().getBoostLicenseId()))); this.licenseInfoUserLabel.setVisible(true); this.licenseInfoUserLabel.setText(Bundle.CTMalwareScannerOptionsPanel_licenseInfo_userInfo( - "TBD", - this.licenseInfo.getDecryptedLicense().getCustomerEmail())); + StringUtils.defaultString(this.licenseInfo.getDecryptedLicense().getCustomerName()), + StringUtils.defaultString(this.licenseInfo.getDecryptedLicense().getCustomerEmail()))); } this.malwareScansPanel.setVisible(StringUtils.isNotBlank(this.authTokenMessage) || authTokenResponse != null); diff --git a/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/EULADialog.java b/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/EULADialog.java index 8b93e80c50..31056e1f2a 100644 --- a/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/EULADialog.java +++ b/Core/src/com/basistech/df/cybertriage/autopsy/ctoptions/ctcloud/EULADialog.java @@ -34,8 +34,7 @@ import org.apache.commons.io.IOUtils; import org.sleuthkit.autopsy.coreutils.Logger; /** - * - * @author gregd + * Dialog for displaying the Cyber Triage EULA before the license is saved. */ public class EULADialog extends javax.swing.JDialog {