Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing missed negation in KffDataObjectHandler.previouslyComputedMd5HasChanged #926

Merged
merged 1 commit into from
Sep 13, 2024
Merged

Fixing missed negation in KffDataObjectHandler.previouslyComputedMd5HasChanged #926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/emissary/kff/KffDataObjectHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ static boolean previouslyComputedMd5HasChanged(IBaseDataObject d, String origina
var paramValue = d.getParameter(KFF_PARAM_MD5);
if (!paramValue.isEmpty() && paramValue.get(0) != null) {
String currentMD5 = paramValue.get(0).toString();
return originalMD5.equals(currentMD5);
return !originalMD5.equals(currentMD5);
}
}
return false;
Expand Down
45 changes: 43 additions & 2 deletions src/test/java/emissary/kff/KffDataObjectHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
Expand Down Expand Up @@ -130,10 +131,50 @@ void testHashMethodCalledTwice() {
assertEquals(DATA_SHA1, payload.getStringParameter(KffDataObjectHandler.KFF_PARAM_SHA1));
assertEquals(DATA_SHA256, payload.getStringParameter(KffDataObjectHandler.KFF_PARAM_SHA256));
assertEquals(KffDataObjectHandler.KFF_DUPE_CURRENT_FORM, payload.getFileType());
assertNull(payload.getStringParameter(KffDataObjectHandler.MD5_ORIGINAL),
"MD5_ORIGINAL should not be populated if hash called more than once but data hasn't changed");
}

@Test
void testHashMethodAgainAfterModifyingData() {
// don't truncate known data or the second call will be made with an empty payload
kff = new KffDataObjectHandler(KffDataObjectHandler.KEEP_KNOWN_DATA, true, true);
payload.setParameter(KffDataObjectHandler.KFF_PARAM_KNOWN_FILTER_NAME, "test.filter");
kff.hash(payload);

assertEquals("test.filter", payload.getStringParameter(KffDataObjectHandler.KFF_PARAM_KNOWN_FILTER_NAME));
assertTrue(KffDataObjectHandler.hashPresent(payload));
assertEquals(DATA_MD5, payload.getStringParameter(KffDataObjectHandler.KFF_PARAM_MD5));
assertEquals(DATA_CRC32, payload.getStringParameter(KffDataObjectHandler.KFF_PARAM_CRC32));
assertEquals(DATA_SSDEEP, payload.getStringParameter(KffDataObjectHandler.KFF_PARAM_SSDEEP));
assertEquals(DATA_SHA1, payload.getStringParameter(KffDataObjectHandler.KFF_PARAM_SHA1));
assertEquals(DATA_SHA256, payload.getStringParameter(KffDataObjectHandler.KFF_PARAM_SHA256));
assertNull(payload.getStringParameter(KffDataObjectHandler.MD5_ORIGINAL),
"MD5_ORIGINAL should only be populated if hashing more than once and data has changed");

payload.setData("This is a changed data".getBytes());
// hash again, to see the effect on the hash-related params.
// none of the parameters should have a duplicated value

kff.hash(payload);
assertEquals("test.filter", payload.getStringParameter(KffDataObjectHandler.KFF_PARAM_KNOWN_FILTER_NAME));
assertTrue(KffDataObjectHandler.hashPresent(payload));
assertNotNull(payload.getStringParameter(KffDataObjectHandler.KFF_PARAM_MD5));
assertNotNull(payload.getStringParameter(KffDataObjectHandler.KFF_PARAM_CRC32));
assertNotNull(payload.getStringParameter(KffDataObjectHandler.KFF_PARAM_SSDEEP));
assertNotNull(payload.getStringParameter(KffDataObjectHandler.KFF_PARAM_SHA1));
assertNotNull(payload.getStringParameter(KffDataObjectHandler.KFF_PARAM_SHA256));
assertNotEquals(DATA_MD5, payload.getStringParameter(KffDataObjectHandler.KFF_PARAM_MD5));
assertNotEquals(DATA_CRC32, payload.getStringParameter(KffDataObjectHandler.KFF_PARAM_CRC32));
assertNotEquals(DATA_SSDEEP, payload.getStringParameter(KffDataObjectHandler.KFF_PARAM_SSDEEP));
assertNotEquals(DATA_SHA1, payload.getStringParameter(KffDataObjectHandler.KFF_PARAM_SHA1));
assertNotEquals(DATA_SHA256, payload.getStringParameter(KffDataObjectHandler.KFF_PARAM_SHA256));
assertEquals(KffDataObjectHandler.KFF_DUPE_CURRENT_FORM, payload.getFileType());

// make sure we've correctly populated MD5_ORIGINAL
assertNotNull(payload.getStringParameter(KffDataObjectHandler.MD5_ORIGINAL),
"MD5_ORIGINAL should be populated if hash called more than once");
assertEquals(payload.getStringParameter(KffDataObjectHandler.KFF_PARAM_MD5),
payload.getStringParameter(KffDataObjectHandler.MD5_ORIGINAL));
assertEquals(DATA_MD5, payload.getStringParameter(KffDataObjectHandler.MD5_ORIGINAL));
}

@Test
Expand Down