Merge pull request #21 from OSGP/feature/FDP-1961

FDP-1961: Add semicolon before set
OSGP · Apr 3, 2024 · a68792f · a68792f
2 parents d8741c3 + 4a00e13
commit a68792f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/application/src/main/kotlin/org/gxf/crestdevicesimulator/simulator/response/PskExtractor.kt b/application/src/main/kotlin/org/gxf/crestdevicesimulator/simulator/response/PskExtractor.kt
@@ -15,7 +15,7 @@ object PskExtractor {
      * Group 2 containing the next 64 chars after the key this is only the hash
      */
     private val pskKeyHashSplitterRegex =
-        "!PSK:([a-zA-Z0-9]{16}):([a-zA-Z0-9]{64});PSK:[a-zA-Z0-9]{16}:[a-zA-Z0-9]{64}SET".toRegex()
+        "!PSK:([a-zA-Z0-9]{16}):([a-zA-Z0-9]{64});PSK:[a-zA-Z0-9]{16}:[a-zA-Z0-9]{64}:SET".toRegex()
 
     fun hasPskSetCommand(command: String) = pskKeyHashSplitterRegex.matches(command)
 

diff --git a/...ation/src/test/kotlin/org/gxf/crestdevicesimulator/simulator/response/PskExtractorTest.kt b/...ation/src/test/kotlin/org/gxf/crestdevicesimulator/simulator/response/PskExtractorTest.kt
@@ -13,9 +13,9 @@ class PskExtractorTest {
     companion object {
         private const val testHash = "1234567890123456123456789012345612345678901234561234567890123456"
 
-        private const val validPskCommand = "!PSK:1234567891234567:${testHash};PSK:1234567891234567:${testHash}SET"
-        private const val validPskCommandWithKeyWordsInKey = "!PSK:PSKaSET1PSKd2SET:${testHash};PSK:PSKaSET1PSKd2SET:${testHash}SET"
-        private const val invalidKeySizePskCommand = "!PSK:1234:${testHash};PSK:1234:${testHash}SET"
+        private const val validPskCommand = "!PSK:1234567891234567:${testHash};PSK:1234567891234567:${testHash}:SET"
+        private const val validPskCommandWithKeyWordsInKey = "!PSK:PSKaSET1PSKd2SET:${testHash};PSK:PSKaSET1PSKd2SET:${testHash}:SET"
+        private const val invalidKeySizePskCommand = "!PSK:1234:${testHash};PSK:1234:${testHash}:SET"
         private const val notPskCommand = "NoPskCommandInThisString"
     }
 

diff --git a/...src/test/kotlin/org/gxf/crestdevicesimulator/simulator/response/command/PskServiceTest.kt b/...src/test/kotlin/org/gxf/crestdevicesimulator/simulator/response/command/PskServiceTest.kt
@@ -72,7 +72,7 @@ class PskServiceTest {
     @Test
     fun shouldSetNewPskInStoreWhenTheKeyIsValid() {
         val expectedHash = DigestUtils.sha256Hex("$secret$newKey")
-        val pskCommand = "!PSK:$newKey:${expectedHash};PSK:$newKey:${expectedHash}SET"
+        val pskCommand = "!PSK:$newKey:${expectedHash};PSK:$newKey:${expectedHash}:SET"
         val psk = PreSharedKey(
             identity,
             newRevision,
@@ -90,7 +90,7 @@ class PskServiceTest {
     @Test
     fun shouldThrowErrorPskCommandIsInvalid() {
         val invalidHash = DigestUtils.sha256Hex("invalid")
-        val pskCommand = "!PSK:$oldKey;PSK:$oldKey:${invalidHash}SET"
+        val pskCommand = "!PSK:$oldKey;PSK:$oldKey:${invalidHash}:SET"
 
         val thrownException = catchException {
             pskService.preparePendingKey(pskCommand)
@@ -104,7 +104,7 @@ class PskServiceTest {
     @Test
     fun shouldThrowErrorWhenHashDoesNotMatch() {
         val invalidHash = DigestUtils.sha256Hex("invalid")
-        val pskCommand = "!PSK:$oldKey:$invalidHash;PSK:$oldKey:${invalidHash}SET"
+        val pskCommand = "!PSK:$oldKey:$invalidHash;PSK:$oldKey:${invalidHash}:SET"
 
         val thrownException = catchException {
             pskService.preparePendingKey(pskCommand)