Fixed bug for localhost webhook url validation (#257)

* Fixed bug for localhost webhook url validation
razorpay · Jun 23, 2021 · 736c928 · 736c928
1 parent 3369316
commit 736c928
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,15 @@
 # Change Log
 
 
-## [3.6.0] - 2021-06-17
+## [3.6.2] - 2021-06-23
+
+### Changed
+### Fixed
+- [Fixed webhook localhost url validation](https://github.com/razorpay/razorpay-magento/pull/257).
+
+ Fixed webhook localhost url validation.
+
+## [3.6.1] - 2021-06-17
 
 ### Changed
 ### Fixed

diff --git a/Observer/AfterConfigSaveObserver.php b/Observer/AfterConfigSaveObserver.php
@@ -67,11 +67,15 @@ public function execute(Observer $observer)
 
         $razorpayParams = $this->request->getParam('groups')['razorpay']['fields'];
 
-        if(in_array($_SERVER['SERVER_ADDR'], ["127.0.0.1","::1"]))
+        $domain = parse_url($this->webhookUrl, PHP_URL_HOST);
+
+        $domain_ip = gethostbyname($domain);
+
+        if (!filter_var($domain_ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE))
         {
             $this->config->setConfigData('enable_webhook', 0);
 
-            $this->logger->info("Can't enable/disable webhook on localhost.");
+            $this->logger->info("Can't enable/disable webhook on $domain or private ip($domain_ip).");
             return;
         }
 

diff --git a/README.md b/README.md
@@ -39,6 +39,8 @@ panel (System -> Cache Management).
 
 ### Note: Don't mix composer and zip install.
 
+### Note: Make sure "zipcode" must be required field for billing and shipping address.**
+
 
 ### Working with GraphQL 
 

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "razorpay/magento",
     "description": "Razorpay Magento 2.0 plugin for accepting payments.",
-    "version": "3.6.1",
+    "version": "3.6.2",
     "require": {
         "php": "~5.5.0|~5.6.0|^7.0",
         "razorpay/razorpay": "2.*"

diff --git a/etc/module.xml b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Razorpay_Magento" setup_version="3.6.1">
+    <module name="Razorpay_Magento" setup_version="3.6.2">
 	    <sequence>
 	        <module name="Magento_Sales" />
 	        <module name="Magento_Payment" />
Original file line number	Diff line number	Diff line change
Expand Up		@@ -39,6 +39,8 @@ panel (System -> Cache Management).

		### Note: Don't mix composer and zip install.

		### Note: Make sure "zipcode" must be required field for billing and shipping address.**


		### Working with GraphQL

Expand Down