Hello community, here is the log from the commit of package apache-rex for openSUSE:Factory checked in at 2019-02-27 15:06:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-rex (Old) and /work/SRC/openSUSE:Factory/.apache-rex.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache-rex" Wed Feb 27 15:06:26 2019 rev:10 rq:679444 version:20190208 Changes: -------- --- /work/SRC/openSUSE:Factory/apache-rex/apache-rex.changes 2018-11-28 11:15:11.874747643 +0100 +++ /work/SRC/openSUSE:Factory/.apache-rex.new.28833/apache-rex.changes 2019-02-27 15:06:33.158439634 +0100 @@ -1,0 +2,15 @@ +Fri Feb 8 12:23:25 UTC 2019 - Petr Gajdos + +- add mod_proxy_fcgi-php-fpm-auth-RewriteRule + +------------------------------------------------------------------- +Tue Feb 5 07:47:16 UTC 2019 - Petr Gajdos + +- add mod_proxy_fcgi-php-fpm-CGIPassAuth + +------------------------------------------------------------------- +Tue Jan 22 19:36:02 UTC 2019 - Petr Gajdos + +- run-rex: dynamic is not valid crypto device + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-rex.spec ++++++ --- /var/tmp/diff_new_pack.PT7xvU/_old 2019-02-27 15:06:34.630439186 +0100 +++ /var/tmp/diff_new_pack.PT7xvU/_new 2019-02-27 15:06:34.630439186 +0100 @@ -1,7 +1,7 @@ # # spec file for package apache-rex # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ %define macros_file macros.apache-rex Name: apache-rex -Version: 20181127 +Version: 20190208 Release: 0 Summary: Script for Apache HTTPD Runnable Examples License: Apache-2.0 @@ -50,6 +50,7 @@ %setup -q -n %{name} %build +sed -i 's:sleep 1:sleep 3:g' mod_proxy_ftp-basic/run.sh %install mkdir -p %{buildroot}%{_bindir} ++++++ apache-rex.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/.git/COMMIT_EDITMSG new/apache-rex/.git/COMMIT_EDITMSG --- old/apache-rex/.git/COMMIT_EDITMSG 2018-11-27 12:46:33.279398903 +0100 +++ new/apache-rex/.git/COMMIT_EDITMSG 2019-02-08 15:03:26.760261492 +0100 @@ -1 +1 @@ -more specific regular expression +give more time to vsftpd to start Binary files old/apache-rex/.git/index and new/apache-rex/.git/index differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/.git/logs/HEAD new/apache-rex/.git/logs/HEAD --- old/apache-rex/.git/logs/HEAD 2018-11-27 12:46:33.279398903 +0100 +++ new/apache-rex/.git/logs/HEAD 2019-02-08 15:03:26.764261511 +0100 @@ -34,3 +34,16 @@ 8474575d69abb9eb6a848d497e289e9664d12996 515493e59f718b3abaf652842e81ff80e4ccc740 pgajdos 1543315724 +0100 commit: add to contents 515493e59f718b3abaf652842e81ff80e4ccc740 578ad2b6240ea6c1887c739b90c6453fec21264b pgajdos 1543315925 +0100 commit: specify php sapi 578ad2b6240ea6c1887c739b90c6453fec21264b ffa28829a96860005c013f7b4bede1fc8f3ca6a7 pgajdos 1543319193 +0100 commit: more specific regular expression +ffa28829a96860005c013f7b4bede1fc8f3ca6a7 a30bbf7dfcf72a7912a2fac0669e91037ca042c8 pgajdos 1548185600 +0100 commit: dynamic is not usable crypto device +a30bbf7dfcf72a7912a2fac0669e91037ca042c8 a369d68d8f4049d423a837f644d1301e024f9cb6 pgajdos 1548185650 +0100 commit: add subexample description +a369d68d8f4049d423a837f644d1301e024f9cb6 a5110da9decaf6815623188b81e4230aafc65d61 pgajdos 1549282999 +0100 commit: add start_fpm and stop_fpm calls +a5110da9decaf6815623188b81e4230aafc65d61 cd0bc14c166c13f23907acf8a3a80372682efdcd pgajdos 1549283126 +0100 commit: add mod_proxy_fcgi-php-fpm-CGIPassAuth/ +cd0bc14c166c13f23907acf8a3a80372682efdcd f18dca19fbc41917637e8ae4e449b35470ea5395 pgajdos 1549283216 +0100 commit: add to contents +f18dca19fbc41917637e8ae4e449b35470ea5395 93abdf84475eafde9afc45fc61c43557c7f1b90b pgajdos 1549290787 +0100 commit: document post-run.sh +93abdf84475eafde9afc45fc61c43557c7f1b90b 2997b8c05d48939f542742c6c83fbfbdf9c025fc pgajdos 1549290960 +0100 commit: line break +2997b8c05d48939f542742c6c83fbfbdf9c025fc 5ceef631eb1b41638157ac4423a27e76972668d3 pgajdos 1549291555 +0100 commit: fix and add commentswq +5ceef631eb1b41638157ac4423a27e76972668d3 6cfb542c1df64b4e223954d06002dbcf43ee541d pgajdos 1549301064 +0100 commit: actually check the output in the example +6cfb542c1df64b4e223954d06002dbcf43ee541d 887d9489b8f32b9e7dcd66baf606da4b0ff0fc06 pgajdos 1549351801 +0100 commit: mod_proxy_fcgi-php-fpm-CGIPassAuth rewritten +887d9489b8f32b9e7dcd66baf606da4b0ff0fc06 352666c1f9dc7654a1ec1a11e58b862adfb86c51 pgajdos 1549628370 +0100 commit: add mod_proxy_fcgi-php-fpm-auth-RewriteRule +352666c1f9dc7654a1ec1a11e58b862adfb86c51 96e9ce2672fc738d5521597d39ffe8021a1289b5 pgajdos 1549628401 +0100 commit: add mod_proxy_fcgi-php-fpm-auth-RewriteRule +96e9ce2672fc738d5521597d39ffe8021a1289b5 709ae860bf983d072ad3016215bc41f71e5fef58 pgajdos 1549634606 +0100 commit: give more time to vsftpd to start diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/.git/logs/refs/heads/master new/apache-rex/.git/logs/refs/heads/master --- old/apache-rex/.git/logs/refs/heads/master 2018-11-27 12:46:33.279398903 +0100 +++ new/apache-rex/.git/logs/refs/heads/master 2019-02-08 15:03:26.764261511 +0100 @@ -34,3 +34,16 @@ 8474575d69abb9eb6a848d497e289e9664d12996 515493e59f718b3abaf652842e81ff80e4ccc740 pgajdos 1543315724 +0100 commit: add to contents 515493e59f718b3abaf652842e81ff80e4ccc740 578ad2b6240ea6c1887c739b90c6453fec21264b pgajdos 1543315925 +0100 commit: specify php sapi 578ad2b6240ea6c1887c739b90c6453fec21264b ffa28829a96860005c013f7b4bede1fc8f3ca6a7 pgajdos 1543319193 +0100 commit: more specific regular expression +ffa28829a96860005c013f7b4bede1fc8f3ca6a7 a30bbf7dfcf72a7912a2fac0669e91037ca042c8 pgajdos 1548185600 +0100 commit: dynamic is not usable crypto device +a30bbf7dfcf72a7912a2fac0669e91037ca042c8 a369d68d8f4049d423a837f644d1301e024f9cb6 pgajdos 1548185650 +0100 commit: add subexample description +a369d68d8f4049d423a837f644d1301e024f9cb6 a5110da9decaf6815623188b81e4230aafc65d61 pgajdos 1549282999 +0100 commit: add start_fpm and stop_fpm calls +a5110da9decaf6815623188b81e4230aafc65d61 cd0bc14c166c13f23907acf8a3a80372682efdcd pgajdos 1549283126 +0100 commit: add mod_proxy_fcgi-php-fpm-CGIPassAuth/ +cd0bc14c166c13f23907acf8a3a80372682efdcd f18dca19fbc41917637e8ae4e449b35470ea5395 pgajdos 1549283216 +0100 commit: add to contents +f18dca19fbc41917637e8ae4e449b35470ea5395 93abdf84475eafde9afc45fc61c43557c7f1b90b pgajdos 1549290787 +0100 commit: document post-run.sh +93abdf84475eafde9afc45fc61c43557c7f1b90b 2997b8c05d48939f542742c6c83fbfbdf9c025fc pgajdos 1549290960 +0100 commit: line break +2997b8c05d48939f542742c6c83fbfbdf9c025fc 5ceef631eb1b41638157ac4423a27e76972668d3 pgajdos 1549291555 +0100 commit: fix and add commentswq +5ceef631eb1b41638157ac4423a27e76972668d3 6cfb542c1df64b4e223954d06002dbcf43ee541d pgajdos 1549301064 +0100 commit: actually check the output in the example +6cfb542c1df64b4e223954d06002dbcf43ee541d 887d9489b8f32b9e7dcd66baf606da4b0ff0fc06 pgajdos 1549351801 +0100 commit: mod_proxy_fcgi-php-fpm-CGIPassAuth rewritten +887d9489b8f32b9e7dcd66baf606da4b0ff0fc06 352666c1f9dc7654a1ec1a11e58b862adfb86c51 pgajdos 1549628370 +0100 commit: add mod_proxy_fcgi-php-fpm-auth-RewriteRule +352666c1f9dc7654a1ec1a11e58b862adfb86c51 96e9ce2672fc738d5521597d39ffe8021a1289b5 pgajdos 1549628401 +0100 commit: add mod_proxy_fcgi-php-fpm-auth-RewriteRule +96e9ce2672fc738d5521597d39ffe8021a1289b5 709ae860bf983d072ad3016215bc41f71e5fef58 pgajdos 1549634606 +0100 commit: give more time to vsftpd to start diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/.git/logs/refs/remotes/origin/master new/apache-rex/.git/logs/refs/remotes/origin/master --- old/apache-rex/.git/logs/refs/remotes/origin/master 2018-11-27 12:46:46.827462076 +0100 +++ new/apache-rex/.git/logs/refs/remotes/origin/master 2019-02-08 15:04:01.732428806 +0100 @@ -21,3 +21,13 @@ e1b03ee3daf7980e96519229e0d1c55848c41f87 8474575d69abb9eb6a848d497e289e9664d12996 pgajdos 1543315453 +0100 update by push 8474575d69abb9eb6a848d497e289e9664d12996 578ad2b6240ea6c1887c739b90c6453fec21264b pgajdos 1543315931 +0100 update by push 578ad2b6240ea6c1887c739b90c6453fec21264b ffa28829a96860005c013f7b4bede1fc8f3ca6a7 pgajdos 1543319206 +0100 update by push +ffa28829a96860005c013f7b4bede1fc8f3ca6a7 a369d68d8f4049d423a837f644d1301e024f9cb6 pgajdos 1548185673 +0100 update by push +a369d68d8f4049d423a837f644d1301e024f9cb6 cd0bc14c166c13f23907acf8a3a80372682efdcd pgajdos 1549283156 +0100 update by push +cd0bc14c166c13f23907acf8a3a80372682efdcd f18dca19fbc41917637e8ae4e449b35470ea5395 pgajdos 1549283224 +0100 update by push +f18dca19fbc41917637e8ae4e449b35470ea5395 93abdf84475eafde9afc45fc61c43557c7f1b90b pgajdos 1549290802 +0100 update by push +93abdf84475eafde9afc45fc61c43557c7f1b90b 2997b8c05d48939f542742c6c83fbfbdf9c025fc pgajdos 1549290968 +0100 update by push +2997b8c05d48939f542742c6c83fbfbdf9c025fc 5ceef631eb1b41638157ac4423a27e76972668d3 pgajdos 1549291570 +0100 update by push +5ceef631eb1b41638157ac4423a27e76972668d3 887d9489b8f32b9e7dcd66baf606da4b0ff0fc06 pgajdos 1549351827 +0100 update by push +887d9489b8f32b9e7dcd66baf606da4b0ff0fc06 352666c1f9dc7654a1ec1a11e58b862adfb86c51 pgajdos 1549628382 +0100 update by push +352666c1f9dc7654a1ec1a11e58b862adfb86c51 96e9ce2672fc738d5521597d39ffe8021a1289b5 pgajdos 1549628409 +0100 update by push +96e9ce2672fc738d5521597d39ffe8021a1289b5 709ae860bf983d072ad3016215bc41f71e5fef58 pgajdos 1549634641 +0100 update by push Binary files old/apache-rex/.git/objects/05/378307509076fbcf5caa1fe96c096c4f9c5d9b and new/apache-rex/.git/objects/05/378307509076fbcf5caa1fe96c096c4f9c5d9b differ Binary files old/apache-rex/.git/objects/10/4fbe4fef4779746c2da5dba981f26278bfd084 and new/apache-rex/.git/objects/10/4fbe4fef4779746c2da5dba981f26278bfd084 differ Binary files old/apache-rex/.git/objects/11/ebe07ca5f3fb74b40270af11c06dd4e54d7e5d and new/apache-rex/.git/objects/11/ebe07ca5f3fb74b40270af11c06dd4e54d7e5d differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/.git/objects/16/052ff920f063caf4ed259bc8fb58b527c02c04 new/apache-rex/.git/objects/16/052ff920f063caf4ed259bc8fb58b527c02c04 --- old/apache-rex/.git/objects/16/052ff920f063caf4ed259bc8fb58b527c02c04 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/.git/objects/16/052ff920f063caf4ed259bc8fb58b527c02c04 2019-02-04 15:36:00.757686326 +0100 @@ -0,0 +1,4 @@ +x]]O0`+ ɮiNYl~HuNNӖwB˦=V ++! #T:"~8ti0b&4:]}la YMMè[ +4o*BEB_i2K__;n ?A(Edӌ|ʲWj{Їu%4ͣP7"XW^ÙB/4yoB>l7,HtE +y$ZROз1P]08M~݃ \ No newline at end of file Binary files old/apache-rex/.git/objects/17/2a4a219e50a2441b629fbe5e52ea265246028c and new/apache-rex/.git/objects/17/2a4a219e50a2441b629fbe5e52ea265246028c differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/.git/objects/22/b8c0a4e6a0d116fca24c136ea28b876938b6e9 new/apache-rex/.git/objects/22/b8c0a4e6a0d116fca24c136ea28b876938b6e9 --- old/apache-rex/.git/objects/22/b8c0a4e6a0d116fca24c136ea28b876938b6e9 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/.git/objects/22/b8c0a4e6a0d116fca24c136ea28b876938b6e9 2019-02-05 08:30:01.445886780 +0100 @@ -0,0 +1,2 @@ +xR]O0yyPRBȐ%A tkhz ӧ{z9g%՚s2J܎XL'v=:%ѭP.ǽ4]X{Bh(}t{?-d /##xz.fycBdhk$(\Ās~Nk(N6">ZcfPҒS|HFrdsw>ZB~&AF"<)ʧj&J,2&Hl+T&5pzn\60I rP %adH#b, +(dXPf85"r bSj1_^s4'|Vx2tō0۩Wػ] gL\>Z%9p_΁ XH' \ No newline at end of file Binary files old/apache-rex/.git/objects/23/7471dccc5ac76db2c68102e7cc897033da5c3a and new/apache-rex/.git/objects/23/7471dccc5ac76db2c68102e7cc897033da5c3a differ Binary files old/apache-rex/.git/objects/24/a20bf33e2ee2b83a2aa3fe3cb9dce5010ff9cd and new/apache-rex/.git/objects/24/a20bf33e2ee2b83a2aa3fe3cb9dce5010ff9cd differ Binary files old/apache-rex/.git/objects/25/aab65cbb9fd82d530d593233abf82d0a79df0d and new/apache-rex/.git/objects/25/aab65cbb9fd82d530d593233abf82d0a79df0d differ Binary files old/apache-rex/.git/objects/25/e2c49e9e08f5499abf4b54010aee8096d424ab and new/apache-rex/.git/objects/25/e2c49e9e08f5499abf4b54010aee8096d424ab differ Binary files old/apache-rex/.git/objects/28/b37e543b353c69bced7c1eefc335ed11bae6bb and new/apache-rex/.git/objects/28/b37e543b353c69bced7c1eefc335ed11bae6bb differ Binary files old/apache-rex/.git/objects/29/97b8c05d48939f542742c6c83fbfbdf9c025fc and new/apache-rex/.git/objects/29/97b8c05d48939f542742c6c83fbfbdf9c025fc differ Binary files old/apache-rex/.git/objects/30/a245e7961bfdbe39904c9692db64e939e6a55e and new/apache-rex/.git/objects/30/a245e7961bfdbe39904c9692db64e939e6a55e differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/.git/objects/35/2666c1f9dc7654a1ec1a11e58b862adfb86c51 new/apache-rex/.git/objects/35/2666c1f9dc7654a1ec1a11e58b862adfb86c51 --- old/apache-rex/.git/objects/35/2666c1f9dc7654a1ec1a11e58b862adfb86c51 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/.git/objects/35/2666c1f9dc7654a1ec1a11e58b862adfb86c51 2019-02-08 13:19:30.594423399 +0100 @@ -0,0 +1,2 @@ +xMj0@u +XBr0ҌLҞݽ̓/u]6h^zrfhR "'(^Ujѵ}L 8˄r*4]oeǿ8o&5~r0KI^ _k+kNe:?"ttO \ No newline at end of file Binary files old/apache-rex/.git/objects/36/ead823fde1a87b89e2cb699e69848f18fe2896 and new/apache-rex/.git/objects/36/ead823fde1a87b89e2cb699e69848f18fe2896 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/.git/objects/38/d195b1ec803c5c873d6374370bf04a137a24d3 new/apache-rex/.git/objects/38/d195b1ec803c5c873d6374370bf04a137a24d3 --- old/apache-rex/.git/objects/38/d195b1ec803c5c873d6374370bf04a137a24d3 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/.git/objects/38/d195b1ec803c5c873d6374370bf04a137a24d3 2019-02-08 13:19:51.234520875 +0100 @@ -0,0 +1,3 @@ +xA +0Fa=ſA] :&2 +=Uørd^A7"z"_rфb$"s]}(O˸ScMٟ' \ No newline at end of file Binary files old/apache-rex/.git/objects/3e/660a3ffd867691a84ce0eccca4a17abf4aefa8 and new/apache-rex/.git/objects/3e/660a3ffd867691a84ce0eccca4a17abf4aefa8 differ Binary files old/apache-rex/.git/objects/3f/0299e25273ea3e6c9c5ccd0b7dc1e65abdfe28 and new/apache-rex/.git/objects/3f/0299e25273ea3e6c9c5ccd0b7dc1e65abdfe28 differ Binary files old/apache-rex/.git/objects/46/6e4522741702ea12081ef7febefa6768fa6ffe and new/apache-rex/.git/objects/46/6e4522741702ea12081ef7febefa6768fa6ffe differ Binary files old/apache-rex/.git/objects/4a/4521146d2dc61ab33bb2a3dd35e70ba13be950 and new/apache-rex/.git/objects/4a/4521146d2dc61ab33bb2a3dd35e70ba13be950 differ Binary files old/apache-rex/.git/objects/4d/da2b7dd289749f03d3e742b7141e6effec91dd and new/apache-rex/.git/objects/4d/da2b7dd289749f03d3e742b7141e6effec91dd differ Binary files old/apache-rex/.git/objects/50/2f21fba54339d278710d64359cd4d72569ad5f and new/apache-rex/.git/objects/50/2f21fba54339d278710d64359cd4d72569ad5f differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/.git/objects/5c/eef631eb1b41638157ac4423a27e76972668d3 new/apache-rex/.git/objects/5c/eef631eb1b41638157ac4423a27e76972668d3 --- old/apache-rex/.git/objects/5c/eef631eb1b41638157ac4423a27e76972668d3 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/.git/objects/5c/eef631eb1b41638157ac4423a27e76972668d3 2019-02-04 15:45:55.333000307 +0100 @@ -0,0 +1,2 @@ +xK +1]$DJ&$<ަJ8ծD%mVN"E+bGoLb+M >I]`&q}$N"n:\-s.[Cz@0(c 쥒RoZ ! C,xF \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/.git/objects/5d/c40c7c5c79ff3871fcb2464cfce16248e03034 new/apache-rex/.git/objects/5d/c40c7c5c79ff3871fcb2464cfce16248e03034 --- old/apache-rex/.git/objects/5d/c40c7c5c79ff3871fcb2464cfce16248e03034 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/.git/objects/5d/c40c7c5c79ff3871fcb2464cfce16248e03034 2019-02-04 13:25:12.078116831 +0100 @@ -0,0 +1 @@ +x5O0}_qAԄu !diR'm̽\~wwm[09mg f2{2IH毊3'ĝkĬQGY ;يAؗɝ!6$ QLo-jۨpd'p!'u@sp|s/>MpFߎa; B_lU$E/`/tsS~pa \ No newline at end of file Binary files old/apache-rex/.git/objects/5e/f620ae68f2f652cceb51bd113d7e67bf6c2c1f and new/apache-rex/.git/objects/5e/f620ae68f2f652cceb51bd113d7e67bf6c2c1f differ Binary files old/apache-rex/.git/objects/6c/f1d533ff3427755c042b901e680fa95971554d and new/apache-rex/.git/objects/6c/f1d533ff3427755c042b901e680fa95971554d differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/.git/objects/6c/fb542c1df64b4e223954d06002dbcf43ee541d new/apache-rex/.git/objects/6c/fb542c1df64b4e223954d06002dbcf43ee541d --- old/apache-rex/.git/objects/6c/fb542c1df64b4e223954d06002dbcf43ee541d 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/.git/objects/6c/fb542c1df64b4e223954d06002dbcf43ee541d 2019-02-04 18:24:24.358186086 +0100 @@ -0,0 +1 @@ +xAj0E)f(FPJ2M4vl$=}Cz->|Yl?ئJd*uR࣒HדG٭ wCR(؅L,)EHJXJWqq`ߺv/9/ x'ko5;Ȩrfk38_7I?}L} \ No newline at end of file Binary files old/apache-rex/.git/objects/6d/e6dac46d13a3092153961db102a80c21b1d1c0 and new/apache-rex/.git/objects/6d/e6dac46d13a3092153961db102a80c21b1d1c0 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/.git/objects/70/9ae860bf983d072ad3016215bc41f71e5fef58 new/apache-rex/.git/objects/70/9ae860bf983d072ad3016215bc41f71e5fef58 --- old/apache-rex/.git/objects/70/9ae860bf983d072ad3016215bc41f71e5fef58 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/.git/objects/70/9ae860bf983d072ad3016215bc41f71e5fef58 2019-02-08 15:03:26.760261492 +0100 @@ -0,0 +1,3 @@ +x +0=).HӀf7Z$|z^af\ybFELz z"  +vUQ!%5z2DO1Àib@ Jj_H+kX;pkS~]@9^z8J%kLmxw ~sj,MJ] \ No newline at end of file Binary files old/apache-rex/.git/objects/74/0afcab4213a5927e59c9aaa8df404344be5668 and new/apache-rex/.git/objects/74/0afcab4213a5927e59c9aaa8df404344be5668 differ Binary files old/apache-rex/.git/objects/78/8b8467b7bfee8d8bdd4646d325b889ef2b7a89 and new/apache-rex/.git/objects/78/8b8467b7bfee8d8bdd4646d325b889ef2b7a89 differ Binary files old/apache-rex/.git/objects/87/26e1f79cab372ba0465efbeb6fb558780923a5 and new/apache-rex/.git/objects/87/26e1f79cab372ba0465efbeb6fb558780923a5 differ Binary files old/apache-rex/.git/objects/87/761810bd64c188e87c420a35cc1e84bc5a982b and new/apache-rex/.git/objects/87/761810bd64c188e87c420a35cc1e84bc5a982b differ Binary files old/apache-rex/.git/objects/88/7d9489b8f32b9e7dcd66baf606da4b0ff0fc06 and new/apache-rex/.git/objects/88/7d9489b8f32b9e7dcd66baf606da4b0ff0fc06 differ Binary files old/apache-rex/.git/objects/93/abdf84475eafde9afc45fc61c43557c7f1b90b and new/apache-rex/.git/objects/93/abdf84475eafde9afc45fc61c43557c7f1b90b differ Binary files old/apache-rex/.git/objects/95/1c6ddb5a6d1bd013bb8d4379bafe7de6ee047d and new/apache-rex/.git/objects/95/1c6ddb5a6d1bd013bb8d4379bafe7de6ee047d differ Binary files old/apache-rex/.git/objects/96/e9ce2672fc738d5521597d39ffe8021a1289b5 and new/apache-rex/.git/objects/96/e9ce2672fc738d5521597d39ffe8021a1289b5 differ Binary files old/apache-rex/.git/objects/98/ae0f877603dbd5584b3f8e7f697b45d7a699cf and new/apache-rex/.git/objects/98/ae0f877603dbd5584b3f8e7f697b45d7a699cf differ Binary files old/apache-rex/.git/objects/a0/25e2884db41ed64ac88a6166dce09faad67c05 and new/apache-rex/.git/objects/a0/25e2884db41ed64ac88a6166dce09faad67c05 differ Binary files old/apache-rex/.git/objects/a2/2fcccb361cc24c063516129ebd9d452fc91cde and new/apache-rex/.git/objects/a2/2fcccb361cc24c063516129ebd9d452fc91cde differ Binary files old/apache-rex/.git/objects/a3/0bbf7dfcf72a7912a2fac0669e91037ca042c8 and new/apache-rex/.git/objects/a3/0bbf7dfcf72a7912a2fac0669e91037ca042c8 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/.git/objects/a3/69d68d8f4049d423a837f644d1301e024f9cb6 new/apache-rex/.git/objects/a3/69d68d8f4049d423a837f644d1301e024f9cb6 --- old/apache-rex/.git/objects/a3/69d68d8f4049d423a837f644d1301e024f9cb6 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/.git/objects/a3/69d68d8f4049d423a837f644d1301e024f9cb6 2019-01-22 20:34:10.279515674 +0100 @@ -0,0 +1,2 @@ +xMj0 @} + /2WeiLBJ/|d[eQ|*x 4Zȹ搄:޸o(fKp;Wlr7L'&cV,8>v~Ͼ x8^| ŗ"+zD'kSluR:Xl H \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/.git/objects/a5/110da9decaf6815623188b81e4230aafc65d61 new/apache-rex/.git/objects/a5/110da9decaf6815623188b81e4230aafc65d61 --- old/apache-rex/.git/objects/a5/110da9decaf6815623188b81e4230aafc65d61 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/.git/objects/a5/110da9decaf6815623188b81e4230aafc65d61 2019-02-04 13:23:19.905499841 +0100 @@ -0,0 +1,2 @@ +xI +1E]$T')&R{xz/Npoڒ3r)#yy4~-O=rj% :N.PH'B+−dT8NnUips]k> LGh_'%)AmKkӼI糪7nH \ No newline at end of file Binary files old/apache-rex/.git/objects/b1/41d6d0cd70df8b4ea5da6198bf365abcbb3d40 and new/apache-rex/.git/objects/b1/41d6d0cd70df8b4ea5da6198bf365abcbb3d40 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/.git/objects/ba/fb7c5ee42501d060c654b712063e61960919c6 new/apache-rex/.git/objects/ba/fb7c5ee42501d060c654b712063e61960919c6 --- old/apache-rex/.git/objects/ba/fb7c5ee42501d060c654b712063e61960919c6 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/.git/objects/ba/fb7c5ee42501d060c654b712063e61960919c6 2019-02-04 13:22:40.053280626 +0100 @@ -0,0 +1,3 @@ +xK1{/ܩFh !DU9nەEA{u<>BBw.Nj~ȥR# 6*b&T"TRJ'`ygdr% 8B_E!kr]ub h +LS(<鎌g_n+vX ͗PzW1pil6ܦLCeez}3#!,?%Mxd\,M>,w 92R!.԰Jtv +gAr@wvXv0 a֎]CEJW+VpJQgYr!Ar?#*h4-d؃f12?' \ No newline at end of file Binary files old/apache-rex/.git/objects/bc/a896685680bf1fc7fc8ef1176a3f0847a33bd3 and new/apache-rex/.git/objects/bc/a896685680bf1fc7fc8ef1176a3f0847a33bd3 differ Binary files old/apache-rex/.git/objects/ca/1eaf2382a026df7e260f040d1308f4940196d2 and new/apache-rex/.git/objects/ca/1eaf2382a026df7e260f040d1308f4940196d2 differ Binary files old/apache-rex/.git/objects/cd/0bc14c166c13f23907acf8a3a80372682efdcd and new/apache-rex/.git/objects/cd/0bc14c166c13f23907acf8a3a80372682efdcd differ Binary files old/apache-rex/.git/objects/d5/a91d3c4241636b5e3f5cc3f2e5e29e706c3290 and new/apache-rex/.git/objects/d5/a91d3c4241636b5e3f5cc3f2e5e29e706c3290 differ Binary files old/apache-rex/.git/objects/e1/1db97e0e82cbf93b5fa17892ec7bc1342836b6 and new/apache-rex/.git/objects/e1/1db97e0e82cbf93b5fa17892ec7bc1342836b6 differ Binary files old/apache-rex/.git/objects/e1/ac30a8d22e9e3d0b9302632491bff3ec4669de and new/apache-rex/.git/objects/e1/ac30a8d22e9e3d0b9302632491bff3ec4669de differ Binary files old/apache-rex/.git/objects/e4/17f460725e104896bbf7998263ac7622071516 and new/apache-rex/.git/objects/e4/17f460725e104896bbf7998263ac7622071516 differ Binary files old/apache-rex/.git/objects/e6/9a199d0c15703c1a145df72924456ffc63c25a and new/apache-rex/.git/objects/e6/9a199d0c15703c1a145df72924456ffc63c25a differ Binary files old/apache-rex/.git/objects/f1/8dca19fbc41917637e8ae4e449b35470ea5395 and new/apache-rex/.git/objects/f1/8dca19fbc41917637e8ae4e449b35470ea5395 differ Binary files old/apache-rex/.git/objects/f1/96d16481c5ae9f5212b073a6316f7f5fff8c4c and new/apache-rex/.git/objects/f1/96d16481c5ae9f5212b073a6316f7f5fff8c4c differ Binary files old/apache-rex/.git/objects/f2/45d58544f04e26c99dc1de601d2de80016dcbe and new/apache-rex/.git/objects/f2/45d58544f04e26c99dc1de601d2de80016dcbe differ Binary files old/apache-rex/.git/objects/f4/6c24dfcb24775721698272172932874b29caae and new/apache-rex/.git/objects/f4/6c24dfcb24775721698272172932874b29caae differ Binary files old/apache-rex/.git/objects/f4/c3f2eea37670cde18abb28629284796467625b and new/apache-rex/.git/objects/f4/c3f2eea37670cde18abb28629284796467625b differ Binary files old/apache-rex/.git/objects/fa/17156caab781fef93b7beb316a68f781417bb8 and new/apache-rex/.git/objects/fa/17156caab781fef93b7beb316a68f781417bb8 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/.git/refs/heads/master new/apache-rex/.git/refs/heads/master --- old/apache-rex/.git/refs/heads/master 2018-11-27 12:46:33.279398903 +0100 +++ new/apache-rex/.git/refs/heads/master 2019-02-08 15:03:26.764261511 +0100 @@ -1 +1 @@ -ffa28829a96860005c013f7b4bede1fc8f3ca6a7 +709ae860bf983d072ad3016215bc41f71e5fef58 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/.git/refs/remotes/origin/master new/apache-rex/.git/refs/remotes/origin/master --- old/apache-rex/.git/refs/remotes/origin/master 2018-11-27 12:46:46.827462076 +0100 +++ new/apache-rex/.git/refs/remotes/origin/master 2019-02-08 15:04:01.732428806 +0100 @@ -1 +1 @@ -ffa28829a96860005c013f7b4bede1fc8f3ca6a7 +709ae860bf983d072ad3016215bc41f71e5fef58 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/README.md new/apache-rex/README.md --- old/apache-rex/README.md 2018-11-02 13:15:44.063240717 +0100 +++ new/apache-rex/README.md 2019-02-04 15:29:23.407471613 +0100 @@ -95,9 +95,12 @@ Contains example apache configuration; in example.conf.in will `@VARIABLE_NAME@` be expanded for enumerated variables first to create example.conf. +* `post-run.sh` (optional) + Shows what has to be done after apache stop. It is dual to `pre-run.sh`. + Return value of `post-run.sh` is not checked. * `pre-run.sh` (optional) Shows what has to be done before apache start (e. g. place test ssl - certificate on correct place). `pre-run.sh` exits `0` in any case. + certificate on correct place). `pre-run.sh` return value is not checked. * `run.sh` (required) Determines an example flow. Script exits `0` in case whole example passed or number of failed subexample. If there are more subexamples failing, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/contents new/apache-rex/contents --- old/apache-rex/contents 2018-11-27 11:48:04.419021280 +0100 +++ new/apache-rex/contents 2019-02-08 13:16:38.593620499 +0100 @@ -84,6 +84,8 @@ mod_proxy_fcgi-sock mod_php-basic mod_proxy_fcgi-php-fpm +mod_proxy_fcgi-php-fpm-CGIPassAuth +mod_proxy_fcgi-php-fpm-auth-RewriteRule mod_proxy_scgi-basic mod_proxy_wstunnel-basic mod_cgi-basic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/lib/php-fpm new/apache-rex/lib/php-fpm --- old/apache-rex/lib/php-fpm 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/lib/php-fpm 2019-02-04 13:14:48.250685449 +0100 @@ -0,0 +1,33 @@ +#!/bin/bash +. ../lib/processman + +# start a php-fpm server +function start_fpm() +{ + echo -n 'Starting php-fpm .. ' +cat << EOF > $AREX_RUN_DIR/php-fpm.conf +[global] +pid = $AREX_RUN_DIR/php-fpm.pid +error_log = $AREX_RUN_DIR/php-fpm.log + +[www] +listen = 127.0.0.1:$AREX_FCGI_PORT +pm = dynamic +pm.max_children = 5 +pm.start_servers = 2 +pm.min_spare_servers = 1 +pm.max_spare_servers = 3 +EOF + php-fpm --fpm-config $AREX_RUN_DIR/php-fpm.conf + sleep 1 + echo $(cat $AREX_RUN_DIR/php-fpm.pid) + echo +} + +# stop php-fpm server +function stop_fpm() +{ + echo -n 'Stopping php-fpm ... ' + kill_pid_port $(cat $AREX_RUN_DIR/php-fpm.pid) $AREX_FCGI_PORT && echo 'done.' || echo 'FAILED.' +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_proxy_fcgi-php-fpm/run.sh new/apache-rex/mod_proxy_fcgi-php-fpm/run.sh --- old/apache-rex/mod_proxy_fcgi-php-fpm/run.sh 2018-11-27 11:50:34.163713583 +0100 +++ new/apache-rex/mod_proxy_fcgi-php-fpm/run.sh 2019-02-04 13:20:54.740701344 +0100 @@ -1,37 +1,17 @@ exit_code=0 -. ../lib/processman +. ../lib/php-fpm # https://wiki.apache.org/httpd/PHP-FPM echo '' > $AREX_DOCUMENT_ROOT/welcome.php -# start php-fpm server -echo -n 'Starting php-fpm .. ' -cat << EOF > $AREX_RUN_DIR/php-fpm.conf -[global] -pid = $AREX_RUN_DIR/php-fpm.pid -error_log = $AREX_RUN_DIR/php-fpm.log - -[www] -listen = 127.0.0.1:$AREX_FCGI_PORT -pm = dynamic -pm.max_children = 5 -pm.start_servers = 2 -pm.min_spare_servers = 1 -pm.max_spare_servers = 3 -EOF -php-fpm --fpm-config $AREX_RUN_DIR/php-fpm.conf -sleep 1 -echo $(cat $AREX_RUN_DIR/php-fpm.pid) -echo +start_fpm echo "[1] *.php files are proxied to php-fpm daemon" curl -s http://localhost:$AREX_PORT/welcome.php | grep 'HELLO FROM PHP FCGI' || exit_code=1 -# stop php-fpm server echo -echo -n 'Stopping php-fpm ... ' -kill_pid_port $(cat $AREX_RUN_DIR/php-fpm.pid) $AREX_FCGI_PORT && echo 'done.' || echo 'FAILED.' +stop_fpm exit $exit_code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/BINARIES new/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/BINARIES --- old/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/BINARIES 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/BINARIES 2019-02-04 11:20:25.256923099 +0100 @@ -0,0 +1 @@ +htpasswd php-fpm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/DESCRIPTION new/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/DESCRIPTION --- old/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/DESCRIPTION 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/DESCRIPTION 2019-02-08 13:19:06.174308062 +0100 @@ -0,0 +1,3 @@ +Demonstrate how to pass authorization headers to php-fpm, via +CGIPassAuth. See mod_proxy_fcgi-php-fpm-auth-RewriteRule how +to do via mod_rewrite. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/MODULES new/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/MODULES --- old/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/MODULES 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/MODULES 2019-02-04 12:10:02.973216362 +0100 @@ -0,0 +1 @@ +authn_file authz_user proxy proxy_fcgi setenvif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/MODULES_OPT new/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/MODULES_OPT --- old/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/MODULES_OPT 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/MODULES_OPT 2019-02-04 11:19:46.704724194 +0100 @@ -0,0 +1 @@ +authn_core diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/example.conf.in new/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/example.conf.in --- old/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/example.conf.in 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/example.conf.in 2019-02-05 08:27:05.108981194 +0100 @@ -0,0 +1,37 @@ +Listen @AREX_PORT1@ + + DocumentRoot "@AREX_DOCUMENT_ROOT@" + ErrorLog "@AREX_RUN_DIR@/error_log-vh1" + + + AuthType Basic + AuthBasicProvider file + AuthName "Restricted Area" + AuthUserFile @AREX_RUN_DIR@/htpasswd + Require valid-user + # https://stackoverflow.com/questions/17018586/apache-2-4-php-fpm-and-authorization-headers + CGIPassAuth on + + + ProxyPassMatch ^/(.*\.php)$ fcgi://127.0.0.1:@AREX_FCGI_PORT@/@AREX_DOCUMENT_ROOT@/$1 + + +Listen @AREX_PORT2@ + + DocumentRoot "@AREX_DOCUMENT_ROOT@" + ErrorLog "@AREX_RUN_DIR@/error_log-vh2" + + + AuthType Basic + AuthBasicProvider file + AuthName "Restricted Area" + AuthUserFile @AREX_RUN_DIR@/htpasswd + Require valid-user + # https://stackoverflow.com/questions/17018586/apache-2-4-php-fpm-and-authorization-headers + CGIPassAuth off + + + ProxyPassMatch ^/(.*\.php)$ fcgi://127.0.0.1:@AREX_FCGI_PORT@/@AREX_DOCUMENT_ROOT@/$1 + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/run.sh new/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/run.sh --- old/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/run.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_proxy_fcgi-php-fpm-CGIPassAuth/run.sh 2019-02-05 08:29:31.241731626 +0100 @@ -0,0 +1,21 @@ +. ../lib/php-fpm +exit_code=0 + +htpasswd -bc $AREX_RUN_DIR/htpasswd john StrongPassword +echo '' \ + > $AREX_DOCUMENT_ROOT/welcome.php + +start_fpm + +echo "[1] credentials are passed to php script" +curl -s -u john:StrongPassword http://localhost:$AREX_PORT1/welcome.php \ + | grep 'Hey john! Your password has leaked: StrongPassword' || exit_code=1 + +echo "[2] credentials are not passed to php script" +curl -s -u john:StrongPassword http://localhost:$AREX_PORT2/welcome.php \ + | grep 'Hey john! Your password has leaked: $' || exit_code=2 + +echo +stop_fpm + +exit $exit_code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/BINARIES new/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/BINARIES --- old/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/BINARIES 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/BINARIES 2019-02-08 12:51:20.614598824 +0100 @@ -0,0 +1 @@ +htpasswd php-fpm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/DESCRIPTION new/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/DESCRIPTION --- old/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/DESCRIPTION 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/DESCRIPTION 2019-02-08 13:17:31.657866741 +0100 @@ -0,0 +1,2 @@ +Demonstrate how to pass authorization headers to php-fpm, using +RewriteRule (mimicking CGIPassAuth). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/MODULES new/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/MODULES --- old/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/MODULES 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/MODULES 2019-02-08 13:01:18.981353284 +0100 @@ -0,0 +1 @@ +authn_file authz_user proxy proxy_fcgi setenvif rewrite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/MODULES_OPT new/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/MODULES_OPT --- old/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/MODULES_OPT 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/MODULES_OPT 2019-02-08 12:51:20.606598787 +0100 @@ -0,0 +1 @@ +authn_core diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/example.conf.in new/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/example.conf.in --- old/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/example.conf.in 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/example.conf.in 2019-02-08 13:14:38.633063823 +0100 @@ -0,0 +1,42 @@ +Listen @AREX_PORT1@ + + DocumentRoot "@AREX_DOCUMENT_ROOT@" + ErrorLog "@AREX_RUN_DIR@/error_log-vh1" + + + AuthType Basic + AuthBasicProvider file + AuthName "Restricted Area" + AuthUserFile @AREX_RUN_DIR@/htpasswd + Require valid-user + # https://stackoverflow.com/questions/17018586/apache-2-4-php-fpm-and-authorization-headers + # https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues/1244 + # CGIPassAuth on + RewriteEngine on + RewriteCond %{HTTP:Authorization} . + RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}] + + + ProxyPassMatch ^/(.*\.php)$ fcgi://127.0.0.1:@AREX_FCGI_PORT@/@AREX_DOCUMENT_ROOT@/$1 + + +Listen @AREX_PORT2@ + + DocumentRoot "@AREX_DOCUMENT_ROOT@" + ErrorLog "@AREX_RUN_DIR@/error_log-vh2" + + + AuthType Basic + AuthBasicProvider file + AuthName "Restricted Area" + AuthUserFile @AREX_RUN_DIR@/htpasswd + Require valid-user + # https://stackoverflow.com/questions/17018586/apache-2-4-php-fpm-and-authorization-headers + # https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues/1244 + # CGIPassAuth off + + + ProxyPassMatch ^/(.*\.php)$ fcgi://127.0.0.1:@AREX_FCGI_PORT@/@AREX_DOCUMENT_ROOT@/$1 + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/run.sh new/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/run.sh --- old/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/run.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_proxy_fcgi-php-fpm-auth-RewriteRule/run.sh 2019-02-08 13:15:15.473234776 +0100 @@ -0,0 +1,21 @@ +. ../lib/php-fpm +exit_code=0 + +htpasswd -bc $AREX_RUN_DIR/htpasswd john StrongPassword +echo '' \ + > $AREX_DOCUMENT_ROOT/welcome.php + +start_fpm + +echo "[1] credentials are passed to php script" +curl -s -u john:StrongPassword http://localhost:$AREX_PORT1/welcome.php \ + | grep 'Hey john! Your password has leaked: StrongPassword' || exit_code=1 + +echo "[2] credentials are not passed to php script" +curl -s -u john:StrongPassword http://localhost:$AREX_PORT2/welcome.php \ + | grep 'Hey john! Your password has leaked: $' || exit_code=2 + +echo +stop_fpm + +exit $exit_code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_proxy_ftp-basic/run.sh new/apache-rex/mod_proxy_ftp-basic/run.sh --- old/apache-rex/mod_proxy_ftp-basic/run.sh 2018-11-02 20:09:50.089422356 +0100 +++ new/apache-rex/mod_proxy_ftp-basic/run.sh 2019-02-08 15:02:33.372006049 +0100 @@ -21,7 +21,7 @@ ###### echo -n 'Starting vsftpd ... ' vsftpd $AREX_RUN_DIR/vsftpd.conf& -sleep 1 +sleep 3 vsftpd_pid=$(get_pid_port $AREX_FTP_PORT) if [ -z "$vsftpd_pid" ]; then echo "FAILED." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_ssl-SSLCryptoDevice/run.sh new/apache-rex/mod_ssl-SSLCryptoDevice/run.sh --- old/apache-rex/mod_ssl-SSLCryptoDevice/run.sh 2018-11-02 10:28:36.518404682 +0100 +++ new/apache-rex/mod_ssl-SSLCryptoDevice/run.sh 2019-01-22 20:33:50.247415552 +0100 @@ -8,6 +8,7 @@ echo "[2] access trough http disallowed" curl -s --cacert $AREX_RUN_DIR/ca/my.crt --resolve "aserver.suse.cz:$AREX_PORT:127.0.0.1" http://aserver.suse.cz:$AREX_PORT/ \ | grep '400 Bad Request' || exit_code=2 +echo "[3] access to the same address under different name not allowed" curl -v -s --cacert $AREX_RUN_DIR/ca/my.crt --resolve "test.suse.cz:$AREX_PORT:127.0.0.1" https://test.suse.cz:$AREX_PORT/ \ 2>&1 | grep 'does not match target host name' || exit_code=3 exit $exit_code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/run-rex new/apache-rex/run-rex --- old/apache-rex/run-rex 2018-11-27 12:45:49.939196816 +0100 +++ new/apache-rex/run-rex 2019-01-22 20:30:09.550312495 +0100 @@ -199,7 +199,7 @@ function openssl_an_engine() { - openssl engine | head -n 1 | sed 's:^(\([^()]*\)).*:\1:' + openssl engine | grep -v dynamic | head -n 1 | sed 's:^(\([^()]*\)).*:\1:' } function openssl_have_alpn()