[varnish] do not return() from our custom VCL

This lets the default VCL logic do its job

[varnish] do not return() from our custom VCL
This lets the default VCL logic do its job
Antonio Terceiro
1 parent ad272fe1
Showing 2 changed files with 12 additions and 5 deletions Show diff stats
etc/noosfero/varnish-noosfero.vcl
test/integration/varnish_conf_test.rb
@@ -3,13 +3,11 @@ sub vcl_recv {
     if (req.http.Cookie) {
       # We only care about the "_noosfero_session.*" cookie, used for
       # authentication.
-      if (req.http.Cookie ~ "_noosfero_session.*" ) {
-           return (pass);
+      if (req.http.Cookie !~ "_noosfero_session.*" ) {
+        # strip all cookies
+        unset req.http.Cookie;
       }
-      # Else strip all cookies
-      unset req.http.Cookie;
     }
-  }
 }
  
 sub vcl_error {
@@ -0,0 +1,9 @@
+require 'test/unit'
+
+class VarnishConfTest < Test::Unit::TestCase
+
+   def test_not_use_return_in_varnish_noosfero
+    assert !system('grep "return.*pass" etc/noosfero/varnish-noosfero.vcl')
+  end
+
+end
...	...	@@ -3,13 +3,11 @@ sub vcl_recv {
3	3	if (req.http.Cookie) {
4	4	# We only care about the "_noosfero_session.*" cookie, used for
5	5	# authentication.
6		- if (req.http.Cookie ~ "_noosfero_session.*" ) {
7		- return (pass);
	6	+ if (req.http.Cookie !~ "_noosfero_session.*" ) {
	7	+ # strip all cookies
	8	+ unset req.http.Cookie;
8	9	}
9		- # Else strip all cookies
10		- unset req.http.Cookie;
11	10	}
12		- }
13	11	}
14	12
15	13	sub vcl_error {
...	...
...	...	@@ -0,0 +1,9 @@
	1	+require 'test/unit'
	2	+
	3	+class VarnishConfTest < Test::Unit::TestCase
	4	+
	5	+ def test_not_use_return_in_varnish_noosfero
	6	+ assert !system('grep "return.*pass" etc/noosfero/varnish-noosfero.vcl')
	7	+ end
	8	+
	9	+end
...	...