From f531e6aff2e58470d7abc0bdb6b5e54cf39ed403 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Sun, 17 Sep 2017 16:14:58 -0700 Subject: [PATCH] Configure S3Proxy for SSL This also demonstrates that SSL certificate checking occurs and the tests must disable it for S3Proxy's self-signed certificate. References #640. --- test/integration-test-common.sh | 4 +++- test/keystore.jks | Bin 0 -> 2243 bytes test/s3proxy.conf | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 test/keystore.jks diff --git a/test/integration-test-common.sh b/test/integration-test-common.sh index 3b49648..582acf2 100644 --- a/test/integration-test-common.sh +++ b/test/integration-test-common.sh @@ -41,7 +41,7 @@ set -o errexit S3FS=../src/s3fs # Allow these defaulted values to be overridden -: ${S3_URL:="http://127.0.0.1:8080"} +: ${S3_URL:="https://127.0.0.1:8080"} : ${S3FS_CREDENTIALS_FILE:="passwd-s3fs"} : ${TEST_BUCKET_1:="s3fs-integration-test"} @@ -182,6 +182,8 @@ function start_s3fs { $TEST_BUCKET_MOUNT_POINT_1 \ -o use_path_request_style \ -o url=${S3_URL} \ + -o no_check_certificate \ + -o ssl_verify_hostname=0 \ -o createbucket \ ${AUTH_OPT} \ -o dbglevel=${DBGLEVEL:=info} \ diff --git a/test/keystore.jks b/test/keystore.jks new file mode 100644 index 0000000000000000000000000000000000000000..0a51c652d4837f416255a8409b3df58c4889beb9 GIT binary patch literal 2243 zcmchYYd8}OAI7(t8QC7^$SH=HVr$uu9I_N1BSVCijOOgga(swYo^r}aFDXq(8*<8= zLm@^ErKd22(TgO_X->V~~v+5IK<>wDM6)xrlWmP3@S-e9^bD5I$!>xDgM#BNRg%J^&)SbaFw#ZB`SG^Vi* zk&U}qOJ~i}<(DJUk>I?^9rZGP-T6vQ4Kj(j`g{9}L!`CzxUDj+yLeA^ysI1ymi0u_ z>>70{Pau|H|9!OWD?36KaRRd3FtGI8l{+RS0o&^6KV~|di-?fBYPamW_QL7I`Xih{ zuA2AbHQrHt1C6c{f=T2n&Gzf<&bSxJOc!-EaG{0>u+89#kxTF0PF|F!qLJv(R|NJD zxVI~QQt?XZpUlsFSRb3vG$gGmnOV|VYI8v?*>p+VUC?-IwCl{0WMEh_i|r_q2U#W< z1O{e+zuqiu?GwWc9uK$)YbS@X@5%?rpI^_@&RL&o(bSA}v0*tQQwklcOjxOWYRA#9|w>!+0B|Y38 zHSC0T-mAdZ$=!?^d1jE4tQB_Yn1^*UMr|cjL}NiaVUVq0jMI8UKBCNtb^R?z+>5y? z9bxHq$N;`yp1mdFvsRj{#_nP+>A&Wt@VNEw7ufiaP66xok%FAz3pyE8_5nxgJOMj?$6btGZ*sW*s=oUhQo^c#nhkk_ zqFFJ?CiWH1Y}aORStcd5-AmZuZCvVHvspvT3f_QzJnWnP^)4EzFf7ozbviZE0O2A=T1wf$q>o8tp zXdp8E3tlnqK%X2gOMyH{xx%z~+OB$Mk_qzW3!rMn&K@Y%S~=lPb9#vNsB-jJ*Manm zH~}EUG}6ZT5Ftp26$F36FKKq7#0g2XF~ZV_g+eun^LC8X;w3>1WqbcfF<;SwqaDCm z0Cw}&(k-A5KU;JZ+uB;Q=2WUYvkNvKgy3J!oYh4XdQe4^3agW^uf9_PwA?BU zw4JvXs#7h>hztO(*g`Ee?bQ=@;_if>NaS02fS{@3q228EF-uWZpGBzd`1^J{L2KlN zqAF5Kp^kJbt3`X$AIro1mf&oI`!TvN-97fnrte#AnXP{hqpO|)$_M}uib2tYB2Y9C zi6I06f?gACCnEGef>PNJLmxvK?g@*+VvNrJ)1uMnqyMr0=WA#{^}oik_br5Iz+V6;8c+;G z0|Ej0PJiox_$#o#gh9-XIJ!HeC5H4i2^3l#lfHu?N8{CJd+#sis`08Qv?=D*%GaDw z?qw09`CjANU<8x9fm$ks#}-GZm#(!lNslN^kfA6OVSVD_2y%RdgMTEmp4`i-+-|db zGfydNekU5&|4wB3V*P_b-98uU);S7XGF zoRp?|IMVNB)Q%?VXeIyg-qABr@08gT_1sLuWm1#N_N<^3I2&|VX?*~be*1E}VH!iF z@T3{?*>Fu$w*<6j{3R8imQ;@0(d{=K)h+ns_xG;6j3QmCy9-r&R5D6)Gd?rzd}{zm z2nYZcsG(F*%6kn_hJ)q6GH&NK2?_C6ZH#3t=8UBtO^?(gS$_?2uTy&=0s#qM$KqUd zy;7Fnu3@8dZg|z%CzW))dRq}))(nNrO|w!PILeC#6Dc3z9ZDav$o6sNPiZrL!STUE z49t%ap1!dy95E;#Q+#{}TH5=NS1sl2CI7-gCeLc6;DSju|5^3Gi-~U;BsaxurccBT zELJ}12LNU@fvCmv`@yR6c^>rKy!~Q$LaJY)ri91W*|!~Kr50t!L#KiOnvD#iU6uKM zw!Yj4OX>Y>Jj^=av2ANE_X_VpPn*D8>gBZ!0yNsVmV4g81WNQChSnIaJp6)wZdo32 z@MOQw8M4X{Sq5Q%hQSEr6%_t5UG2MS=nR Mld_105yQUdA5DVc7XSbN literal 0 HcmV?d00001 diff --git a/test/s3proxy.conf b/test/s3proxy.conf index 6d3bd49..712882b 100644 --- a/test/s3proxy.conf +++ b/test/s3proxy.conf @@ -1,7 +1,9 @@ -s3proxy.endpoint=http://127.0.0.1:8080 +s3proxy.secure-endpoint=http://127.0.0.1:8080 s3proxy.authorization=aws-v4 s3proxy.identity=local-identity s3proxy.credential=local-credential +s3proxy.keystore-path=keystore.jks +s3proxy.keystore-password=password jclouds.provider=transient jclouds.identity=remote-identity