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

bug fixes

Browse Source
This commit is contained in:
Greg DiCristofaro 2021-03-11 09:50:28 -05:00
parent ae2a916939
commit c4fcc7aa98
7 changed files with 94 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Core/src/org/sleuthkit/autopsy/url/analytics/domaincategorization/AddEditCategoryDialog.form
View File

@ -26,24 +26,24 @@
<Group type="102" attributes="0"> <Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="validationLabel" alignment="0" max="32767" attributes="0"/>
<Group type="102" alignment="1" attributes="0"> <Group type="102" alignment="1" attributes="0">
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
<Component id="saveButton" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="cancelButton" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="validationLabel" alignment="0" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="domainSuffixLabel" alignment="0" min="-2" max="-2" attributes="0"/> <Component id="domainSuffixLabel" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="categoryLabel" alignment="0" min="-2" max="-2" attributes="0"/> <Component id="categoryLabel" alignment="0" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace max="32767" attributes="0"/> <EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="categoryTextField" pref="272" max="32767" attributes="0"/> <Component id="categoryTextField" pref="276" max="32767" attributes="0"/>
<Component id="domainSuffixTextField" max="32767" attributes="0"/> <Component id="domainSuffixTextField" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="0" pref="216" max="32767" attributes="0"/>
<Component id="saveButton" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="cancelButton" min="-2" max="-2" attributes="0"/>
</Group>
</Group> </Group>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> </Group>
@ -53,39 +53,31 @@
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Group type="102" attributes="0"> <Component id="domainSuffixTextField" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Component id="domainSuffixLabel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="categoryLabel" min="-2" max="-2" attributes="0"/>
<Component id="categoryTextField" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="domainSuffixTextField" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="domainSuffixLabel" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="validationLabel" min="-2" max="-2" attributes="0"/> <Group type="103" groupAlignment="3" attributes="0">
<EmptySpace type="unrelated" max="-2" attributes="0"/> <Component id="categoryTextField" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="categoryLabel" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Component id="validationLabel" min="-2" pref="34" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Component id="saveButton" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="saveButton" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="cancelButton" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="cancelButton" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace max="32767" attributes="0"/> <EmptySpace pref="12" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
</Layout> </Layout>
<SubComponents> <SubComponents>
<Component class="javax.swing.JTextField" name="categoryTextField"> <Component class="javax.swing.JTextField" name="categoryTextField">
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="categoryTextFieldActionPerformed"/>
</Events>
</Component> </Component>
<Component class="javax.swing.JTextField" name="domainSuffixTextField"> <Component class="javax.swing.JTextField" name="domainSuffixTextField">
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="domainSuffixTextFieldActionPerformed"/>
</Events>
</Component> </Component>
<Component class="javax.swing.JLabel" name="categoryLabel"> <Component class="javax.swing.JLabel" name="categoryLabel">
<Properties> <Properties>

97
Core/src/org/sleuthkit/autopsy/url/analytics/domaincategorization/AddEditCategoryDialog.java
View File

