From 8257b1fbbc478aed8dd56f6012b56111b86fee32 Mon Sep 17 00:00:00 2001
From: Fabian Franz BSc <fabianfrz@users.noreply.github.com>
Date: Sun, 6 Jan 2019 20:30:17 +0100
Subject: [PATCH] mail/rspamd: fix model (missing properties), constraint bugs
 (#1120)

* mail/rspamd: fix model (missing properties), constaint bugs
---
 .../mvc/app/models/OPNsense/Rspamd/RSpamd.xml | 54 ++++++++++++++++++-
 1 file changed, 52 insertions(+), 2 deletions(-)

diff --git a/mail/rspamd/src/opnsense/mvc/app/models/OPNsense/Rspamd/RSpamd.xml b/mail/rspamd/src/opnsense/mvc/app/models/OPNsense/Rspamd/RSpamd.xml
index 9c7cecb46..b7bf37112 100644
--- a/mail/rspamd/src/opnsense/mvc/app/models/OPNsense/Rspamd/RSpamd.xml
+++ b/mail/rspamd/src/opnsense/mvc/app/models/OPNsense/Rspamd/RSpamd.xml
@@ -17,10 +17,35 @@
         <MaximumValue>999</MaximumValue>
         <Constraints>
           <check001>
-            <ValidationMessage>This field must be bigger than the header score.</ValidationMessage>
+            <ValidationMessage>This field must be bigger than the subject score.</ValidationMessage>
+            <type>ComparedToFieldConstraint</type>
+            <field>subjectscore</field>
+            <operator>gt</operator>
+          </check001>
+          <check002>
+            <ValidationMessage>This field must be bigger than the reject score.</ValidationMessage>
             <type>ComparedToFieldConstraint</type>
             <field>headerscore</field>
             <operator>gt</operator>
+          </check002>
+          <check003>
+            <ValidationMessage>This field must be bigger than the greylist score.</ValidationMessage>
+            <type>ComparedToFieldConstraint</type>
+            <field>greylistscore</field>
+            <operator>gt</operator>
+          </check003>
+        </Constraints>
+      </rejectscore>
+      <headerscore type="IntegerField">
+        <Required>N</Required>
+        <MinimumValue>1</MinimumValue>
+        <MaximumValue>999</MaximumValue>
+        <Constraints>
+          <check001>
+            <ValidationMessage>This field must be lower than the subject score.</ValidationMessage>
+            <type>ComparedToFieldConstraint</type>
+            <field>subjectscore</field>
+            <operator>lt</operator>
           </check001>
           <check002>
             <ValidationMessage>This field must be lower than the reject score.</ValidationMessage>
@@ -35,7 +60,7 @@
             <operator>gt</operator>
           </check003>
         </Constraints>
-      </rejectscore>
+      </headerscore>
       <greylistscore type="IntegerField">
         <Required>N</Required>
         <MinimumValue>1</MinimumValue>
@@ -61,6 +86,31 @@
           </check003>
         </Constraints>
       </greylistscore>
+      <subjectscore type="IntegerField">
+        <Required>N</Required>
+        <MinimumValue>1</MinimumValue>
+        <MaximumValue>999</MaximumValue>
+        <Constraints>
+          <check001>
+            <ValidationMessage>This field must be bigger than the header score.</ValidationMessage>
+            <type>ComparedToFieldConstraint</type>
+            <field>headerscore</field>
+            <operator>gt</operator>
+          </check001>
+          <check002>
+            <ValidationMessage>This field must be lower than the reject score.</ValidationMessage>
+            <type>ComparedToFieldConstraint</type>
+            <field>rejectscore</field>
+            <operator>lt</operator>
+          </check002>
+          <check003>
+            <ValidationMessage>This field must be bigger than the subject score.</ValidationMessage>
+            <type>ComparedToFieldConstraint</type>
+            <field>greylistscore</field>
+            <operator>gt</operator>
+          </check003>
+        </Constraints>
+      </subjectscore>
       <rewritesubject type="TextField">
         <Required>N</Required>
       </rewritesubject>