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

2774 enforce case naming rules when renaming a display name

Browse Source
This commit is contained in:
William Schaefer 2017-10-16 18:05:27 -04:00
parent 20725202e5
commit c1fad4beb8
3 changed files with 15 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesPanel.java
View File

@ -488,36 +488,6 @@ final class CasePropertiesPanel extends javax.swing.JPanel {
); );
}// </editor-fold>//GEN-END:initComponents }// </editor-fold>//GEN-END:initComponents
//WJS-TODO ensure case not saved with empty name
// @NbBundle.Messages({
// "CasePropertiesPanel.errorDialog.emptyCaseNameMessage=No case name entered.",
// "CasePropertiesPanel.errorDialog.invalidCaseNameMessage=Case names cannot include the following symbols: \\, /, :, *, ?, \", <, >, |"
// })
// private void saveCaseName() {
// String newCaseDisplayName = caseNameTextField.getText();
//
// if (newCaseDisplayName.equals(theCase.getDisplayName())) {
// return;
// }
//
// if (newCaseDisplayName.trim().isEmpty()) {
// MessageNotifyUtil.Message.error(Bundle.CasePropertiesPanel_errorDialog_emptyCaseNameMessage());
// return;
// }
//
// if (!Case.isValidName(newCaseDisplayName)) {
// MessageNotifyUtil.Message.error(Bundle.CasePropertiesPanel_errorDialog_invalidCaseNameMessage());
// return;
// }
//
// try {
// theCase.updateDisplayName(newCaseDisplayName);
// } catch (CaseActionException ex) {
// MessageNotifyUtil.Message.error(ex.getLocalizedMessage());
// LOGGER.log(Level.SEVERE, "Failed to update case display name", ex); //NON-NLS
// }
// }
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JLabel caseDirField; private javax.swing.JLabel caseDirField;
private javax.swing.JLabel caseDirLabel; private javax.swing.JLabel caseDirLabel;

13
Core/src/org/sleuthkit/autopsy/casemodule/OptionalCasePropertiesPanel.java
View File

@ -29,6 +29,7 @@ import org.sleuthkit.autopsy.centralrepository.datamodel.EamDbException;
import org.sleuthkit.autopsy.centralrepository.datamodel.EamOrganization; import org.sleuthkit.autopsy.centralrepository.datamodel.EamOrganization;
import org.sleuthkit.autopsy.centralrepository.optionspanel.ManageOrganizationsDialog; import org.sleuthkit.autopsy.centralrepository.optionspanel.ManageOrganizationsDialog;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
/** /**
* Panel which allows for editing and setting of the case details which are * Panel which allows for editing and setting of the case details which are
@ -500,6 +501,10 @@ final class OptionalCasePropertiesPanel extends javax.swing.JPanel {
} }
} }
@Messages({
"OptionalCasePropertiesPanel.errorDialog.emptyCaseNameMessage=No case name entered.",
"OptionalCasePropertiesPanel.errorDialog.invalidCaseNameMessage=Case names cannot include the following symbols: \\, /, :, *, ?, \", <, >, |"
})
/** /**
* Save changed value from text fields and text areas into the EamCase * Save changed value from text fields and text areas into the EamCase
* object. * object.
@ -508,6 +513,14 @@ final class OptionalCasePropertiesPanel extends javax.swing.JPanel {
setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
if (EamDb.isEnabled()) { if (EamDb.isEnabled()) {
try { try {
if (caseDisplayNameTextField.getText().trim().isEmpty()) {
MessageNotifyUtil.Message.error(Bundle.OptionalCasePropertiesPanel_errorDialog_emptyCaseNameMessage());
return;
}
if (!Case.isValidName(caseDisplayNameTextField.getText())) {
MessageNotifyUtil.Message.error(Bundle.OptionalCasePropertiesPanel_errorDialog_invalidCaseNameMessage());
return;
}
EamDb dbManager = EamDb.getInstance(); EamDb dbManager = EamDb.getInstance();
CorrelationCase correlationCase = dbManager.getCaseByUUID(Case.getCurrentCase().getName()); CorrelationCase correlationCase = dbManager.getCaseByUUID(Case.getCurrentCase().getName());
if (caseDisplayNameTextField.isVisible()) { if (caseDisplayNameTextField.isVisible()) {

7
Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java
View File

@ -1436,12 +1436,9 @@ public abstract class AbstractSqlEamDb implements EamDb {
checkIfUsedStatement.setInt(1, organizationToDelete.getOrgID()); checkIfUsedStatement.setInt(1, organizationToDelete.getOrgID());
checkIfUsedStatement.setInt(2, organizationToDelete.getOrgID()); checkIfUsedStatement.setInt(2, organizationToDelete.getOrgID());
resultSet = checkIfUsedStatement.executeQuery(); resultSet = checkIfUsedStatement.executeQuery();
System.out.println(checkIfUsedStatement.toString());
resultSet.next(); resultSet.next();
long count = resultSet.getLong(1); if (resultSet.getLong(1) > 0) {
System.out.println("COUNT OF RESULTS: "+ count); throw new EamDbException("Can not delete organization which is currently in use by a case or reference set in the central repo");
if (count > 0) {
throw new EamDbException("Can not delete organization which is currently a case in the central repo");
} }
deleteOrgStatement = conn.prepareStatement(deleteOrgSql); deleteOrgStatement = conn.prepareStatement(deleteOrgSql);
deleteOrgStatement.setInt(1, organizationToDelete.getOrgID()); deleteOrgStatement.setInt(1, organizationToDelete.getOrgID());