@ -19,6 +19,8 @@
package org.sleuthkit.autopsy.url.analytics.domaincategorization; package org.sleuthkit.autopsy.url.analytics.domaincategorization;
import java.util.Set; import java.util.Set;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import org.openide.util.NbBundle.Messages; import org.openide.util.NbBundle.Messages;
import org.sleuthkit.autopsy.url.analytics.DomainCategory; import org.sleuthkit.autopsy.url.analytics.DomainCategory;
@ -35,6 +37,23 @@ class AddEditCategoryDialog extends javax.swing.JDialog {
private final Set<String> currentSuffixes; private final Set<String> currentSuffixes;
private final DomainCategory currentDomainCategory; private final DomainCategory currentDomainCategory;
// listens for document updates
private final DocumentListener updateListener = new DocumentListener() {
@Override
public void insertUpdate(DocumentEvent e) {
onValueUpdate(domainSuffixTextField.getText(), categoryTextField.getText());
}
@Override
public void removeUpdate(DocumentEvent e) {
onValueUpdate(domainSuffixTextField.getText(), categoryTextField.getText());
}
@Override
public void changedUpdate(DocumentEvent e) {
onValueUpdate(domainSuffixTextField.getText(), categoryTextField.getText());
}
};
/** /**
* Main constructor if adding a new domain suffix. * Main constructor if adding a new domain suffix.
* *
@ -59,17 +78,26 @@ class AddEditCategoryDialog extends javax.swing.JDialog {
this.currentSuffixes = currentSuffixes; this.currentSuffixes = currentSuffixes;
this.currentDomainCategory = currentDomainCategory; this.currentDomainCategory = currentDomainCategory;
// set title based on whether or not we are editing or adding // set title based on whether or not we are editing or adding
// also don't allow editing of domain suffix if editing // also don't allow editing of domain suffix if editing
if (currentDomainCategory == null) { if (currentDomainCategory == null) {
setTitle(Bundle.AddEditCategoryDialog_Add()); setTitle(Bundle.AddEditCategoryDialog_Add());
domainSuffixTextField.setEditable(true); domainSuffixTextField.setEditable(true);
domainSuffixTextField.setEnabled(true); domainSuffixTextField.setEnabled(true);
onValueUpdate(null, null);
} else { } else {
setTitle(Bundle.AddEditCategoryDialog_Edit()); setTitle(Bundle.AddEditCategoryDialog_Edit());
domainSuffixTextField.setEditable(false); domainSuffixTextField.setEditable(false);
domainSuffixTextField.setEnabled(false); domainSuffixTextField.setEnabled(false);
onValueUpdate(currentDomainCategory.getHostSuffix(), currentDomainCategory.getCategory());
} }
validationLabel.setText("");
categoryTextField.getDocument().addDocumentListener(updateListener);
domainSuffixTextField.getDocument().addDocumentListener(updateListener);
} }
/** /**
@ -100,12 +128,13 @@ class AddEditCategoryDialog extends javax.swing.JDialog {
"# {0} - maxSuffixLen", "# {0} - maxSuffixLen",
"AddEditCategoryDialog_onValueUpdate_badSuffix=Please provide a domain suffix that is no more than {0} characters.", "AddEditCategoryDialog_onValueUpdate_badSuffix=Please provide a domain suffix that is no more than {0} characters.",
"# {0} - maxCategoryLen", "# {0} - maxCategoryLen",
"AddEditCategoryDialog_onValueUpdate_badCategory=Please provide a domain suffix that is no more than {0} characters.", "AddEditCategoryDialog_onValueUpdate_badCategory=Please provide a category that is no more than {0} characters.",
"AddEditCategoryDialog_onValueUpdate_suffixRepeat=Please provide a unique domain suffix.", "AddEditCategoryDialog_onValueUpdate_suffixRepeat=Please provide a unique domain suffix.",
"AddEditCategoryDialog_onValueUpdate_sameCategory=Please provide a new category for this domain suffix.",}) "AddEditCategoryDialog_onValueUpdate_sameCategory=Please provide a new category for this domain suffix.",})
void onValueUpdate(String suffixStr, String categoryStr) { void onValueUpdate(String suffixStr, String categoryStr) {
String safeSuffixStr = suffixStr == null ? "" : suffixStr; String safeSuffixStr = suffixStr == null ? "" : suffixStr;
String normalizedSuffix = WebCategoriesDataModel.getNormalizedSuffix(safeSuffixStr);
String safeCategoryStr = categoryStr == null ? "" : categoryStr; String safeCategoryStr = categoryStr == null ? "" : categoryStr;
// update input text field if it is not the same. // update input text field if it is not the same.
@ -122,9 +151,12 @@ class AddEditCategoryDialog extends javax.swing.JDialog {
validationMessage = Bundle.AddEditCategoryDialog_onValueUpdate_badSuffix(WebCategoriesDataModel.getMaxCategoryLength()); validationMessage = Bundle.AddEditCategoryDialog_onValueUpdate_badSuffix(WebCategoriesDataModel.getMaxCategoryLength());
} else if (safeCategoryStr.trim().length() == 0 || safeCategoryStr.trim().length() > WebCategoriesDataModel.getMaxCategoryLength()) { } else if (safeCategoryStr.trim().length() == 0 || safeCategoryStr.trim().length() > WebCategoriesDataModel.getMaxCategoryLength()) {
validationMessage = Bundle.AddEditCategoryDialog_onValueUpdate_badCategory(WebCategoriesDataModel.getMaxDomainSuffixLength()); validationMessage = Bundle.AddEditCategoryDialog_onValueUpdate_badCategory(WebCategoriesDataModel.getMaxCategoryLength());
} else if (currentSuffixes.contains(normalizedSuffix) &&
currentDomainCategory != null &&
!normalizedSuffix.equals(currentDomainCategory.getHostSuffix())) {
} else if (currentSuffixes.contains(WebCategoriesDataModel.getNormalizedSuffix(safeSuffixStr))) {
validationMessage = Bundle.AddEditCategoryDialog_onValueUpdate_suffixRepeat(); validationMessage = Bundle.AddEditCategoryDialog_onValueUpdate_suffixRepeat();
} else if (currentDomainCategory != null } else if (currentDomainCategory != null
@ -157,18 +189,6 @@ class AddEditCategoryDialog extends javax.swing.JDialog {
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
categoryTextField.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
categoryTextFieldActionPerformed(evt);
}
});
domainSuffixTextField.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
domainSuffixTextFieldActionPerformed(evt);
}
});
categoryLabel.setText(org.openide.util.NbBundle.getMessage(AddEditCategoryDialog.class, "AddEditCategoryDialog.categoryLabel.text")); // NOI18N categoryLabel.setText(org.openide.util.NbBundle.getMessage(AddEditCategoryDialog.class, "AddEditCategoryDialog.categoryLabel.text")); // NOI18N
domainSuffixLabel.setText(org.openide.util.NbBundle.getMessage(AddEditCategoryDialog.class, "AddEditCategoryDialog.domainSuffixLabel.text")); // NOI18N domainSuffixLabel.setText(org.openide.util.NbBundle.getMessage(AddEditCategoryDialog.class, "AddEditCategoryDialog.domainSuffixLabel.text")); // NOI18N
@ -198,41 +218,40 @@ class AddEditCategoryDialog extends javax.swing.JDialog {
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(validationLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addGap(0, 0, Short.MAX_VALUE)
.addComponent(saveButton)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(cancelButton))
.addComponent(validationLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(domainSuffixLabel) .addComponent(domainSuffixLabel)
.addComponent(categoryLabel)) .addComponent(categoryLabel))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(categoryTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 272, Short.MAX_VALUE) .addComponent(categoryTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 276, Short.MAX_VALUE)
.addComponent(domainSuffixTextField))) .addComponent(domainSuffixTextField))))
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addGap(0, 216, Short.MAX_VALUE)
.addComponent(saveButton)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(cancelButton)))
.addContainerGap()) .addContainerGap())
); );
layout.setVerticalGroup( layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addGroup(layout.createSequentialGroup() .addComponent(domainSuffixTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(categoryLabel)
.addComponent(categoryTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(18, 18, 18)
.addComponent(domainSuffixTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(domainSuffixLabel)) .addComponent(domainSuffixLabel))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(validationLabel) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(categoryTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(categoryLabel))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(validationLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 34, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(saveButton) .addComponent(saveButton)
.addComponent(cancelButton)) .addComponent(cancelButton))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addContainerGap(12, Short.MAX_VALUE))
); );
pack(); pack();
@ -248,14 +267,6 @@ class AddEditCategoryDialog extends javax.swing.JDialog {
dispose(); dispose();
}//GEN-LAST:event_cancelButtonActionPerformed }//GEN-LAST:event_cancelButtonActionPerformed
private void domainSuffixTextFieldActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_domainSuffixTextFieldActionPerformed
onValueUpdate(domainSuffixTextField.getText(), categoryTextField.getText());
}//GEN-LAST:event_domainSuffixTextFieldActionPerformed
private void categoryTextFieldActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_categoryTextFieldActionPerformed
onValueUpdate(domainSuffixTextField.getText(), categoryTextField.getText());
}//GEN-LAST:event_categoryTextFieldActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JTextField categoryTextField; private javax.swing.JTextField categoryTextField;

9
Core/src/org/sleuthkit/autopsy/url/analytics/domaincategorization/Bundle.properties-MERGED
View File

@ -1,9 +1,17 @@
AddEditCategoryDialog_Add=Add Entry
AddEditCategoryDialog_Edit=Edit Entry
# {0} - maxCategoryLen # {0} - maxCategoryLen
AddEditCategoryDialog_onValueUpdate_badCategory=Please provide a domain suffix that is no more than {0} characters. AddEditCategoryDialog_onValueUpdate_badCategory=Please provide a domain suffix that is no more than {0} characters.
# {0} - maxSuffixLen # {0} - maxSuffixLen
AddEditCategoryDialog_onValueUpdate_badSuffix=Please provide a domain suffix that is no more than {0} characters. AddEditCategoryDialog_onValueUpdate_badSuffix=Please provide a domain suffix that is no more than {0} characters.
AddEditCategoryDialog_onValueUpdate_sameCategory=Please provide a new category for this domain suffix. AddEditCategoryDialog_onValueUpdate_sameCategory=Please provide a new category for this domain suffix.
AddEditCategoryDialog_onValueUpdate_suffixRepeat=Please provide a unique domain suffix. AddEditCategoryDialog_onValueUpdate_suffixRepeat=Please provide a unique domain suffix.
WebCategoriesOptionsPanel_categoryTable_categoryColumnName=Category
WebCategoriesOptionsPanel_categoryTable_suffixColumnName=Domain Suffix
WebCategoriesOptionsPanel_exportSetButtonActionPerformed_errorMessage=There was an error exporting.
WebCategoriesOptionsPanel_exportSetButtonActionPerformed_errorTitle=Export Error
WebCategoriesOptionsPanel_importSetButtonActionPerformed_errorMessage=There was an error importing this json file.
WebCategoriesOptionsPanel_importSetButtonActionPerformed_errorTitle=Import Error
WebCategoryOptionsController_title=Custom Web Categories WebCategoryOptionsController_title=Custom Web Categories
WebCategoryOptionsController_keywords=Custom Web Categories WebCategoryOptionsController_keywords=Custom Web Categories
AddEditCategoryDialog.categoryLabel.text=Category: AddEditCategoryDialog.categoryLabel.text=Category:
@ -17,3 +25,4 @@ WebCategoriesOptionsPanel.editEntryButton.text=Edit Entry
WebCategoriesOptionsPanel.deleteEntryButton.text=Delete Entry WebCategoriesOptionsPanel.deleteEntryButton.text=Delete Entry
WebCategoriesOptionsPanel.importSetButton.text=Import Set WebCategoriesOptionsPanel.importSetButton.text=Import Set
WebCategoriesOptionsPanel.exportSetButton.text=Export Set WebCategoriesOptionsPanel.exportSetButton.text=Export Set
WebCategoriesOptionsPanel.ingestRunningWarning.text=Ingest is currently running. No editing can take place at this time.

2
Core/src/org/sleuthkit/autopsy/url/analytics/domaincategorization/CustomWebCategorizer.java
View File

@ -85,7 +85,7 @@ public class CustomWebCategorizer implements DomainCategorizer {
} }
@Override @Override
public void close() throws Exception { public void close() throws SQLException {
dataModel.close(); dataModel.close();
} }
} }

6
Core/src/org/sleuthkit/autopsy/url/analytics/domaincategorization/WebCategoriesDataModel.java
View File

@ -340,7 +340,7 @@ class WebCategoriesDataModel implements AutoCloseable {
// write to disk // write to disk
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
mapper.writeValue(jsonOutput, categories); mapper.writerWithDefaultPrettyPrinter().writeValue(jsonOutput, categories);
} }
/** /**
@ -391,7 +391,7 @@ class WebCategoriesDataModel implements AutoCloseable {
Statement.RETURN_GENERATED_KEYS)) { Statement.RETURN_GENERATED_KEYS)) {
insertUpdate.setString(1, getNormalizedSuffix(entry.getHostSuffix())); insertUpdate.setString(1, getNormalizedSuffix(entry.getHostSuffix()));
insertUpdate.setString(1, getNormalizedCategory(entry.getCategory())); insertUpdate.setString(2, getNormalizedCategory(entry.getCategory()));
return insertUpdate.executeUpdate() > 0; return insertUpdate.executeUpdate() > 0;
} }
} }
@ -503,7 +503,7 @@ class WebCategoriesDataModel implements AutoCloseable {
} }
@Override @Override
public synchronized void close() throws Exception { public synchronized void close() throws SQLException {
dbConn.close(); dbConn.close();
dbConn = null; dbConn = null;
} }

2
Core/src/org/sleuthkit/autopsy/url/analytics/domaincategorization/WebCategoriesOptionsController.java
View File

@ -29,7 +29,7 @@ import org.openide.util.Lookup;
* custom web categories. * custom web categories.
*/ */
@OptionsPanelController.TopLevelRegistration(categoryName = "#WebCategoryOptionsController_title", @OptionsPanelController.TopLevelRegistration(categoryName = "#WebCategoryOptionsController_title",
iconBase = "org/sleuthkit/autopsy/corecomponents/checkbox32.png", iconBase = "org/sleuthkit/autopsy/images/domain-32.png",
position = 21, position = 21,
keywords = "#WebCategoryOptionsController_keywords", keywords = "#WebCategoryOptionsController_keywords",
keywordsCategory = "Custom Web Categories") keywordsCategory = "Custom Web Categories")

10
Core/src/org/sleuthkit/autopsy/url/analytics/domaincategorization/WebCategoriesOptionsPanel.java
View File

@ -326,7 +326,7 @@ public class WebCategoriesOptionsPanel extends IngestModuleGlobalSettingsPanel i
try { try {
dataModel.deleteRecord(selected.getHostSuffix()); dataModel.deleteRecord(selected.getHostSuffix());
refresh(); refresh();
} catch (SQLException ex) { } catch (IllegalArgumentException | SQLException ex) {
logger.log(Level.WARNING, "There was an error while deleting: " + selected.getHostSuffix(), ex); logger.log(Level.WARNING, "There was an error while deleting: " + selected.getHostSuffix(), ex);
} }
} }
@ -338,7 +338,7 @@ public class WebCategoriesOptionsPanel extends IngestModuleGlobalSettingsPanel i
try { try {
dataModel.insertUpdateSuffix(newCategory); dataModel.insertUpdateSuffix(newCategory);
refresh(); refresh();
} catch (SQLException ex) { } catch (IllegalArgumentException | SQLException ex) {
logger.log(Level.WARNING, "There was an error while adding new record: " + newCategory.getHostSuffix(), ex); logger.log(Level.WARNING, "There was an error while adding new record: " + newCategory.getHostSuffix(), ex);
} }
} }
@ -353,7 +353,7 @@ public class WebCategoriesOptionsPanel extends IngestModuleGlobalSettingsPanel i
dataModel.insertUpdateSuffix(newCategory); dataModel.insertUpdateSuffix(newCategory);
refresh(); refresh();
} }
} catch (SQLException ex) { } catch (IllegalArgumentException | SQLException ex) {
logger.log(Level.WARNING, "There was an error while editing: " + selected.getHostSuffix(), ex); logger.log(Level.WARNING, "There was an error while editing: " + selected.getHostSuffix(), ex);
} }
} }
@ -389,7 +389,7 @@ public class WebCategoriesOptionsPanel extends IngestModuleGlobalSettingsPanel i
int result = fileChooser.showSaveDialog(this); int result = fileChooser.showSaveDialog(this);
if (result == JFileChooser.APPROVE_OPTION) { if (result == JFileChooser.APPROVE_OPTION) {
File selectedFile = fileChooser.getSelectedFile(); File selectedFile = fileChooser.getSelectedFile();
if (selectedFile != null && selectedFile.exists()) { if (selectedFile != null) {
try { try {
dataModel.exportToJson(selectedFile); dataModel.exportToJson(selectedFile);
} catch (SQLException | IOException ex) { } catch (SQLException | IOException ex) {
@ -430,7 +430,7 @@ public class WebCategoriesOptionsPanel extends IngestModuleGlobalSettingsPanel i
} }
@Override @Override
public void close() throws Exception { public void close() {
IngestManager.getInstance().removeIngestJobEventListener(weakIngestListener); IngestManager.getInstance().removeIngestJobEventListener(weakIngestListener);
} }
} }