MC-31987: Varnish graphql cache has to skip authenticated requests

Prabhu Ram · Prabhu Ram · commit de81e6201e14 · 2020-03-10T16:05:12.000-05:00
- review fix
diff --git a/app/code/Magento/PageCache/etc/varnish4.vcl b/app/code/Magento/PageCache/etc/varnish4.vcl
@@ -108,11 +108,9 @@ sub vcl_recv {
         #unset req.http.Cookie;
     }
 
-    if (req.method == "GET" && req.url ~ "/graphql" && req.url ~ "query=") {
-        # Authenticated customers should not be cached by default
-        if (req.http.Authorization ~ "^Bearer") {
-            return (pass);
-        }
+     # Authenticated graphQL customers should not be cached by default
+    if (req.url ~ "/graphql" && req.http.Authorization ~ "^Bearer") {
+        return (pass);
     }
 
     return (hash);
@@ -130,7 +128,7 @@ sub vcl_hash {
         hash_data(server.ip);
     }
 
-    if (req.method == "GET" && req.url ~ "/graphql" && req.url ~ "query=") {
+    if (req.url ~ "/graphql") {
         call process_graphql_headers;
     }
 
diff --git a/app/code/Magento/PageCache/etc/varnish5.vcl b/app/code/Magento/PageCache/etc/varnish5.vcl
@@ -109,11 +109,9 @@ sub vcl_recv {
         #unset req.http.Cookie;
     }
 
-    if (req.method == "GET" && req.url ~ "/graphql" && req.url ~ "query=") {
-        # Authenticated customers should not be cached by default
-        if (req.http.Authorization ~ "^Bearer") {
-            return (pass);
-        }
+    # Authenticated graphQL customers should not be cached by default
+    if (req.url ~ "/graphql" && req.http.Authorization ~ "^Bearer") {
+        return (pass);
     }
 
     return (hash);
@@ -137,7 +135,7 @@ sub vcl_hash {
     }
     /* {{ design_exceptions_code }} */
 
-    if (req.method == "GET" && req.url ~ "/graphql" && req.url ~ "query=" ) {
+    if (req.url ~ "/graphql") {
         call process_graphql_headers;
     }
 }
diff --git a/app/code/Magento/PageCache/etc/varnish6.vcl b/app/code/Magento/PageCache/etc/varnish6.vcl
@@ -109,11 +109,9 @@ sub vcl_recv {
         #unset req.http.Cookie;
     }
 
-    if (req.method == "GET" && req.url ~ "/graphql" && req.url ~ "query=") {
-        # Authenticated customers should not be cached by default
-        if (req.http.Authorization ~ "^Bearer") {
-            return (pass);
-        }
+    # Authenticated graphQL customers should not be cached by default
+    if (req.url ~ "/graphql" && req.http.Authorization ~ "^Bearer") {
+        return (pass);
     }
 
     return (hash);
@@ -137,7 +135,7 @@ sub vcl_hash {
     }
     /* {{ design_exceptions_code }} */
 
-    if (req.method == "GET" && req.url ~ "/graphql" && req.url ~ "query=") {
+    if (req.url ~ "/graphql") {
         call process_graphql_headers;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -108,11 +108,9 @@ sub vcl_recv {`
`108`	`108`	`#unset req.http.Cookie;`
`109`	`109`	`}`
`110`	`110`
`111`		`- if (req.method == "GET" && req.url ~ "/graphql" && req.url ~ "query=") {`
`112`		`- # Authenticated customers should not be cached by default`
`113`		`- if (req.http.Authorization ~ "^Bearer") {`
`114`		`- return (pass);`
`115`		`- }`
	`111`	`+ # Authenticated graphQL customers should not be cached by default`
	`112`	`+ if (req.url ~ "/graphql" && req.http.Authorization ~ "^Bearer") {`
	`113`	`+ return (pass);`
`116`	`114`	`}`
`117`	`115`
`118`	`116`	`return (hash);`
`@@ -130,7 +128,7 @@ sub vcl_hash {`
`130`	`128`	`hash_data(server.ip);`
`131`	`129`	`}`
`132`	`130`
`133`		`- if (req.method == "GET" && req.url ~ "/graphql" && req.url ~ "query=") {`
	`131`	`+ if (req.url ~ "/graphql") {`
`134`	`132`	`call process_graphql_headers;`
`135`	`133`	`}`
`136`	`134`
Original file line number	Diff line number	Diff line change
`@@ -109,11 +109,9 @@ sub vcl_recv {`
`109`	`109`	`#unset req.http.Cookie;`
`110`	`110`	`}`
`111`	`111`
`112`		`- if (req.method == "GET" && req.url ~ "/graphql" && req.url ~ "query=") {`
`113`		`- # Authenticated customers should not be cached by default`
`114`		`- if (req.http.Authorization ~ "^Bearer") {`
`115`		`- return (pass);`
`116`		`- }`
	`112`	`+ # Authenticated graphQL customers should not be cached by default`
	`113`	`+ if (req.url ~ "/graphql" && req.http.Authorization ~ "^Bearer") {`
	`114`	`+ return (pass);`
`117`	`115`	`}`
`118`	`116`
`119`	`117`	`return (hash);`
`@@ -137,7 +135,7 @@ sub vcl_hash {`
`137`	`135`	`}`
`138`	`136`	`/* {{ design_exceptions_code }} */`
`139`	`137`
`140`		`- if (req.method == "GET" && req.url ~ "/graphql" && req.url ~ "query=" ) {`
	`138`	`+ if (req.url ~ "/graphql") {`
`141`	`139`	`call process_graphql_headers;`
`142`	`140`	`}`
`143`	`141`	`}`