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

caseNameToCaseDbName improevments

Browse Source
This commit is contained in:
Richard Cordovano 2017-04-11 18:10:56 -04:00
parent addcf9bd38
commit 6e3ba27a74
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Core/src/org/sleuthkit/autopsy/casemodule/Case.java
View File

@ -769,30 +769,23 @@ public class Case {
} }
/** /**
* Transforms a candidate name for a PostgreSQL database into a name that * Transforms a case name into a name for a PostgreSQL database that can be
* can be safely used in SQL commands as described at * safely used in SQL commands as described at
* http://www.postgresql.org/docs/9.4/static/sql-syntax-lexical.html: 63 * http://www.postgresql.org/docs/9.4/static/sql-syntax-lexical.html: 63
* chars max, must start with a letter or underscore, following chars can be * chars max, must start with a letter or underscore, following chars can be
* letters, underscores, or digits. A timestamp suffix is added to ensure * letters, underscores, or digits. A timestamp suffix is added to ensure
* uniqueness. * uniqueness.
* *
* @param candidateName The candidate name. * @param caseName The candidate name.
* *
* @return The candidate name transformed into a corresponding PostgreSQL * @return The candidate name transformed into a corresponding PostgreSQL
* case database name. * case database name.
*/ */
private static String makePostgreSqlDbName(String candidateName) throws IllegalCaseNameException { private static String caseNameToCaseDbName(String caseName) throws IllegalCaseNameException {
/*
* Apply the same transformations as are used for case names, for
* consistency and to make it easier to find the database name when
* scanning a list of case database on the server.
*/
String dbName = displayNameToCaseName(candidateName);
/* /*
* Must start with letter or underscore. If not, prepend an underscore. * Must start with letter or underscore. If not, prepend an underscore.
*/ */
String dbName = caseName;
if (dbName.length() > 0 && !(Character.isLetter(dbName.codePointAt(0))) && !(dbName.codePointAt(0) == '_')) { if (dbName.length() > 0 && !(Character.isLetter(dbName.codePointAt(0))) && !(dbName.codePointAt(0) == '_')) {
dbName = "_" + dbName; dbName = "_" + dbName;
} }
@ -1814,7 +1807,7 @@ public class Case {
if (CaseType.SINGLE_USER_CASE == caseType) { if (CaseType.SINGLE_USER_CASE == caseType) {
dbName = SINGLE_USER_CASE_DB_NAME; dbName = SINGLE_USER_CASE_DB_NAME;
} else if (CaseType.MULTI_USER_CASE == caseType) { } else if (CaseType.MULTI_USER_CASE == caseType) {
dbName = makePostgreSqlDbName(caseName); dbName = caseNameToCaseDbName(caseName);
} }
} catch (IllegalCaseNameException ex) { } catch (IllegalCaseNameException ex) {
throw new CaseActionException(Bundle.Case_exceptionMessage_couldNotCreateCaseDatabaseName(), ex); throw new CaseActionException(Bundle.Case_exceptionMessage_couldNotCreateCaseDatabaseName(), ex);