Skip to content

FIX: fix issue where hashes that are in binary format do not get thei… #1108

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

Merged
jessevz merged 4 commits into from
Nov 5, 2024
Merged

FIX: fix issue where hashes that are in binary format do not get thei… #1108

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
999073f
fix: fix issue where hashes that are in binary format do not get thei…
james-iwc Oct 15, 2024
ffc2c56
fix: using conditional to reduce queries on cracked hash
james-iwc Oct 21, 2024
4e418eb
fix: remove code duplication
james-iwc Oct 31, 2024
a308cc3
fix: add in extra salt check
james-iwc Oct 31, 2024
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
9 changes: 9 additions & 0 deletions src/inc/utils/HashlistUtils.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1147,6 +1147,15 @@ public static function getCrackedHashes($hashlistId, $user) {
}
$hashes[] = $arr;
}
$entries_binary = Factory::getHashBinaryFactory()->filter([Factory::FILTER => [$qF1, $qF2]]);
Copy link
Contributor

@jessevz jessevz Oct 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of doing 2 queries, it is better to check in the hashlist whether it is a binary hashlist or a normal text hashlist. What you could do is the following:

if ($hashlist->getFormat === 0) {
$entries = Factory::getHashFactory()->filter([Factory::FILTER => [$qF1, $qF2]]);
} else {
$entries = Factory::getBinaryHashFactory()->filter([Factory::FILTER => [$qF1, $qF2]]);
}

And then you could build the hashes according to their type. In the HashlistUtils line 700 to line 714 you can see how hashes of different types are built, you can use that as example.

Copy link
Contributor Author

@yungcero yungcero Oct 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome! Thanks for pointing that out. I have implemented the recommended change

foreach ($entries_binary as $entry) {
$arr = [
"hash" => $entry->getHash(),
"plain" => $entry->getPlaintext(),
"crackpos" => $entry->getCrackPos()
];
$hashes[] = $arr;
}
return $hashes;
}

Expand Down