MaintainTeam/Hypatia
1
0
Fork 0
mirror of https://github.com/MaintainTeam/Hypatia.git synced 2025-03-01 05:48:23 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

More processing checks

Browse source 
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-12-25 18:32:02 -05:00
parent 72d1f97a96
commit 945489fbb0
No known key found for this signature in database
GPG key ID: B286E9F57A07424B
1 changed files with 53 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
scripts/Main.java
View file

@ -27,6 +27,8 @@ import java.io.FileReader;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.zip.GZIPInputStream; import java.util.zip.GZIPInputStream;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class Main { public class Main {
@ -34,11 +36,17 @@ public class Main {
public static BloomFilter<String> signaturesSHA1 = null; public static BloomFilter<String> signaturesSHA1 = null;
public static BloomFilter<String> signaturesSHA256 = null; public static BloomFilter<String> signaturesSHA256 = null;
public static int amtSignaturesRead = 0; public static int amtLinesValid = 0;
public static int amtLinesInvalid = 0;
public static int amtSignaturesMD5 = 0;
public static int amtSignaturesSHA1 = 0; public static int amtSignaturesReadMD5 = 0;
public static int amtSignaturesSHA256 = 0; public static int amtSignaturesReadSHA1 = 0;
public static int amtSignaturesReadSHA256 = 0;
public static int amtSignaturesAddedMD5 = 0;
public static int amtSignaturesAddedSHA1 = 0;
public static int amtSignaturesAddedSHA256 = 0;
public static int amtPreviousSignaturesMD5 = 0; public static int amtPreviousSignaturesMD5 = 0;
public static int amtPreviousSignaturesSHA1 = 0; public static int amtPreviousSignaturesSHA1 = 0;
@ -52,9 +60,9 @@ public class Main {
System.out.println("Processing:"); System.out.println("Processing:");
for (File databaseLocation : new File(args[0]).listFiles()) { for (File databaseLocation : new File(args[0]).listFiles()) {
System.out.println("\t" + databaseLocation); System.out.println("\t" + databaseLocation);
amtPreviousSignaturesMD5 = amtSignaturesMD5; amtPreviousSignaturesMD5 = amtSignaturesAddedMD5;
amtPreviousSignaturesSHA1 = amtSignaturesSHA1; amtPreviousSignaturesSHA1 = amtSignaturesAddedSHA1;
amtPreviousSignaturesSHA256 = amtSignaturesSHA256; amtPreviousSignaturesSHA256 = amtSignaturesAddedSHA256;
try { try {
BufferedReader reader; BufferedReader reader;
if (databaseLocation.getName().endsWith(".gz")) { if (databaseLocation.getName().endsWith(".gz")) {
@ -79,16 +87,16 @@ public class Main {
} }
} }
reader.close(); reader.close();
System.out.println("\t\tmd5: " + (amtSignaturesMD5 - amtPreviousSignaturesMD5) + ", sha1: " + (amtSignaturesSHA1 - amtPreviousSignaturesSHA1) + ", sha256: " + (amtSignaturesSHA256 - amtPreviousSignaturesSHA256)); System.out.println("\t\tmd5: " + (amtSignaturesAddedMD5 - amtPreviousSignaturesMD5) + ", sha1: " + (amtSignaturesAddedSHA1 - amtPreviousSignaturesSHA1) + ", sha256: " + (amtSignaturesAddedSHA256 - amtPreviousSignaturesSHA256));
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
System.out.println("Lines read: " + amtSignaturesRead); System.out.println("Lines read: valid: " + amtLinesValid + ", invalid: " + amtLinesInvalid);
System.out.println("Added count: md5: " + amtSignaturesMD5 + ", sha1: " + amtSignaturesSHA1 + ", sha256: " + amtSignaturesSHA256); System.out.println("Read count: md5: " + amtSignaturesReadMD5 + ", sha1: " + amtSignaturesReadSHA1 + ", sha256: " + amtSignaturesReadSHA256);
System.out.println("Read vs Added mismatch: " + (amtSignaturesRead - amtSignaturesMD5 - amtSignaturesSHA1 - amtSignaturesSHA256)); System.out.println("Added count: md5: " + amtSignaturesAddedMD5 + ", sha1: " + amtSignaturesAddedSHA1 + ", sha256: " + amtSignaturesAddedSHA256);
System.out.println("Added vs Expected mismatch: md5: " + (amtSignaturesMD5 - signaturesMD5.approximateElementCount()) + ", sha1: " + (amtSignaturesSHA1 - signaturesSHA1.approximateElementCount()) + ", sha256: " + (amtSignaturesSHA256 - signaturesSHA256.approximateElementCount())); System.out.println("Approximate count: md5: " + signaturesMD5.approximateElementCount() + ", sha1: " + signaturesSHA1.approximateElementCount() + ", sha256: " + signaturesSHA256.approximateElementCount());
System.out.println("Expected false postive rate: md5: " + signaturesMD5.expectedFpp() + ", sha1: " + signaturesSHA1.expectedFpp() + ", sha256: " + signaturesSHA256.expectedFpp()); System.out.println("Expected false postive rate: md5: " + signaturesMD5.expectedFpp() + ", sha1: " + signaturesSHA1.expectedFpp() + ", sha256: " + signaturesSHA256.expectedFpp());
try { try {
FileOutputStream fileSignaturesMD5 = new FileOutputStream(new File(args[0]) + "/hypatia-md5-bloom.bin"); FileOutputStream fileSignaturesMD5 = new FileOutputStream(new File(args[0]) + "/hypatia-md5-bloom.bin");
@ -107,29 +115,43 @@ public class Main {
} }
} }
//Credit: https://stackoverflow.com/a/13667522
private static final Pattern HEXADECIMAL_PATTERN = Pattern.compile("\\p{XDigit}+");
private static boolean isHexadecimal(String input) {
final Matcher matcher = HEXADECIMAL_PATTERN.matcher(input);
return matcher.matches();
}
private static void addChecked(String potentialHash) { private static void addChecked(String potentialHash) {
boolean isAscii = CharMatcher.ascii().matchesAllOf(potentialHash); if (!potentialHash.startsWith("#") && potentialHash.length() >= 4) {
if(isAscii && !potentialHash.startsWith("#")) { if (isHexadecimal(potentialHash)) {
if (potentialHash.length() == 32) { if (potentialHash.length() == 32) {
if (signaturesMD5.put(potentialHash)) { if (signaturesMD5.put(potentialHash)) {
amtSignaturesMD5++; amtSignaturesAddedMD5++;
}
amtSignaturesReadMD5++;
amtLinesValid++;
} else if (potentialHash.length() == 40) {
if (signaturesSHA1.put(potentialHash)) {
amtSignaturesAddedSHA1++;
}
amtSignaturesReadSHA1++;
amtLinesValid++;
} else if (potentialHash.length() == 64) {
if (signaturesSHA256.put(potentialHash)) {
amtSignaturesAddedSHA256++;
}
amtSignaturesReadSHA256++;
amtLinesValid++;
} else {
amtLinesInvalid++;
System.out.println("\t\tINVALID LENGTH: " + potentialHash);
} }
amtSignaturesRead++;
} else if (potentialHash.length() == 40) {
if (signaturesSHA1.put(potentialHash)) {
amtSignaturesSHA1++;
}
amtSignaturesRead++;
} else if (potentialHash.length() == 64) {
if (signaturesSHA256.put(potentialHash)) {
amtSignaturesSHA256++;
}
amtSignaturesRead++;
} else { } else {
//System.out.println("INVALID LENGTH: " + potentialHash); amtLinesInvalid++;
System.out.println("\t\tNOT HEXADECIMAL: " + potentialHash);
} }
} else {
//System.out.println("NOT ASCII: " + potentialHash);
} }
} }
} }