update in encryption module

This commit is contained in:
Greg DiCristofaro 2021-02-18 13:30:14 -05:00
parent b8e5c36782
commit bb80d1bdf7
3 changed files with 7 additions and 2 deletions

3
.gitignore vendored
View File

@ -23,7 +23,8 @@
!/CoreLibs/nbproject/project.xml
!/CoreLibs/nbproject/project.properties
/Core/test/qa-functional/data/
/Core/test/qa-functional/data/*
!/Core/test/qa-functional/data/PasswordDetection_img1_v1.img
/KeywordSearch/release/
/KeywordSearch/build/

View File

@ -164,7 +164,6 @@
<get src="https://drive.google.com/uc?id=1lYzd--9YUB7yDccM7NPOo8PC1xxuOiKs" dest="${test-input}/SqlCipherDetection_img1_v1.vhd" skipexisting="true"/>
<get src="https://drive.google.com/uc?id=1QRNKs824kksiJLZ4qcs59Nytw0fJKEjb" dest="${test-input}/IngestFilters_img1_v1.img" skipexisting="true"/>
<get src="https://drive.google.com/uc?id=1OMTB5gD4_VuaFkLWu2I33FN8VAHoRQbW" dest="${test-input}/IngestFilters_local1_v1.zip" skipexisting="true"/>
<get src="https://drive.google.com/uc?id=1WGMkivlDi_I_vB1aYY6puAPktbmlNSL-" dest="${test-input}/PasswordDetection_img1_v1.img" skipexisting="true"/>
<get src="https://drive.google.com/uc?id=1X2DzJOJ1SjUkAtZXJ3oQHXkjF0NX_jOz" dest="${test-input}/VeracryptDetection_img1_v1.vhd" skipexisting="true"/>
<get src="https://drive.google.com/uc?id=19gRepVVvLsDHtBwIkX2VVjsBWIub7aIV" dest="${test-input}/CommonFiles_img1_v1.vhd" skipexisting="true"/>
<get src="https://drive.google.com/uc?id=1chUMtA0CNyPBZ0yuTl9F_O103R21Ox0p" dest="${test-input}/CommonFiles_img2_v1.vhd" skipexisting="true"/>

View File

@ -324,6 +324,11 @@ final class EncryptionDetectionFileIngestModule extends FileIngestModuleAdapter
Database accessDatabase;
try {
accessDatabase = databaseBuilder.open();
} catch (InvalidCredentialsException ex) {
logger.log(Level.INFO, String.format(
"Jackcess throws invalid credentials exception for file (name: %s, id: %s). It will be assumed to be password protected.",
file.getName(), file.getId()));
return true;
} catch (Exception ex) { // Firewall, see JIRA-7097
logger.log(Level.WARNING, String.format("Unexpected exception "
+ "trying to open msaccess database using Jackcess "