6028 Restrict ability to add hash sets to CR

This commit is contained in:
Richard Cordovano 2020-03-11 19:03:58 -04:00
parent 20ba2b77c5
commit c9982d4440

View File

@ -1,7 +1,7 @@
/*
* Autopsy Forensic Browser
*
* Copyright 2014-2020 Basis Technology Corp.
* Copyright 2013-2020 Basis Technology Corp.
* Contact: carrier <at> sleuthkit <dot> org
*
* Licensed under the Apache License, Version 2.0 (the "License");
@ -107,9 +107,9 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
return shortenedPath;
}
private void enableComponents(){
private void enableComponents() {
if(!CentralRepository.isEnabled() || !FeatureAccessUtils.canAddHashSetsToCentralRepo()){
if (!CentralRepository.isEnabled() || !FeatureAccessUtils.canAddHashSetsToCentralRepo()) {
centralRepoRadioButton.setEnabled(false);
fileTypeRadioButton.setSelected(true);
} else {
@ -119,13 +119,13 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
boolean isFileType = fileTypeRadioButton.isSelected();
// Central repo only
lbVersion.setEnabled((! isFileType) && (readOnlyCheckbox.isSelected()));
versionTextField.setEnabled((! isFileType) && (readOnlyCheckbox.isSelected()));
lbVersion.setEnabled((!isFileType) && (readOnlyCheckbox.isSelected()));
versionTextField.setEnabled((!isFileType) && (readOnlyCheckbox.isSelected()));
lbOrg.setEnabled(! isFileType);
orgButton.setEnabled(! isFileType);
orgComboBox.setEnabled(! isFileType);
readOnlyCheckbox.setEnabled(! isFileType);
lbOrg.setEnabled(!isFileType);
orgButton.setEnabled(!isFileType);
orgComboBox.setEnabled(!isFileType);
readOnlyCheckbox.setEnabled(!isFileType);
}
@NbBundle.Messages({"HashDbImportDatabaseDialog.populateOrgsError.message=Failure loading organizations."})
@ -136,7 +136,7 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
orgs = dbManager.getOrganizations();
orgs.forEach((org) -> {
orgComboBox.addItem(org.getName());
if(CentralRepoDbUtil.isDefaultOrg(org)){
if (CentralRepoDbUtil.isDefaultOrg(org)) {
orgComboBox.setSelectedItem(org.getName());
selectedOrg = org;
}
@ -469,8 +469,8 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
return;
}
if(centralRepoRadioButton.isSelected()){
if(readOnlyCheckbox.isSelected() && versionTextField.getText().isEmpty()){
if (centralRepoRadioButton.isSelected()) {
if (readOnlyCheckbox.isSelected() && versionTextField.getText().isEmpty()) {
JOptionPane.showMessageDialog(this,
NbBundle.getMessage(this.getClass(),
"HashDbImportDatabaseDialog.missingVersion"),
@ -480,7 +480,7 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
return;
}
if(selectedOrg == null){
if (selectedOrg == null) {
JOptionPane.showMessageDialog(this,
NbBundle.getMessage(this.getClass(),
"HashDbImportDatabaseDialog.missingOrg"),
@ -538,7 +538,7 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
String errorMessage = NbBundle.getMessage(this.getClass(),
"HashDbImportDatabaseDialog.errorMessage.failedToOpenHashDbMsg",
selectedFilePath);
if(fileTypeRadioButton.isSelected()){
if (fileTypeRadioButton.isSelected()) {
try {
selectedHashDb = HashDbManager.getInstance().addExistingHashDatabaseNoSave(hashSetNameTextField.getText(), selectedFilePath, true, sendIngestMessagesCheckbox.isSelected(), type);
@ -554,8 +554,8 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
} else {
// Check if a hash set with the same name/version already exists
try{
if(CentralRepository.getInstance().referenceSetExists(hashSetNameTextField.getText(), versionTextField.getText())){
try {
if (CentralRepository.getInstance().referenceSetExists(hashSetNameTextField.getText(), versionTextField.getText())) {
JOptionPane.showMessageDialog(this,
NbBundle.getMessage(this.getClass(),
"HashDbImportDatabaseDialog.duplicateName"),
@ -564,7 +564,7 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
JOptionPane.ERROR_MESSAGE);
return;
}
} catch (CentralRepoException ex){
} catch (CentralRepoException ex) {
Logger.getLogger(HashDbImportDatabaseDialog.class.getName()).log(Level.SEVERE, "Error looking up reference set", ex);
JOptionPane.showMessageDialog(this,
NbBundle.getMessage(this.getClass(),
@ -576,7 +576,7 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
}
String version;
if(readOnlyCheckbox.isSelected()){
if (readOnlyCheckbox.isSelected()) {
version = versionTextField.getText();
} else {
// Editable databases don't have a version
@ -613,7 +613,9 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
}//GEN-LAST:event_orgButtonActionPerformed
private void orgComboBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_orgComboBoxActionPerformed
if (null == orgComboBox.getSelectedItem()) return;
if (null == orgComboBox.getSelectedItem()) {
return;
}
String orgName = this.orgComboBox.getSelectedItem().toString();
for (CentralRepoOrganization org : orgs) {
if (org.getName().equals(orgName)) {