mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-08 14:19:32 +00:00
6028 Restrict ability to add hash sets to CR
This commit is contained in:
parent
20ba2b77c5
commit
c9982d4440
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Autopsy Forensic Browser
|
* Autopsy Forensic Browser
|
||||||
*
|
*
|
||||||
* Copyright 2014-2020 Basis Technology Corp.
|
* Copyright 2013-2020 Basis Technology Corp.
|
||||||
* Contact: carrier <at> sleuthkit <dot> org
|
* Contact: carrier <at> sleuthkit <dot> org
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
@ -107,9 +107,9 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
|
|||||||
return shortenedPath;
|
return shortenedPath;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void enableComponents(){
|
private void enableComponents() {
|
||||||
|
|
||||||
if(!CentralRepository.isEnabled() || !FeatureAccessUtils.canAddHashSetsToCentralRepo()){
|
if (!CentralRepository.isEnabled() || !FeatureAccessUtils.canAddHashSetsToCentralRepo()) {
|
||||||
centralRepoRadioButton.setEnabled(false);
|
centralRepoRadioButton.setEnabled(false);
|
||||||
fileTypeRadioButton.setSelected(true);
|
fileTypeRadioButton.setSelected(true);
|
||||||
} else {
|
} else {
|
||||||
@ -119,13 +119,13 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
|
|||||||
boolean isFileType = fileTypeRadioButton.isSelected();
|
boolean isFileType = fileTypeRadioButton.isSelected();
|
||||||
|
|
||||||
// Central repo only
|
// Central repo only
|
||||||
lbVersion.setEnabled((! isFileType) && (readOnlyCheckbox.isSelected()));
|
lbVersion.setEnabled((!isFileType) && (readOnlyCheckbox.isSelected()));
|
||||||
versionTextField.setEnabled((! isFileType) && (readOnlyCheckbox.isSelected()));
|
versionTextField.setEnabled((!isFileType) && (readOnlyCheckbox.isSelected()));
|
||||||
|
|
||||||
lbOrg.setEnabled(! isFileType);
|
lbOrg.setEnabled(!isFileType);
|
||||||
orgButton.setEnabled(! isFileType);
|
orgButton.setEnabled(!isFileType);
|
||||||
orgComboBox.setEnabled(! isFileType);
|
orgComboBox.setEnabled(!isFileType);
|
||||||
readOnlyCheckbox.setEnabled(! isFileType);
|
readOnlyCheckbox.setEnabled(!isFileType);
|
||||||
}
|
}
|
||||||
|
|
||||||
@NbBundle.Messages({"HashDbImportDatabaseDialog.populateOrgsError.message=Failure loading organizations."})
|
@NbBundle.Messages({"HashDbImportDatabaseDialog.populateOrgsError.message=Failure loading organizations."})
|
||||||
@ -136,7 +136,7 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
|
|||||||
orgs = dbManager.getOrganizations();
|
orgs = dbManager.getOrganizations();
|
||||||
orgs.forEach((org) -> {
|
orgs.forEach((org) -> {
|
||||||
orgComboBox.addItem(org.getName());
|
orgComboBox.addItem(org.getName());
|
||||||
if(CentralRepoDbUtil.isDefaultOrg(org)){
|
if (CentralRepoDbUtil.isDefaultOrg(org)) {
|
||||||
orgComboBox.setSelectedItem(org.getName());
|
orgComboBox.setSelectedItem(org.getName());
|
||||||
selectedOrg = org;
|
selectedOrg = org;
|
||||||
}
|
}
|
||||||
@ -469,24 +469,24 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(centralRepoRadioButton.isSelected()){
|
if (centralRepoRadioButton.isSelected()) {
|
||||||
if(readOnlyCheckbox.isSelected() && versionTextField.getText().isEmpty()){
|
if (readOnlyCheckbox.isSelected() && versionTextField.getText().isEmpty()) {
|
||||||
JOptionPane.showMessageDialog(this,
|
JOptionPane.showMessageDialog(this,
|
||||||
NbBundle.getMessage(this.getClass(),
|
NbBundle.getMessage(this.getClass(),
|
||||||
"HashDbImportDatabaseDialog.missingVersion"),
|
"HashDbImportDatabaseDialog.missingVersion"),
|
||||||
NbBundle.getMessage(this.getClass(),
|
NbBundle.getMessage(this.getClass(),
|
||||||
"HashDbImportDatabaseDialog.importHashDbErr"),
|
"HashDbImportDatabaseDialog.importHashDbErr"),
|
||||||
JOptionPane.ERROR_MESSAGE);
|
JOptionPane.ERROR_MESSAGE);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(selectedOrg == null){
|
if (selectedOrg == null) {
|
||||||
JOptionPane.showMessageDialog(this,
|
JOptionPane.showMessageDialog(this,
|
||||||
NbBundle.getMessage(this.getClass(),
|
NbBundle.getMessage(this.getClass(),
|
||||||
"HashDbImportDatabaseDialog.missingOrg"),
|
"HashDbImportDatabaseDialog.missingOrg"),
|
||||||
NbBundle.getMessage(this.getClass(),
|
NbBundle.getMessage(this.getClass(),
|
||||||
"HashDbImportDatabaseDialog.importHashDbErr"),
|
"HashDbImportDatabaseDialog.importHashDbErr"),
|
||||||
JOptionPane.ERROR_MESSAGE);
|
JOptionPane.ERROR_MESSAGE);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -523,7 +523,7 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
|
|||||||
String errorMessage = NbBundle.getMessage(this.getClass(), "HashDbImportDatabaseDialog.unableToCopyToUserDirMsg", locationInUserConfigDir);
|
String errorMessage = NbBundle.getMessage(this.getClass(), "HashDbImportDatabaseDialog.unableToCopyToUserDirMsg", locationInUserConfigDir);
|
||||||
Logger.getLogger(HashDbImportDatabaseDialog.class.getName()).log(Level.SEVERE, errorMessage, ex);
|
Logger.getLogger(HashDbImportDatabaseDialog.class.getName()).log(Level.SEVERE, errorMessage, ex);
|
||||||
JOptionPane.showMessageDialog(this, errorMessage, NbBundle.getMessage(this.getClass(), "HashDbImportDatabaseDialog.importHashDbErr"),
|
JOptionPane.showMessageDialog(this, errorMessage, NbBundle.getMessage(this.getClass(), "HashDbImportDatabaseDialog.importHashDbErr"),
|
||||||
JOptionPane.ERROR_MESSAGE);
|
JOptionPane.ERROR_MESSAGE);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -536,9 +536,9 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
|
|||||||
}
|
}
|
||||||
|
|
||||||
String errorMessage = NbBundle.getMessage(this.getClass(),
|
String errorMessage = NbBundle.getMessage(this.getClass(),
|
||||||
"HashDbImportDatabaseDialog.errorMessage.failedToOpenHashDbMsg",
|
"HashDbImportDatabaseDialog.errorMessage.failedToOpenHashDbMsg",
|
||||||
selectedFilePath);
|
selectedFilePath);
|
||||||
if(fileTypeRadioButton.isSelected()){
|
if (fileTypeRadioButton.isSelected()) {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
selectedHashDb = HashDbManager.getInstance().addExistingHashDatabaseNoSave(hashSetNameTextField.getText(), selectedFilePath, true, sendIngestMessagesCheckbox.isSelected(), type);
|
selectedHashDb = HashDbManager.getInstance().addExistingHashDatabaseNoSave(hashSetNameTextField.getText(), selectedFilePath, true, sendIngestMessagesCheckbox.isSelected(), type);
|
||||||
@ -554,17 +554,17 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
|
|||||||
} else {
|
} else {
|
||||||
|
|
||||||
// Check if a hash set with the same name/version already exists
|
// Check if a hash set with the same name/version already exists
|
||||||
try{
|
try {
|
||||||
if(CentralRepository.getInstance().referenceSetExists(hashSetNameTextField.getText(), versionTextField.getText())){
|
if (CentralRepository.getInstance().referenceSetExists(hashSetNameTextField.getText(), versionTextField.getText())) {
|
||||||
JOptionPane.showMessageDialog(this,
|
JOptionPane.showMessageDialog(this,
|
||||||
NbBundle.getMessage(this.getClass(),
|
NbBundle.getMessage(this.getClass(),
|
||||||
"HashDbImportDatabaseDialog.duplicateName"),
|
"HashDbImportDatabaseDialog.duplicateName"),
|
||||||
NbBundle.getMessage(this.getClass(),
|
NbBundle.getMessage(this.getClass(),
|
||||||
"HashDbImportDatabaseDialog.importHashDbErr"),
|
"HashDbImportDatabaseDialog.importHashDbErr"),
|
||||||
JOptionPane.ERROR_MESSAGE);
|
JOptionPane.ERROR_MESSAGE);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} catch (CentralRepoException ex){
|
} catch (CentralRepoException ex) {
|
||||||
Logger.getLogger(HashDbImportDatabaseDialog.class.getName()).log(Level.SEVERE, "Error looking up reference set", ex);
|
Logger.getLogger(HashDbImportDatabaseDialog.class.getName()).log(Level.SEVERE, "Error looking up reference set", ex);
|
||||||
JOptionPane.showMessageDialog(this,
|
JOptionPane.showMessageDialog(this,
|
||||||
NbBundle.getMessage(this.getClass(),
|
NbBundle.getMessage(this.getClass(),
|
||||||
@ -576,7 +576,7 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
|
|||||||
}
|
}
|
||||||
|
|
||||||
String version;
|
String version;
|
||||||
if(readOnlyCheckbox.isSelected()){
|
if (readOnlyCheckbox.isSelected()) {
|
||||||
version = versionTextField.getText();
|
version = versionTextField.getText();
|
||||||
} else {
|
} else {
|
||||||
// Editable databases don't have a version
|
// Editable databases don't have a version
|
||||||
@ -584,8 +584,8 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
|
|||||||
}
|
}
|
||||||
ImportCentralRepoDbProgressDialog progressDialog = new ImportCentralRepoDbProgressDialog();
|
ImportCentralRepoDbProgressDialog progressDialog = new ImportCentralRepoDbProgressDialog();
|
||||||
progressDialog.importFile(hashSetNameTextField.getText(), version,
|
progressDialog.importFile(hashSetNameTextField.getText(), version,
|
||||||
selectedOrg.getOrgID(), true, sendIngestMessagesCheckbox.isSelected(), type,
|
selectedOrg.getOrgID(), true, sendIngestMessagesCheckbox.isSelected(), type,
|
||||||
readOnlyCheckbox.isSelected(), selectedFilePath);
|
readOnlyCheckbox.isSelected(), selectedFilePath);
|
||||||
selectedHashDb = progressDialog.getDatabase();
|
selectedHashDb = progressDialog.getDatabase();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -613,7 +613,9 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
|
|||||||
}//GEN-LAST:event_orgButtonActionPerformed
|
}//GEN-LAST:event_orgButtonActionPerformed
|
||||||
|
|
||||||
private void orgComboBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_orgComboBoxActionPerformed
|
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();
|
String orgName = this.orgComboBox.getSelectedItem().toString();
|
||||||
for (CentralRepoOrganization org : orgs) {
|
for (CentralRepoOrganization org : orgs) {
|
||||||
if (org.getName().equals(orgName)) {
|
if (org.getName().equals(orgName)) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user