Test

Author: Steve Ramage

src/main/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/semanticdata/optionvalues/CgroupSocketBindOptionValue.kt

@@ -1,5 +1,6 @@
 package net.sjrx.intellij.plugins.systemdunitfiles.semanticdata.optionvalues
 
+import kotlinx.html.ADDRESS
 import net.sjrx.intellij.plugins.systemdunitfiles.semanticdata.Validator
 import net.sjrx.intellij.plugins.systemdunitfiles.semanticdata.optionvalues.grammar.*
 
@@ -15,16 +16,24 @@ class CgroupSocketBindOptionValue() : GrammarOptionValue("config_parse_cgroup_so
     val DASH = LiteralChoiceTerminal("-")
     val COLON = LiteralChoiceTerminal(":")
     val IP_PORT_RANGE = SequenceCombinator(IP_PORT, DASH, IP_PORT)
-    val IP_PORTS = AlternativeCombinator(IP_PORT, IP_PORT_RANGE)
+    val IP_PORTS = AlternativeCombinator(IP_PORT_RANGE, IP_PORT)
 
     val GRAMMAR = SequenceCombinator(
       AlternativeCombinator(
         LiteralChoiceTerminal("any"),
-        SequenceCombinator(
-          ZeroOrOne(SequenceCombinator(ADDRESS_FAMILY, COLON)),
-          ZeroOrOne(SequenceCombinator(TRANSPORT_PROTOCOL, COLON)),
-          ZeroOrOne(IP_PORTS),
-          )
+        // The grammar has three blocks address-family, transport-protocol, and ip-ports, if there is more than one, there is a colon.
+        // We break this up into a few cases
+        // All specified
+        SequenceCombinator(ADDRESS_FAMILY, COLON, TRANSPORT_PROTOCOL,COLON, IP_PORTS),
+        // No ports
+        SequenceCombinator(ADDRESS_FAMILY, COLON, TRANSPORT_PROTOCOL),
+        // No transport
+        SequenceCombinator(ADDRESS_FAMILY, COLON, IP_PORTS),
+        // No Address family
+        SequenceCombinator(TRANSPORT_PROTOCOL,COLON, IP_PORTS),
+        ADDRESS_FAMILY,
+        TRANSPORT_PROTOCOL,
+        IP_PORTS
       ),
       EOF())
 

src/test/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/inspections/InvalidValueInspectionForCGroupSocketBind.kt

@@ -11,7 +11,7 @@ class InvalidValueInspectionForCGroupSocketBindOptionValue : AbstractUnitFileTes
     val file = """
            [Service]
            # Allow binding IPv6 socket addresses with a port greater than or equal to 10000.
-           SocketBindAllow=ip6:10000-65535
+           SocketBindAllow=ipv6:10000-65535
            SocketBindDeny=any
            # Allow binding IPv4 and IPv6 socket addresses with 1234 and 4321 ports.
            
@@ -49,12 +49,13 @@ class InvalidValueInspectionForCGroupSocketBindOptionValue : AbstractUnitFileTes
     assertSize(0, highlights)
   }
 
-  fun testWeakWarningWhenNineIsSpecified() {
+
+  fun testWeakWarningWhenInvalidAddressFamilySpecified() {
     // Fixture Setup
     // language="unit file (systemd)"
     val file = """
            [Service]
-           BlockIOWeight=9
+           SocketBindAllow=ipv5
            """.trimIndent()
 
 
@@ -66,17 +67,17 @@ class InvalidValueInspectionForCGroupSocketBindOptionValue : AbstractUnitFileTes
     // Verification
     assertSize(1, highlights)
     val info = highlights[0]
-    assertStringContains("BlockIOWeight's value is correctly formatted but seems invalid", info!!.description)
-    TestCase.assertEquals("9", info.text)
+    assertStringContains("SocketBindAllow's value does not match the expected format.", info!!.description)
+    TestCase.assertEquals("ipv5", info.text)
   }
 
 
-  fun testWeakWarningWhenZeroIsSpecified() {
+  fun testWeakWarningWhenInvalidTransportSpecified() {
     // Fixture Setup
     // language="unit file (systemd)"
     val file = """
            [Service]
-           BlockIOWeight=0
+           SocketBindAllow=icmp
            """.trimIndent()
 
 
@@ -88,16 +89,17 @@ class InvalidValueInspectionForCGroupSocketBindOptionValue : AbstractUnitFileTes
     // Verification
     assertSize(1, highlights)
     val info = highlights[0]
-    assertStringContains("BlockIOWeight's value is correctly formatted but seems invalid", info!!.description)
-    TestCase.assertEquals("0", info.text)
+    assertStringContains("SocketBindAllow's value does not match the expected format.", info!!.description)
+    TestCase.assertEquals("icmp", info.text)
   }
 
-  fun testWeakWarningWhenNegativeTenIsSpecified() {
+
+  fun testWeakWarningWhenInvalidPortSpecified() {
     // Fixture Setup
     // language="unit file (systemd)"
     val file = """
            [Service]
-           BlockIOWeight=-10
+           SocketBindAllow=12458757
            """.trimIndent()
 
 
@@ -109,17 +111,16 @@ class InvalidValueInspectionForCGroupSocketBindOptionValue : AbstractUnitFileTes
     // Verification
     assertSize(1, highlights)
     val info = highlights[0]
-    assertStringContains("BlockIOWeight's value is correctly formatted but seems invalid", info!!.description)
-    TestCase.assertEquals("-10", info.text)
+    assertStringContains("SocketBindAllow's value is correctly formatted but seems invalid.", info!!.description)
+    TestCase.assertEquals("12458757", info.text)
   }
 
-
-  fun testWeakWarningWhenNegativeHundredThousandIsSpecified() {
+  fun testWeakWarningWhenDoubleColonSpecified() {
     // Fixture Setup
     // language="unit file (systemd)"
     val file = """
            [Service]
-           BlockIOWeight=-100000
+           SocketBindAllow=ipv6::tcp
            """.trimIndent()
 
 
@@ -131,17 +132,16 @@ class InvalidValueInspectionForCGroupSocketBindOptionValue : AbstractUnitFileTes
     // Verification
     assertSize(1, highlights)
     val info = highlights[0]
-    assertStringContains("BlockIOWeight's value is correctly formatted but seems invalid", info!!.description)
-    TestCase.assertEquals("-100000", info.text)
+    assertStringContains("SocketBindAllow's value does not match the expected format.", info!!.description)
+    TestCase.assertEquals("::tcp", info.text)
   }
 
-
-  fun testWeakWarningWhenOneThousandAndOneIsSpecified() {
+  fun testWeakWarningWhenInvalidPortRangeSpecified() {
     // Fixture Setup
     // language="unit file (systemd)"
     val file = """
            [Service]
-           BlockIOWeight=1001
+           SocketBindAllow=ipv6:tcp:12--21485
            """.trimIndent()
 
 
@@ -153,8 +153,7 @@ class InvalidValueInspectionForCGroupSocketBindOptionValue : AbstractUnitFileTes
     // Verification
     assertSize(1, highlights)
     val info = highlights[0]
-    assertStringContains("BlockIOWeight's value is correctly formatted but seems invalid", info!!.description)
-    TestCase.assertEquals("1001", info.text)
+    assertStringContains("SocketBindAllow's value is correctly formatted but seems invalid.", info!!.description)
+    TestCase.assertEquals("-", info.text)
   }
-
 }