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

[pset4] [recover] Add hashes for jpeg files without trailing zeros #243

Open
wants to merge 2 commits into
base: 2024/x
Choose a base branch
from
Open

[pset4] [recover] Add hashes for jpeg files without trailing zeros #243

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c29c1e7
add hashes without trailing zeros
RCW679 May 11, 2024
bf0bb0a
Update __init__.py
RCW679 May 11, 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
68 changes: 63 additions & 5 deletions recover/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import check50
import check50.c

HASHES = [
# Hashes of the jpg files with the trailing zeros
HASHES_WITH_ZEROS = [
"6e2e4e56677e55cda750a2c0bc1c96fb4952ee37aafcc0810d0d5a883834abee", # 000.jpg
"4b9e49c8b47574ecda37045f9a8411f5cdc02c767cbe0d021d158321f730c26a", # 001.jpg
"990a411e113591709fa89a328eb8e436d91d68f5f1b1a546af24420cde661f61", # 002.jpg
Expand Down Expand Up @@ -53,6 +54,59 @@
"bba63b6b98e0b5c6fbba24fd840a8eac0ff2b86973338e89ef699920c8835e30", # 048.jpg
"0ff470f2272f656483779e1901611d9c5237df521e51b5aab80760c5c95689af" # 049.jpg
]
# Hashes of the jpg files without the trailing zeros
HASHES_WITHOUT_ZEROS = [
"1dc1ccd72cbe6e012ca7f5d59f161fd8c1c5b2558a820802f1ab7dfbd2cc9ae3", # 000.jpg
"1519f7ebb5414c7eff12a11a4d7e6552c8221b49fe84633b80d7b99ed4ecd566", # 001.jpg
"7d69e6f422b153398c5574800600de2bfcfa9942863d9934083899c8ef01d7cf", # 002.jpg
"526228fb0af1754549796f2ea699693038d860058249315acdad55947b28c530", # 003.jpg
"3b45e1530de2f1cf68a50b28d87c792a5631586c43e10295d2fce642e496aca9", # 004.jpg
"fbded0b786cd18f26e984235602655c0d9d5624f11a12a1d3ed4ffbf063d701d", # 005.jpg
"ba594c45b74832b464605178eaeabcced70f820357b98e624ab7b0fff3378479", # 006.jpg
"4d5f9ee8d4ce6998888b1ce006cd9a4fb01008391f9b3dfad9a8c9b14fce9419", # 007.jpg
"e91ab834f7597bbf74635457cfa4df472c3fdd2e83f7fd46c1629a28cf245b0d", # 008.jpg
"ba6a751b246ed23f04e8c474a4ebb5d4e8e1121e9c0e7be9114ddac1bc808392", # 009.jpg
"9234d50a86009bf8edd1edeb88d8b1b9a1db1c32915001d3ad2daf34ca4f7fad", # 010.jpg
"ea1f94e3b308c16d2a2477c0c1745cb003ef9ef48525bdb94a564daa3df6d5a2", # 011.jpg
"3f4012a51d4182f4a903e655e19ef1d17d829de62c2bf89b14d389838754b11c", # 012.jpg
"b2fb4815602e4cb043c9ac3248f63529f954086257bc27aff40dc3edc351b67d", # 013.jpg
"48845472a271594cb5129453020973270db898c10febeff9b426670f99ac76b3", # 014.jpg
"90c62d5f09e49ba83111412b93d56ea88cfcaa5c71cb3cbb98f4e17396e10d22", # 015.jpg
"93e17b91e9526cd32257fdd1451ce2eaf38179b835fb69fb2d3b16af03ad97f2", # 016.jpg
"34bbc00f91d8fcadc2cd3e96648f3c5c951eeec06fd4bc28c76b410ea887afbe", # 017.jpg
"84dc6df2c98d2e6ed4fa4eee69f22b39b2ce75965be113a708339d5466815751", # 018.jpg
"03dbc1a90277517b2145cc401bb8fb7d854eaed9e1988a8c1ce9219f5f6a1f13", # 019.jpg
"04d733190577235cb226a56af8aeec7534529778f1f64e99f9c771f889e7b554", # 020.jpg
"05cc65a0d9684b522539a9a3cf4b0c4640c2d5af3b4ad935956fd0aa9ca89a55", # 021.jpg
"836b52db5df5cc3d53d7854d7e1657808176ce1f5e9aaba42392d1176770c907", # 022.jpg
"0d9bd6b961a4a93b9650c63c568a7e5a4fc07eff50a108d5187b08a2c08267f9", # 023.jpg
"dc441350506fa48437e241e580b1a79bbb2c715af06d8c3a8dd7e61412fdf2aa", # 024.jpg
"7e383953443e3a2b6af83fdb864e63fd6c8f005caf04556efdfc7d673112e3e9", # 025.jpg
"0bcb0235d62ef9cbc25b1af08ea68a2db586a4bdef2092543814f8eff578b46f", # 026.jpg
"9b36f136bc7846436ff0c711340b5d180d396238b4a028f0477beeecb9f08418", # 027.jpg
"7e31395b65e7d47cda9ac7e68c93626c0d1ccbc71d46224a01cc6416a5f83de5", # 028.jpg
"a0d2cd96f3dd1c03e261c9c57d46220f54db96dae988fa1d4ad47c7d83a645c0", # 029.jpg
"06d5fa541f1bf82bd843d4206ee2ed4ebcf6b18728d6e8a58783e865499a5f60", # 030.jpg
"2ef05b310f9a7c6511677be285bbf802fbb5b88120a6fb882f45ad7997754ff7", # 031.jpg
"c01bea67dba7f12bf1f025e83fe9f621abce3904f5d749c8ae110e3746e2848d", # 032.jpg
"478b6b2489763b698fb343db8b155252d122f3327d6ad8558490c2462430936b", # 033.jpg
"7478d36dba541bed05a55322dd7620023632ffb4b22c59b3f00d8791d2baa83b", # 034.jpg
"45e8044c5cb56b63f3faf42c7ae76582db9c623a772e4b627cb2990bf52d69ad", # 035.jpg
"441fee061f65f6981021ba33fb8b2510cf208816b66c3eb2ec241ceb3077121b", # 036.jpg
"e7192f4d90ac882fd7b4f3b61a1f5561d8acb95c139e98e890781fe4d611d0f9", # 037.jpg
"75ce8427950263acf78940c7bd44664c52de37b40d10e42338acaea5e30b1e35", # 038.jpg
"86ee73be1533a68c6aba625cef06f1e8ce73020f2684f16f9158854d24921c8c", # 039.jpg
"fbc821c712dd69f32162b871d24cd3657b197ac0f98d8023fa14581c3b3fade6", # 040.jpg
"53f9b05219263cc0c6d6429463ae4493a33a3b7599584b4234cc3cbc145480ba", # 041.jpg
"3eacdafc305d6bb67bbde4c1c03df46ff42845f837f92cc40627bb1066a66d80", # 042.jpg
"93fe6dd878c8812e3432440018f96160875f515560ae25035edd6ed73863b291", # 043.jpg
"2dbdaf0fb91c08c7da8e839e472e1d4b68cee944b8c429549de07f69ccbb7391", # 044.jpg
"18eec5cd27d10531db41791d22171d22a7ba8de4d363e880a09aac24c382ac10", # 045.jpg
"19351b89aa0a30cdb52789453e63dda5f83304673bfe952ce1002e39d2a03c99", # 046.jpg
"d6aa73f9fd1b0ad5950d78f6f3fd6b4e8e71e96e831a2173f6c3c765d777cc57", # 047.jpg
"152b76f9501f71a71625dad39919ab4bc0949edd4099f8b9a0ec127f19446534", # 048.jpg
"cd9e4a8b2221ae6d4169caf2d9b4d22fdfcced8d9fe01f5f6468a7c64a28989a" # 049.jpg
]

@check50.check()
def exists():
Expand All @@ -70,26 +124,30 @@ def test_noimage():
"""handles lack of forensic image"""
check50.run("./recover").exit(1)

def verify_hash(i):
hash = check50.hash("{:03d}.jpg".format(i))
return hash in [HASHES_WITH_ZEROS[i], HASHES_WITHOUT_ZEROS[i]]

@check50.check(compiles)
def first_image():
"""recovers 000.jpg correctly"""
check50.run("./recover card.raw").exit(0, timeout=10)
if check50.hash("000.jpg") != HASHES[0]:
if not verify_hash(0):
raise check50.Failure("recovered image does not match")

@check50.check(compiles)
def middle_images():
"""recovers middle images correctly"""
check50.run("./recover card.raw").exit(0, timeout=10)
for i, hash in enumerate(HASHES[1:-1], 1):
if hash != check50.hash("{:03d}.jpg".format(i)):
for i in range(1, 49):
if not verify_hash(i):
raise check50.Failure("recovered image does not match")

@check50.check(compiles)
def last_image():
"""recovers 049.jpg correctly"""
check50.run("./recover card.raw").exit(0, timeout=10)
if check50.hash("049.jpg") != HASHES[-1]:
if not verify_hash(49):
raise check50.Failure("recovered image does not match")

@check50.check(last_image)
Expand Down