aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-07-02 10:16:05 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-07-02 11:51:16 +0200
commit3dcd1e4db7540459d3dff337684547d68fea2b44 (patch)
tree19f47729bee5edf576bf60855711c6f7075dfaff
parent2c3ba281084c7e6b01c7a5612a8a43d43565331a (diff)
Apply restrictive file permissions
It conforms with [1] by creating a new venv which checks the unix permissions. As jjobs call Functest console scripts [2], all perms can be 644. Dockerfiles are updated as well. [1] https://security.openstack.org/guidelines/dg_apply-restrictive-file-permissions.html [2] https://gerrit.opnfv.org/gerrit/#/c/36805/ Depends-On: I9209e6efa1b493e24135402a46df72aaa14115d1 Change-Id: I31bc7f12b775928845e23b6b40288b0a50b87219 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--docker/Dockerfile16
-rw-r--r--docker/Dockerfile.aarch6416
-rw-r--r--[-rwxr-xr-x]docker/add_images.sh0
-rw-r--r--[-rwxr-xr-x]docker/config_install_env.sh0
-rw-r--r--[-rwxr-xr-x]docker/docker_remote_api/enable_remote_api.sh0
-rw-r--r--[-rwxr-xr-x]functest/ci/download_images.sh0
-rw-r--r--[-rwxr-xr-x]functest/ci/prepare_env.py4
-rw-r--r--[-rwxr-xr-x]functest/ci/run_tests.py3
-rw-r--r--[-rwxr-xr-x]functest/opnfv_tests/openstack/vping/ping.sh0
-rw-r--r--[-rwxr-xr-x]functest/opnfv_tests/vnf/ims/create_venv.sh0
-rw-r--r--tox.ini13
11 files changed, 12 insertions, 40 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d38713e0..a4a42588 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -101,22 +101,6 @@ RUN git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwat
RUN git clone --depth 1 -b $VROUTER_TAG https://github.com/oolorg/opnfv-functest-vrouter.git ${REPOS_VNFS_DIR}/vrouter
RUN git clone --depth 1 https://github.com/wuwenbin2/OnosSystemTest.git ${REPOS_DIR}/onos
-RUN find -L ${FUNCTEST_REPO_DIR} -name "*.py" \
- -not -path "*tests/unit*" \
- -not -path "*functest_venv*" \
- |xargs grep -L __main__ |cut -d\: -f 1 |xargs chmod -c 644 \
- && find -L ${FUNCTEST_REPO_DIR} -name "*.sh" \
- -not -path "*functest_venv*" \
- |xargs grep -L \#\! |cut -d\: -f 1 |xargs chmod -c 644
-
-RUN find -L ${FUNCTEST_REPO_DIR} -name "*.py" \
- -not -path "*tests/unit*" \
- -not -path "*functest_venv*" \
- |xargs grep __main__ |cut -d\: -f 1 |xargs chmod -c 755 \
- && find -L ${FUNCTEST_REPO_DIR} -name "*.sh" \
- -not -path "*functest_venv*" \
- |xargs grep \#\! |cut -d\: -f 1 |xargs chmod -c 755
-
RUN wget -q https://git.openstack.org/cgit/openstack/rally/plain/install_rally.sh?h=${RALLY_TAG} -O install_rally.sh \
&& bash install_rally.sh --branch ${RALLY_TAG} --yes && rm install_rally.sh
diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index 77c94b02..a8f86671 100644
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -93,22 +93,6 @@ RUN git clone --depth 1 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integr
RUN git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test ${REPOS_VNFS_DIR}/vims-test
RUN git clone --depth 1 https://github.com/wuwenbin2/OnosSystemTest.git ${REPOS_DIR}/onos
-RUN find -L ${FUNCTEST_REPO_DIR} -name "*.py" \
- -not -path "*tests/unit*" \
- -not -path "*functest_venv*" \
- |xargs grep -L __main__ |cut -d\: -f 1 |xargs chmod -c 644 \
- && find -L ${FUNCTEST_REPO_DIR} -name "*.sh" \
- -not -path "*functest_venv*" \
- |xargs grep -L \#\! |cut -d\: -f 1 |xargs chmod -c 644
-
-RUN find -L ${FUNCTEST_REPO_DIR} -name "*.py" \
- -not -path "*tests/unit*" \
- -not -path "*functest_venv*" \
- |xargs grep __main__ |cut -d\: -f 1 |xargs chmod -c 755 \
- && find -L ${FUNCTEST_REPO_DIR} -name "*.sh" \
- -not -path "*functest_venv*" \
- |xargs grep \#\! |cut -d\: -f 1 |xargs chmod -c 755
-
RUN wget -q https://git.openstack.org/cgit/openstack/rally/plain/install_rally.sh?h=${RALLY_TAG} -O install_rally.sh \
&& bash install_rally.sh --branch ${RALLY_TAG} --yes && rm install_rally.sh
diff --git a/docker/add_images.sh b/docker/add_images.sh
index 919cecd8..919cecd8 100755..100644
--- a/docker/add_images.sh
+++ b/docker/add_images.sh
diff --git a/docker/config_install_env.sh b/docker/config_install_env.sh
index ed67994f..ed67994f 100755..100644
--- a/docker/config_install_env.sh
+++ b/docker/config_install_env.sh
diff --git a/docker/docker_remote_api/enable_remote_api.sh b/docker/docker_remote_api/enable_remote_api.sh
index 76e59b85..76e59b85 100755..100644
--- a/docker/docker_remote_api/enable_remote_api.sh
+++ b/docker/docker_remote_api/enable_remote_api.sh
diff --git a/functest/ci/download_images.sh b/functest/ci/download_images.sh
index 23e09c10..23e09c10 100755..100644
--- a/functest/ci/download_images.sh
+++ b/functest/ci/download_images.sh
diff --git a/functest/ci/prepare_env.py b/functest/ci/prepare_env.py
index ae9d9537..da3e6245 100755..100644
--- a/functest/ci/prepare_env.py
+++ b/functest/ci/prepare_env.py
@@ -389,7 +389,3 @@ def main():
parser = PrepareEnvParser()
args = parser.parse_args(sys.argv[1:])
return prepare_env(**args)
-
-
-if __name__ == '__main__':
- sys.exit(main())
diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py
index 5155adc4..b95e1008 100755..100644
--- a/functest/ci/run_tests.py
+++ b/functest/ci/run_tests.py
@@ -276,6 +276,3 @@ def main():
args = parser.parse_args(sys.argv[1:])
runner = Runner()
return runner.main(**args).value
-
-if __name__ == '__main__':
- sys.exit(main())
diff --git a/functest/opnfv_tests/openstack/vping/ping.sh b/functest/opnfv_tests/openstack/vping/ping.sh
index 693b8682..693b8682 100755..100644
--- a/functest/opnfv_tests/openstack/vping/ping.sh
+++ b/functest/opnfv_tests/openstack/vping/ping.sh
diff --git a/functest/opnfv_tests/vnf/ims/create_venv.sh b/functest/opnfv_tests/vnf/ims/create_venv.sh
index 575fd177..575fd177 100755..100644
--- a/functest/opnfv_tests/vnf/ims/create_venv.sh
+++ b/functest/opnfv_tests/vnf/ims/create_venv.sh
diff --git a/tox.ini b/tox.ini
index 5622e33f..4de5fa4a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = docs,pep8,pylint,py35,py27
+envlist = docs,pep8,pylint,py35,py27,perm
[testenv]
usedevelop = True
@@ -49,3 +49,14 @@ dirs =
functest/tests/unit/odl
functest/tests/unit/utils/test_decorators.py
commands = nosetests {[testenv:py35]dirs}
+
+[testenv:perm]
+basepython = python2.7
+whitelist_externals = bash
+path=. -not -path './.tox/*' -not -path './.git/*' -not -path './docs/com/pres/reveal.js/*'
+commands =
+ bash -c "\
+ find {[testenv:perm]path} \( -type f -not -perm 644 -o -type d -not -perm 755 \) \
+ -exec ls -l \{\} + | grep '.' && exit 1 || exit 0"
+ bash -c "\
+ find {[testenv:perm]path} -exec file \{\} + | grep CRLF && exit 1 || exit 0"