From 7bddd4f42c4a50939331ac55768f1825f23b9022 Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Sat, 10 Dec 2022 15:18:54 +0000 Subject: [PATCH] Handle io_service_bytes_recursive is None Also add B324 to bandit skip list for python3.9+ Change-Id: I8b2a5e55dda141b342ab696377f02fa62b811597 --- tox.ini | 5 +++-- zun/container/docker/driver.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 23a204aa8..9c1d8af96 100644 --- a/tox.ini +++ b/tox.ini @@ -30,9 +30,10 @@ commands = doc8 -e .rst specs/ doc/source/ CONTRIBUTING.rst HACKING.rst README.rst bash tools/flake8wrap.sh {posargs} # The following bandit tests are being skipped: - # B303 - Use of insecure MD2, MD4, or MD5 hash function. + # B303 - Use of insecure MD2, MD4, or MD5 hash function for python<3.9 + # B324 - Prohibit list calls: md5, sha1 for python>=3.9 # B604 - unction call with shell=True parameter identified, possible security issue. - bandit -r zun -x tests -n5 -ll --skip B303,B604 + bandit -r zun -x tests -n5 -ll --skip B303,B324,B604 [testenv:venv] basepython = python3 diff --git a/zun/container/docker/driver.py b/zun/container/docker/driver.py index a8625c970..fe8a96a9b 100644 --- a/zun/container/docker/driver.py +++ b/zun/container/docker/driver.py @@ -988,7 +988,7 @@ class DockerDriver(driver.BaseDriver, driver.ContainerDriver, blk_stats = res['blkio_stats']['io_service_bytes_recursive'] io_read = 0 io_write = 0 - for item in blk_stats: + for item in (blk_stats or []): if 'Read' == item['op']: io_read = io_read + item['value'] if 'Write' == item['op']: