From 4c5a093b33b63b8da61476a4bd4a192ff04ed2f8 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Wed, 3 Feb 2016 22:12:37 +0100
Subject: [PATCH] (ids) add geoip ui parts

---
 .../OPNsense/IDS/forms/dialogUserDefined.xml      | 15 ++++++++++++++-
 src/opnsense/mvc/app/models/OPNsense/IDS/IDS.xml  | 13 +++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/IDS/forms/dialogUserDefined.xml b/src/opnsense/mvc/app/controllers/OPNsense/IDS/forms/dialogUserDefined.xml
index b28db8f06..1cb0f2a25 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/IDS/forms/dialogUserDefined.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/IDS/forms/dialogUserDefined.xml
@@ -7,10 +7,23 @@
     </field>
     <field>
         <id>rule.fingerprint</id>
-        <label>Fingerprint</label>
+        <label>SSL/Fingerprint</label>
         <type>text</type>
         <help>the SSL fingerprint, for example B5:E1:B3:70:5E:7C:FF:EB:92:C4:29:E5:5B:AC:2F:AE:70:17:E9:9E</help>
     </field>
+    <field>
+        <id>rule.country</id>
+        <label>GeoIP/Country</label>
+        <type>select_multiple</type>
+        <style>tokenize</style>
+        <help>Countries to alert or block using GeoIP</help>
+    </field>
+    <field>
+        <id>rule.geoip_direction</id>
+        <label>GeoIP/Direction</label>
+        <type>dropdown</type>
+        <help>Connections coming from (src) or going to (dst) listed countries, default (none) selects both </help>
+    </field>
     <field>
         <id>rule.action</id>
         <label>Action</label>
diff --git a/src/opnsense/mvc/app/models/OPNsense/IDS/IDS.xml b/src/opnsense/mvc/app/models/OPNsense/IDS/IDS.xml
index c201d9974..9e3ef1695 100644
--- a/src/opnsense/mvc/app/models/OPNsense/IDS/IDS.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/IDS/IDS.xml
@@ -36,6 +36,19 @@
                     <mask>/^([0-9a-fA-F:]){59,59}$/u</mask>
                     <ValidationMessage>A SSL fingerprint should be a 59 character long hex value</ValidationMessage>
                 </fingerprint>
+                <geoip type="CountryField">
+                    <Required>N</Required>
+                    <Multiple>Y</Multiple>
+                    <AddInverted>Y</AddInverted>
+                </geoip>
+                <geoip_direction type="OptionField">
+                    <Required>N</Required>
+                    <default>both</default>
+                    <OptionValues>
+                        <src>source</src>
+                        <dst>destination</dst>
+                    </OptionValues>
+                </geoip_direction>
                 <description type="TextField">
                     <Required>Y</Required>
                     <mask>/^([\t\n\v\f\r 0-9a-zA-Z.\-,_\x{00A0}-\x{FFFF}]){1,255}$/u</mask>