Fixed #61

Author: null93

Helper/VclGenerator.php

@@ -99,17 +99,6 @@ public function insertSubHooks ( $node ) {
 			return $node;
 		}
 
-		public function insertForwardedFor ( $node ) {
-			if ( $node ["type"] == "sub" && $node ["identifier"] == "vcl_recv" ) {
-				$value = "    set req.http.X-Forwarded-For = req.http.CF-Connecting-IP;" . $node ["value"];
-				$raw = "sub " . $node ["identifier"] . " {\n" . $value . "\n}";
-				$node ["value"] = $value;
-				$node ["raw"] = $raw;
-				return $node;
-			}
-			return $node;
-		}
-
 		public function insertDeliver ( $node ) {
 			if ( $node ["type"] == "sub" && $node ["identifier"] == "vcl_deliver" ) {
 				$prefixed = implode ( "\n", [
@@ -234,7 +223,6 @@ function generateDefault ( $vcl ) {
 				throw new Error ("Failed to customize config, please contact JetRails.");
 			}
 			$root = $this->insertHeaderComment ( $root );
-			$root = $this->parser->visit ( $root, [ $this, "insertForwardedFor" ] );
 			$root = $this->parser->visit ( $root, [ $this, "versionEndpoint" ] );
 			$root = $this->parser->visit ( $root, [ $this, "modifyRecv" ] );
 			$root = $this->parser->visit ( $root, [ $this, "insertBackendResponse" ] );

default.custom.vcl

@@ -1,6 +1,6 @@
 /**
  * >jetrails_
- *
+ * 
  * This file should be included within the default VCL file. It exists to help
  * customize the default VCL without having to modify the file itself. This way,
  * the default VCL can be updated without having to port over any customizations
@@ -9,11 +9,11 @@
  * hooking system. The available hooks can be found below in the form of
  * subroutines. Their names end in either '_start' or '_end', to find when these
  * subroutines are executed, refer to the default VCL file.
- *
+ * 
  * To keep things tidy, it is recommended that you include a description of the
  * issue that the given code snippet solves as well as any helpful references
  * that lead you to that solution.
- *
+ * 
  * Please Note: Native Varnish subroutines such as 'vcl_synth' can also be
  * defined here since they are not currently being used by Magento. These
  * subroutines will be used in the default VCL, but it is important to make sure

default.vcl

@@ -5,7 +5,7 @@
  * looking to customize the config, please look into the 'default.custom.vcl'
  * file which this config uses to implement it's hooking system.
  *
- * Generated on Magento Community 2.4.2 with [email protected].0
+ * Generated on Magento Community 2.4.2 with [email protected].1
  */
 
 # VCL version 5.0 is not supported so it should be 4.0 even though actually used Varnish version is 6
@@ -38,9 +38,9 @@ acl purge {
 sub vcl_recv {
     call custom_recv_start;
     if (req.method == "GET" && client.ip ~ purge && req.url == "/jetrails/varnish-config/versions") {
-        return (synth(200, "Magento 2.4.2 / Module 3.0.0"));
+        return (synth(200, "Magento 2.4.2 / Module 3.0.1"));
     }
-    set req.http.X-Forwarded-For = req.http.CF-Connecting-IP;
+
     if (req.restarts > 0) {
         set req.hash_always_miss = true;
     }
@@ -153,7 +153,7 @@ sub vcl_hash {
     if (req.http.X-Forwarded-Proto) {
         hash_data(req.http.X-Forwarded-Proto);
     }
-
+    
 
     if (req.url ~ "/graphql") {
         call process_graphql_headers;