diff --git a/evaluation-core/src/commonMain/kotlin/SemanticVersion.kt b/evaluation-core/src/commonMain/kotlin/SemanticVersion.kt index c2b083d..25f2801 100644 --- a/evaluation-core/src/commonMain/kotlin/SemanticVersion.kt +++ b/evaluation-core/src/commonMain/kotlin/SemanticVersion.kt @@ -1,19 +1,14 @@ package com.amplitude.experiment.evaluation -// major and minor should be non-negative numbers separated by a dot -private const val MAJOR_MINOR_REGEX = "(\\d+)\\.(\\d+)" - -// patch should be a non-negative number -private const val PATCH_REGEX = "(\\d+)" - -// prerelease is optional. If provided, it should be a hyphen followed by a -// series of dot separated identifiers where an identifer can contain anything in [-0-9a-zA-Z] -private const val PRERELEASE_REGEX = "(-(([-\\w]+\\.?)*))?" - -// version pattern should be major.minor(.patchAndPreRelease) where .patchAndPreRelease is optional -private const val VERSION_PATTERN = "$MAJOR_MINOR_REGEX(\\.$PATCH_REGEX$PRERELEASE_REGEX)?$" - -private val regex = Regex(VERSION_PATTERN) +/** + * Copied from: https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string + * + * Modified to: + * - Support versions starting with 0 (e.g. 01.01.01) + * - Support versions with only major and minor versions (e.g. 1.1) + */ +private const val VERSION_PATTERN = "^(0|[0-9]\\d*)\\.(0|[0-9]\\d*)(\\.(0|[0-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)?$" +private val pattern = Regex(VERSION_PATTERN) /** * Implementation of Semantic version specification as per the spec in @@ -39,7 +34,7 @@ internal data class SemanticVersion( if (version == null) { return null } - val matchGroup = regex.matchEntire(version)?.groupValues ?: return null + val matchGroup = pattern.matchEntire(version)?.groupValues ?: return null val major = matchGroup[1].toIntOrNull() ?: return null val minor = matchGroup[2].toIntOrNull() ?: return null val patch = matchGroup[4].toIntOrNull() ?: 0 diff --git a/evaluation-core/src/commonTest/kotlin/SemanticVersionTest.kt b/evaluation-core/src/commonTest/kotlin/SemanticVersionTest.kt index 4cd0b22..8d19707 100644 --- a/evaluation-core/src/commonTest/kotlin/SemanticVersionTest.kt +++ b/evaluation-core/src/commonTest/kotlin/SemanticVersionTest.kt @@ -1,5 +1,8 @@ package com.amplitude.experiment.evaluation +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch +import kotlinx.coroutines.runBlocking import kotlin.test.Test import kotlin.test.assertTrue import kotlin.test.fail @@ -106,6 +109,19 @@ class SemanticVersionTest { assertVersionComparison("20.5.6-b1.2.x", EvaluationOperator.VERSION_GREATER_THAN, "20.5.5") } + @Test + fun testCatastrophicBacktracing(): Unit = runBlocking { + val timeout = launch { + delay(1000) + throw RuntimeException("Semantic version parse took longer than 1 second") + } + launch { + SemanticVersion.parse("123.456.789-a-b-c-d-e-f-f-f-f-f-f-f-f-f-f-f-g-h-h-h-h-h-h-i-i-i-i]") + timeout.cancel() + } + timeout.join() + } + private fun assertInvalidVersion(ver: String?) { SemanticVersion.parse(ver) ?: return // expect null fail("Should have failed creating a semantic version for $ver")