From 751e2d7b581d11930e69109629966538ebc73472 Mon Sep 17 00:00:00 2001
From: Michaela Iorga <michaela@nist.gov>
Date: Mon, 17 Jun 2024 13:29:22 -0400
Subject: [PATCH] Port range constraints re-written to eliminate the error
 docuemnted in issue #290.

---
 .../oscal_implementation-common_metaschema.xml      | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/metaschema/oscal_implementation-common_metaschema.xml b/src/metaschema/oscal_implementation-common_metaschema.xml
index 60138cbf4b..c9eaebbfd9 100644
--- a/src/metaschema/oscal_implementation-common_metaschema.xml
+++ b/src/metaschema/oscal_implementation-common_metaschema.xml
@@ -305,7 +305,7 @@
                   </constraint>
             </define-flag>
             <!-- Added Contraints as Warnings -->
-            <constraint>
+            <!-- constraint>
                   <expect level="WARNING" id="port-range-start-and-end-not-specified" target="." test="exists(@start) and exists(@end)">
                         <message>If a protocol is defined, it should include a start and end port range. To define a single port, the start and end should be the same value.</message>
                   </expect>
@@ -318,6 +318,17 @@
                   <expect level="WARNING" id="port-range-end-date-is-before-start-date" target="." test="@start &lt;= @end">
                         <message>The port range specified has an end port that is less than the start port.</message>
                   </expect>
+            </constraint -->
+            <constraint>
+                  <expect level="WARNING" target="." test="exists(@start)" id="port-range-has-start">
+                        <message>A port range should have a start port given.</message>
+                  </expect>
+                  <expect level="WARNING" target="." test="exists(@end)" id="port-range-has-end">
+                        <message>A port range should have an end port given. To define a single port, the start and end should be the same value.</message>
+                  </expect>
+                  <expect level="WARNING" target="." test="not(@start > @end)" id="port-range-starts-before-end">
+                        <message>The port range start should not be after its end.</message>
+                  </expect>
             </constraint>
             <remarks>
                   <p>To be validated as a natural number (integer &gt;= 1). A single port uses the same value for start and end. Use multiple 'port-range' entries for non-contiguous ranges.</p>