You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jf...@apache.org on 2021/07/06 16:56:47 UTC
svn commit: r1891321 - in /httpd/test/framework/trunk/t: conf/proxy.conf.in
modules/proxy_balancer.t
Author: jfclere
Date: Tue Jul 6 16:56:47 2021
New Revision: 1891321
URL: http://svn.apache.org/viewvc?rev=1891321&view=rev
Log:
Add tests for dynamic part of mod_proxy_balancer.
Modified:
httpd/test/framework/trunk/t/conf/proxy.conf.in
httpd/test/framework/trunk/t/modules/proxy_balancer.t
Modified: httpd/test/framework/trunk/t/conf/proxy.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/conf/proxy.conf.in?rev=1891321&r1=1891320&r2=1891321&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/proxy.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/proxy.conf.in Tue Jul 6 16:56:47 2021
@@ -88,6 +88,16 @@
BalancerMember http://@SERVERNAME@:@PROXY_HTTP_BAL1_PORT@ loadfactor=1 status=H
</Proxy>
ProxyPassMatch ^/baltest_echo_post balancer://failover/echo_post
+
+ ## Test "dynamic balancer
+ <Proxy balancer://dynproxy>
+ ProxySet growth=10
+ </Proxy>
+ <Location /balancer-manager>
+ SetHandler balancer-manager
+ Allow from all
+ </Location>
+ ProxyPass /dynproxy balancer://dynproxy/
</VirtualHost>
Modified: httpd/test/framework/trunk/t/modules/proxy_balancer.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/proxy_balancer.t?rev=1891321&r1=1891320&r2=1891321&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/modules/proxy_balancer.t (original)
+++ httpd/test/framework/trunk/t/modules/proxy_balancer.t Tue Jul 6 16:56:47 2021
@@ -9,12 +9,45 @@ use Apache::TestConfig ();
my @echos = ('A'x8, 'A'x64, 'A'x2048, 'A'x4096);
my $skipbodyfailover = !need_min_apache_version("2.4.42");
+my $referertest = 0;
-plan tests => 3+(2*scalar @echos), need 'proxy_balancer', 'proxy_http';
+if (have_min_apache_version("2.4.41")) {
+ $referertest = 2;
+}
+
+plan tests => 6+(2*scalar @echos)+$referertest, need 'proxy_balancer', 'proxy_http';
Apache::TestRequest::module("proxy_http_balancer");
Apache::TestRequest::user_agent(requests_redirectable => 0);
+# Extract the nonce from response to the URL
+sub GetNonce {
+ my $url = shift;
+ my $balancer = shift;
+ my $r;
+ $r = GET($url);
+ my $NONCE;
+ foreach my $query ( split( /\?b=/, $r->content ) ){
+ if ($query =~ m/$balancer/) {
+ foreach my $var ( split( /&/, $query ) ){
+ if ($var =~ m/nonce=/) {
+ foreach my $nonce ( split( /nonce=/, $var ) ){
+ my $ind = index ($nonce, "\"");
+ $nonce = substr($nonce, 0, ${ind});
+ if ( $nonce =~ m/^[0-9a-fA-F-]+$/ ) {
+ $NONCE = $nonce;
+ last;
+ }
+ }
+ last;
+ }
+ }
+ last;
+ }
+ }
+ return $NONCE;
+}
+
my $r;
if (have_module('lbmethod_byrequests')) {
@@ -54,4 +87,39 @@ foreach my $t (@echos) {
skip $skipbodyfailover, t_cmp($r->content, $t, "response body echoed");
}
+# test dynamic part
+$r = GET("/balancer-manager");
+ok t_cmp($r->code, 200, "Can't find balancer-manager");
+
+# get the nonce and add a worker
+my $result = GetNonce("/balancer-manager", "dynproxy");
+
+my $query = "b_lbm=byrequests&b_tmo=0&b_max=0&b_sforce=0&b_ss=&b_nwrkr=ajp%3A%2F%2F%5B0%3A0%3A0%3A0%3A0%3A0%3A0%3A1%5D%3A8080&b_wyes=1&b=dynproxy&nonce=" . $result;
+my @proxy_balancer_headers;
+my $vars = Apache::Test::vars();
+push @proxy_balancer_headers, "Referer" => "http://" . $vars->{servername} . ":" . $vars->{port} . "/balancer-manager";
+
+# First try with the referer it should fail.
+if (have_min_apache_version("2.4.41")) {
+ $r = POST("/balancer-manager", content => $query);
+ ok t_cmp($r->code, 200, "request failed");
+ ok !t_cmp($r->content, qr/ajp/, "AJP worker created");
+}
+# Try with the referer and http (byrequests)
+if (have_module('lbmethod_byrequests')) {
+ $r = GET("/dynproxy");
+ ok t_cmp($r->code, 503, "request should fail for /dynproxy");
+ # create it
+ $query = "b_lbm=byrequests&b_tmo=0&b_max=0&b_sforce=0&b_ss=&b_nwrkr=http%3A%2F%2Flocalhost%3A8529&b_wyes=1&b=dynproxy&nonce=" . $result;
+ $r = POST("/balancer-manager", content => $query, @proxy_balancer_headers);
+ # enable it.
+ $query = "w=http%3A%2F%2Flocalhost%3A8529&b=dynproxy&w_status_D=0&nonce=" . $result;
+ $r = POST("/balancer-manager", content => $query, @proxy_balancer_headers);
+ # make a query
+ $r = GET("/dynproxy");
+ ok t_cmp($r->code, 200, "request failed to /dynproxy");
+} else {
+ skip "skipping tests without lbmethod_byrequests";
+ skip "skipping tests without lbmethod_byrequests";
+}
Re: svn commit: r1891321 - in /httpd/test/framework/trunk/t:
conf/proxy.conf.in modules/proxy_balancer.t
Posted by jean-frederic clere <jf...@gmail.com>.
On 07/07/2021 09:00, Ruediger Pluem wrote:
>
>
> On 7/6/21 6:56 PM, jfclere@apache.org wrote:
>> Author: jfclere
>> Date: Tue Jul 6 16:56:47 2021
>> New Revision: 1891321
>>
>> URL: http://svn.apache.org/viewvc?rev=1891321&view=rev
>> Log:
>> Add tests for dynamic part of mod_proxy_balancer.
>>
>> Modified:
>> httpd/test/framework/trunk/t/conf/proxy.conf.in
>> httpd/test/framework/trunk/t/modules/proxy_balancer.t
>>
>
>> Modified: httpd/test/framework/trunk/t/modules/proxy_balancer.t
>> URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/proxy_balancer.t?rev=1891321&r1=1891320&r2=1891321&view=diff
>> ==============================================================================
>> --- httpd/test/framework/trunk/t/modules/proxy_balancer.t (original)
>> +++ httpd/test/framework/trunk/t/modules/proxy_balancer.t Tue Jul 6 16:56:47 2021
>
>> @@ -54,4 +87,39 @@ foreach my $t (@echos) {
>> skip $skipbodyfailover, t_cmp($r->content, $t, "response body echoed");
>> }
>>
>> +# test dynamic part
>> +$r = GET("/balancer-manager");
>> +ok t_cmp($r->code, 200, "Can't find balancer-manager");
>> +
>> +# get the nonce and add a worker
>> +my $result = GetNonce("/balancer-manager", "dynproxy");
>> +
>> +my $query = "b_lbm=byrequests&b_tmo=0&b_max=0&b_sforce=0&b_ss=&b_nwrkr=ajp%3A%2F%2F%5B0%3A0%3A0%3A0%3A0%3A0%3A0%3A1%5D%3A8080&b_wyes=1&b=dynproxy&nonce=" . $result;
>> +my @proxy_balancer_headers;
>> +my $vars = Apache::Test::vars();
>> +push @proxy_balancer_headers, "Referer" => "http://" . $vars->{servername} . ":" . $vars->{port} . "/balancer-manager";
>> +
>> +# First try with the referer it should fail.
>
> s/with/without/ ?
Oops fixed, thanks.
>
>> +if (have_min_apache_version("2.4.41")) {
>> + $r = POST("/balancer-manager", content => $query);
>> + ok t_cmp($r->code, 200, "request failed");
>> + ok !t_cmp($r->content, qr/ajp/, "AJP worker created");
>> +}
>>
>
> Regards
>
> Rüdiger
>
--
Cheers
Jean-Frederic
Re: svn commit: r1891321 - in /httpd/test/framework/trunk/t:
conf/proxy.conf.in modules/proxy_balancer.t
Posted by Ruediger Pluem <rp...@apache.org>.
On 7/6/21 6:56 PM, jfclere@apache.org wrote:
> Author: jfclere
> Date: Tue Jul 6 16:56:47 2021
> New Revision: 1891321
>
> URL: http://svn.apache.org/viewvc?rev=1891321&view=rev
> Log:
> Add tests for dynamic part of mod_proxy_balancer.
>
> Modified:
> httpd/test/framework/trunk/t/conf/proxy.conf.in
> httpd/test/framework/trunk/t/modules/proxy_balancer.t
>
> Modified: httpd/test/framework/trunk/t/modules/proxy_balancer.t
> URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/proxy_balancer.t?rev=1891321&r1=1891320&r2=1891321&view=diff
> ==============================================================================
> --- httpd/test/framework/trunk/t/modules/proxy_balancer.t (original)
> +++ httpd/test/framework/trunk/t/modules/proxy_balancer.t Tue Jul 6 16:56:47 2021
> @@ -54,4 +87,39 @@ foreach my $t (@echos) {
> skip $skipbodyfailover, t_cmp($r->content, $t, "response body echoed");
> }
>
> +# test dynamic part
> +$r = GET("/balancer-manager");
> +ok t_cmp($r->code, 200, "Can't find balancer-manager");
> +
> +# get the nonce and add a worker
> +my $result = GetNonce("/balancer-manager", "dynproxy");
> +
> +my $query = "b_lbm=byrequests&b_tmo=0&b_max=0&b_sforce=0&b_ss=&b_nwrkr=ajp%3A%2F%2F%5B0%3A0%3A0%3A0%3A0%3A0%3A0%3A1%5D%3A8080&b_wyes=1&b=dynproxy&nonce=" . $result;
> +my @proxy_balancer_headers;
> +my $vars = Apache::Test::vars();
> +push @proxy_balancer_headers, "Referer" => "http://" . $vars->{servername} . ":" . $vars->{port} . "/balancer-manager";
> +
> +# First try with the referer it should fail.
s/with/without/ ?
> +if (have_min_apache_version("2.4.41")) {
> + $r = POST("/balancer-manager", content => $query);
> + ok t_cmp($r->code, 200, "request failed");
> + ok !t_cmp($r->content, qr/ajp/, "AJP worker created");
> +}
>
Regards
Rüdiger