Elgato_dark/python-tuf
1
0
Fork 0
mirror of https://github.com/theupdateframework/python-tuf synced 2026-05-24 10:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/demo2' into demo2

Browse source
This commit is contained in:
ttgump 2013-09-14 12:31:15 -07:00
commit 2fc73dd468
2 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
tests/integration/test_indefinite_freeze_attack.py
View file

@ -28,7 +28,7 @@
import tuf
import tuf.formats
import tuf.interposition.urllib_tuf as urllib_tuf
import tuf.interposition
import tuf.repo.signerlib as signerlib
import tuf.tests.util_test_tools as util_test_tools
@ -61,9 +61,9 @@ def _remake_timestamp(metadata_dir, keyids):
def _download(url, filename, tuf=False):
if tuf:
urllib_tuf.urlretrieve(url, filename)
def _download(url, filename, using_tuf=False):
if using_tuf:
tuf.interposition.urllib_tuf.urlretrieve(url, filename)
else:
urllib.urlretrieve(url, filename)
@ -117,26 +117,24 @@ def test_indefinite_freeze_attack(TUF=False):
_remake_timestamp(metadata_dir, keyids)
# Client performs initial download.
# Client performs initial download. If the computer is slow, it may
# take longer time than expiration time. In this case you will see
# an ExpiredMetadataError.
try:
_download(url=url_to_repo, filename=downloaded_file, tuf=TUF)
except tuf.ExpiredMetadataError:
msg = ('Metadata has expired too soon, extend expiration period. '+
'Current expiration is set to: '+repr(EXPIRATION)+' second(s).')
sys.exit(msg)
# Expire timestamp.
time.sleep(EXPIRATION)
# Try downloading again, this should raise an error.
try:
_download(url=url_to_repo, filename=downloaded_file, tuf=TUF)
except tuf.ExpiredMetadataError, error:
pass
_download(url=url_to_repo, filename=downloaded_file, using_tuf=TUF)
except:
print ('Initial download failed! It may be because your machine is busy. Try it later.')
else:
raise IndefiniteFreezeAttackAlert(ERROR_MSG)
# Expire timestamp.
time.sleep(EXPIRATION)
# Try downloading again, this should raise an error.
try:
_download(url=url_to_repo, filename=downloaded_file, using_tuf=TUF)
except tuf.ExpiredMetadataError, error:
print('Caught an expiration error!')
else:
raise IndefiniteFreezeAttackAlert(ERROR_MSG)
finally:
util_test_tools.cleanup(root_repo, server_proc)

20
tests/integration/test_mix_and_match_attack.py
View file

@ -40,7 +40,7 @@
import tempfile
import tuf
import tuf.interposition.urllib_tuf as urllib_tuf
import tuf.interposition
import tuf.tests.util_test_tools as util_test_tools
@ -48,9 +48,9 @@ class MixAndMatchAttackAlert(Exception):
pass
def _download(url, filename, tuf=False):
if tuf:
urllib_tuf.urlretrieve(url, filename)
def _download(url, filename, using_tuf=False):
if using_tuf:
tuf.interposition.urllib_tuf.urlretrieve(url, filename)
else:
urllib.urlretrieve(url, filename)
@ -126,7 +126,7 @@ def test_mix_and_match_attack(TUF=False):
# Client's initial download.
_download(url=url_to_file, filename=downloaded_file, tuf=TUF)
_download(url=url_to_file, filename=downloaded_file, using_tuf=TUF)
# Stage 2
# -------
@ -139,7 +139,7 @@ def test_mix_and_match_attack(TUF=False):
util_test_tools.tuf_refresh_repo(root_repo, keyids)
# Client downloads the patched file.
_download(url=url_to_file, filename=downloaded_file, tuf=TUF)
_download(url=url_to_file, filename=downloaded_file, using_tuf=TUF)
downloaded_content = util_test_tools.read_file_content(downloaded_file)
@ -163,9 +163,11 @@ def test_mix_and_match_attack(TUF=False):
# Client tries to downloads the newly patched file.
try:
_download(url=url_to_file, filename=downloaded_file, tuf=TUF)
except tuf.MetadataNotAvailableError:
pass
_download(url=url_to_file, filename=downloaded_file, using_tuf=TUF)
except tuf.NoWorkingMirrorError as errors:
for mirror_url, mirror_error in errors.mirror_errors.iteritems():
if type(mirror_error) == tuf.BadHashError:
print 'Catched a Bad Hash Error!'
# Check whether the attack succeeded by inspecting the content of the
# update. The update should contain 'Test NOT A'.