IP Restriction plugin: support mask format

edenlabllc · Sep 19, 2017 · 6ce6128 · 6ce6128
1 parent a575737
commit 6ce6128
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/annon_api/plugins/ip_restriction/settings_validator.ex b/lib/annon_api/plugins/ip_restriction/settings_validator.ex
@@ -23,7 +23,7 @@ defmodule Annon.Plugins.IPRestriction.SettingsValidator do
           "items" => %{
             "type" => "string",
             "oneOf" => [
-              %{"pattern" => "^(\\*|\\d+)\.(\\*|\\d+)\.(\\*|\\d+)\.(\\*|\\d+)$"}
+              %{"pattern" => "^(\\*|\\d+)\.(\\*|\\d+)\.(\\*|\\d+)\.(\\*|\\d+)(\/\\d{1,2})?$"}
             ]
           }
         },
@@ -32,7 +32,7 @@ defmodule Annon.Plugins.IPRestriction.SettingsValidator do
           "items" => %{
             "type" => "string",
             "oneOf" => [
-              %{"pattern" => "^(\\*|\\d+)\.(\\*|\\d+)\.(\\*|\\d+)\.(\\*|\\d+)$"}
+              %{"pattern" => "^(\\*|\\d+)\.(\\*|\\d+)\.(\\*|\\d+)\.(\\*|\\d+)(\/\\d{1,2})?$"}
             ]
           }
         }

diff --git a/test/unit/plugins/ip_restriction_test.exs b/test/unit/plugins/ip_restriction_test.exs
@@ -32,6 +32,13 @@ defmodule Annon.Plugins.IPRestrictionTest do
       }}}
 
       assert %Ecto.Changeset{valid?: false} = IPRestriction.validate_settings(changeset)
+
+      changeset = %Ecto.Changeset{valid?: true, changes: %{settings: %{
+        "blacklist" => ["127.0.0.0/100"],
+        "whitelist" => ["128.30.50.245/ab"]
+      }}}
+
+      assert %Ecto.Changeset{valid?: false} = IPRestriction.validate_settings(changeset)
     end
   end