Add CIDR unit test

marcosbarbero · Jul 8, 2019 · 17787bc · 17787bc
1 parent 483aa06
commit 17787bc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -83,7 +83,7 @@
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
-                <version>Finchley.RELEASE</version>
+                <version>Finchley.SR4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/...com/marcosbarbero/cloud/autoconfigure/zuul/ratelimit/config/properties/RateLimitType.java b/...com/marcosbarbero/cloud/autoconfigure/zuul/ratelimit/config/properties/RateLimitType.java
@@ -31,14 +31,9 @@ public enum RateLimitType {
     ORIGIN {
         @Override
         public boolean apply(HttpServletRequest request, Route route, RateLimitUtils rateLimitUtils, String matcher) {
-            if(matcher.contains("/")) {
-                try {
-                    SubnetUtils subnetUtils = new SubnetUtils(matcher);
-                    return subnetUtils.getInfo().isInRange(rateLimitUtils.getRemoteAddress(request));
-                }
-                catch(Exception e) {
-                    return false;
-                }
+            if (matcher.contains("/")) {
+                SubnetUtils subnetUtils = new SubnetUtils(matcher);
+                return subnetUtils.getInfo().isInRange(rateLimitUtils.getRemoteAddress(request));
             }
             return matcher.equals(rateLimitUtils.getRemoteAddress(request));
         }

diff --git a/...marcosbarbero/cloud/autoconfigure/zuul/ratelimit/config/properties/RateLimitTypeTest.java b/...marcosbarbero/cloud/autoconfigure/zuul/ratelimit/config/properties/RateLimitTypeTest.java
@@ -59,6 +59,14 @@ public void applyOrigin() {
         assertThat(apply).isTrue();
     }
 
+    @Test
+    public void applyOriginInRange() {
+        when(httpServletRequest.getRemoteAddr()).thenReturn("127.0.0.10");
+
+        boolean apply = RateLimitType.ORIGIN.apply(httpServletRequest, route, rateLimitUtils, "127.0.0.8/29");
+        assertThat(apply).isTrue();
+    }
+
     @Test
     public void applyOriginNoMatch() {
         when(httpServletRequest.getRemoteAddr()).thenReturn("testAddr");