Merge branch 'develop' into 'master'

masonpham · masonpham · commit a6f1ba9af613 · 2018-11-12T08:43:39.000+01:00
Develop



See merge request !2
diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@ The widget is a payment page hosted by Paymentwall that embeds the entire paymen
 The Pingback is a webhook notifying about a payment being made. Pingbacks are sent via HTTP/HTTPS to your servers. To process pingbacks use the following code:
 
     Pingback pingback = new Pingback(request.getParameterMap(), request.getRemoteAddr());
-	if (pingback.validate(true)) {
+	if (pingback.validate()) {
 		String goods = pingback.getProductId();
 		String userId = pingback.getUserId();
 		if (pingback.isDeliverable()) {
@@ -104,7 +104,7 @@ The Pingback is a webhook notifying about a payment being made. Pingbacks are se
 #### Pingback Processing
 
     Pingback pingback = new Pingback(request.getParameterMap(), request.getRemoteAddr());
-	if (pingback.validate(true)) {
+	if (pingback.validate()) {
 		Integer currency = pingback.getVirtualCurrencyAmount();
 		String userId = pingback.getUserId();
 		if (pingback.isDeliverable()) {
@@ -155,7 +155,7 @@ You have to set up your products in merchant area for exact regions first in ord
 #### Pingback Processing
 
     Pingback pingback = new Pingback(request.getParameterMap(), request.getRemoteAddr());
-	if (pingback.validate(true)) {
+	if (pingback.validate()) {
 		ArrayList<Product> goods = pingback.getProducts();
 		String userId = pingback.getUserId();
 		if (pingback.isDeliverable()) {
diff --git a/pom.xml b/pom.xml
@@ -84,6 +84,11 @@
             <artifactId>httpclient</artifactId>
             <version>4.4</version>
         </dependency>
+        <dependency>
+ 		 <groupId>commons-net</groupId>
+ 		 <artifactId>commons-net</artifactId>
+ 		 <version>3.6</version>
+	</dependency> 
     </dependencies>
 
     <build>
diff --git a/src/main/java/com/paymentwall/java/Pingback.java b/src/main/java/com/paymentwall/java/Pingback.java
@@ -7,6 +7,8 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.apache.commons.net.util.SubnetUtils;
+
 public class Pingback extends Instance {
         /**
          * Pingback types
@@ -136,6 +138,14 @@ public boolean isIpAddressValid() {
                 ipsWhitelist.add("174.36.92.192");
                 ipsWhitelist.add("174.37.14.28");
             }
+            
+            SubnetUtils utils = new SubnetUtils("216.127.71.0/24");
+            String[] allIps = utils.getInfo().getAllAddresses();
+            
+            for (int i = 0; i < allIps.length; i++) 
+            {
+             ipsWhitelist.add(allIps[i]);
+            }
 
             return ipsWhitelist.contains(ipAddress);
         }
