crypto: add key headers to valid HEAD requests

Signed-off-by: Casey Bodley <cbodley@redhat.com> (cherry picked from commit e49cf3ddab)
Added tests for HEAD method for encrypted objects.
2017-04-18 12:47:32 -04:00 · 2017-04-18 12:47:32 -04:00 · 2017-04-18 12:47:32 -04:00 · 2017-04-18 12:47:24 -04:00 · 2017-04-18 12:40:22 -04:00 · 2017-04-18 12:40:22 -04:00
5 changed files with 1010 additions and 9 deletions
--- a/README.rst
+++ b/README.rst
@ -58,6 +58,9 @@ service and two different credentials, something like this::
 	access_key = ABCDEFGHIJKLMNOPQRST
 	secret_key = abcdefghijklmnopqrstuvwxyzabcdefghijklmn

+	## replace with key id obtained when secret is created, or delete if KMS not tested
+	kms_keyid = 01234567-89ab-cdef-0123-456789abcdef
+
 	[s3 alt]
 	## another user account, used for ACL-related tests
 	user_id = 56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234
--- a/19
+++ b/19
@ -12,9 +12,18 @@ if [ -f /etc/debian_version ]; then
        echo "$0: missing required DEB packages. Installing via sudo." 1>&2
        sudo apt-get -y install $missing
    fi
-fi
-if [ -f /etc/redhat-release ]; then
-    for package in python-pip python-virtualenv python-devel libevent-devel; do
+elif [ -f /etc/fedora-release ]; then
+    for package in python-pip python2-virtualenv python-devel libevent-devel; do
+        if [ "$(rpm -qa $package 2>/dev/null)" == "" ]; then
+            missing="${missing:+$missing }$package"
+        fi
+    done
+    if [ -n "$missing" ]; then
+        echo "$0: missing required RPM packages. Installing via sudo." 1>&2
+        sudo yum -y install $missing
+    fi
+elif [ -f /etc/redhat-release ]; then
+    for package in python2-pip python-virtualenv python-devel libevent-devel; do
        if [ "$(rpm -qa $package 2>/dev/null)" == "" ]; then
            missing="${missing:+$missing }$package"
        fi
@ -30,8 +39,8 @@ virtualenv --no-site-packages --distribute virtualenv
 # avoid pip bugs
 ./virtualenv/bin/pip install --upgrade pip

-# work-around change in pip 1.5
-./virtualenv/bin/pip install setuptools --no-use-wheel --upgrade
+# slightly old version of setuptools; newer fails w/ requests 0.14.0
+./virtualenv/bin/pip install setuptools==32.3.1

 ./virtualenv/bin/pip install -r requirements.txt

--- a/config.yaml.SAMPLE
+++ b/config.yaml.SAMPLE
@ -71,6 +71,9 @@ s3:
    access_key: AWS_ACCESS_KEY
    secret_key: AWS_SECRET_KEY

+## If KMS is tested, this if barbican key id. Optional.
+   kms_keyid: barbican_key_id
+
  alt:
 ## Another user accout, used for ACL-related tests.

--- a/s3tests/functional/init.py
+++ b/s3tests/functional/init.py
@ -310,6 +310,7 @@ def setup():
            'user_id',
            'display_name',
            'email',
+            'kms_keyid',
            ]:
            try:
                config[name][var] = cfg.get(section, var)
--- a/s3tests/functional/test_s3.py
+++ b/s3tests/functional/test_s3.py
Author	SHA1	Message	Date
Casey Bodley	90ab37f1c5	crypto: add key headers to valid HEAD requests Signed-off-by: Casey Bodley <cbodley@redhat.com> (cherry picked from commit `e49cf3ddab`)	2017-04-18 12:47:32 -04:00
Adam Kupczyk	5c6658d5ba	Added tests for HEAD method for encrypted objects. Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com> (cherry picked from commit `b27ddae9c4`)	2017-04-18 12:47:32 -04:00
Adam Kupczyk	29b11ba39e	Added micro instuction how to configure tests for KMS (barbican) integration Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com> (cherry picked from commit `fa597a5bf1`)	2017-04-18 12:47:32 -04:00
Adam Kupczyk	e263fdb004	Modified aws kms tests to use config variable kms_keyid Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com> (cherry picked from commit `05543b85b1`)	2017-04-18 12:47:24 -04:00
Adam Kupczyk	bad1554d09	A bit more test for kms Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com> (cherry picked from commit `33deec9a77`)	2017-04-18 12:40:22 -04:00
Adam Kupczyk	f4cf8eceb7	Additional tests for server side encryption, S3 SSE-KMS mode. All tests belong to group 'encryption'. Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com> (cherry picked from commit `f8761f855b`)	2017-04-18 12:40:22 -04:00
Adam Kupczyk	ea2454654e	Additional tests for server side encryption, S3 SSE-C mode. All tests belong to group 'encryption'. Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com> (cherry picked from commit `d92031ef16`)	2017-04-18 12:40:17 -04:00
Matt Benjamin	cab30ee8ab	Merge pull request #143 from mdw-at-linuxbox/ceph-master-setupfix Use non-broken version of setuptools, and fix bootstrap to be more po…	2017-01-26 11:08:31 -05:00
Marcus Watts	e85c6f3dda	Use non-broken version of setuptools, and fix bootstrap to be more portable. Most recent version of setuptools breaks when asked to load requests 0.14.0. symptom, complains about not being able to import filterfalse thus: from six.moves import map, filter, filterfalse this comes from setuptools, and older versions of setuptools don't have this problem. Various versions of centos7 and fedora have interesting names for packages, centos7: python-pip is python2-pip fedora24: python-virtualenv is python2-virtualenv This is somewhat masked by using sudo yum: if the actual package ,s installed, rpm knows that the capability is there and does nothing. But, if the package isn't there, or you haven't chosen to set up sudo to work that way, this does not work. Signed-off-by: Marcus Watts <mwatts@redhat.com> (cherry picked from commit `ddc150439d`)	2017-01-26 04:27:35 -05:00
Matt Benjamin	5562bd6143	bootstrap: force new setuptools Deal setuptools upgrade problem discussed here: https://github.com/pypa/setuptools/issues/940 Now follows the same formula as upstream teuthology. Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>	2017-01-25 16:33:17 -05:00
Sage Weil	dfc7a1271b	test_s3: mark test_oject_head_zero_bytes fails_on_rgw It works on civetweb, fails on apache. Revert this once it is fixed. See http://tracker.ceph.com/issues/15460 Signed-off-by: Sage Weil <sage@redhat.com>	2016-04-12 08:29:02 -04:00