Script updates

Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
Tavi 2024-01-12 03:30:10 -05:00
parent fedca835d6
commit eb1e565806
No known key found for this signature in database
GPG key ID: E599F62ECBAEAF2E
3 changed files with 16 additions and 16 deletions

View file

@ -7,4 +7,5 @@ echo "<pre>" >> production/index.html
sed -i "s/\[DATE\]/$(date -u)/" production/index.html sed -i "s/\[DATE\]/$(date -u)/" production/index.html
java -jar HypatiaDatabaseConverter-0.1__.jar raw/ >> production/index.html java -jar HypatiaDatabaseConverter-0.1__.jar raw/ >> production/index.html
echo "</pre>" >> production/index.html echo "</pre>" >> production/index.html
cat extended.html >> production/index.html
mv raw/hypatia-*-bloom.bin production/ mv raw/hypatia-*-bloom.bin production/

View file

@ -60,28 +60,35 @@ public class Main {
signaturesSHA1 = BloomFilter.create(Funnels.stringFunnel(Charsets.US_ASCII), 50000, 0.00001); //50k signaturesSHA1 = BloomFilter.create(Funnels.stringFunnel(Charsets.US_ASCII), 50000, 0.00001); //50k
signaturesSHA256 = BloomFilter.create(Funnels.stringFunnel(Charsets.US_ASCII), 2000000, 0.00001); //2m signaturesSHA256 = BloomFilter.create(Funnels.stringFunnel(Charsets.US_ASCII), 2000000, 0.00001); //2m
System.out.println("Processing exclusions:");
File[] exclusions = new File(args[0] + "../exclusions/").listFiles();
Arrays.sort(exclusions);
for (File exclusionDatabase : exclusions) {
try { try {
File exclusionDatabase = new File(args[0] + "../excluded.hashes"); System.out.println("\t" + exclusionDatabase.getName());
if(exclusionDatabase.exists()) {
Scanner s = new Scanner(exclusionDatabase); Scanner s = new Scanner(exclusionDatabase);
while(s.hasNextLine()) { while(s.hasNextLine()) {
String line = s.nextLine().trim().toLowerCase(); String line = s.nextLine().trim().toLowerCase();
if(line.contains(":")) {
line = line.split(":")[0];
}
if(!line.startsWith("#") && isHexadecimal(line) && (line.length() == 32 || line.length() == 40 || line.length() == 64)) { if(!line.startsWith("#") && isHexadecimal(line) && (line.length() == 32 || line.length() == 40 || line.length() == 64)) {
arrExclusions.add(line); arrExclusions.add(line);
//System.out.println("\t\tAdded: " + line);
} }
} }
s.close(); s.close();
System.out.println("Loaded " + arrExclusions.size() + " excluded hashes");
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
}
System.out.println("Loaded " + arrExclusions.size() + " excluded hashes");
System.out.println("Processing:"); System.out.println("Processing signatures:");
File[] databases = new File(args[0]).listFiles(); File[] databases = new File(args[0]).listFiles();
Arrays.sort(databases); Arrays.sort(databases);
for (File databaseLocation : databases) { for (File databaseLocation : databases) {
System.out.println("\t" + databaseLocation); System.out.println("\t" + databaseLocation.getName());
amtPreviousSignaturesMD5 = amtSignaturesAddedMD5; amtPreviousSignaturesMD5 = amtSignaturesAddedMD5;
amtPreviousSignaturesSHA1 = amtSignaturesAddedSHA1; amtPreviousSignaturesSHA1 = amtSignaturesAddedSHA1;
amtPreviousSignaturesSHA256 = amtSignaturesAddedSHA256; amtPreviousSignaturesSHA256 = amtSignaturesAddedSHA256;

View file

@ -1,8 +0,0 @@
import sys
database = open(sys.argv[1], "r");
for line in database:
arrSplit = line.strip().split(":");
strHash = arrSplit[0];
strName = arrSplit[2].split("-")[0];
print(strHash + ":0:" + strName);