diff --git a/app/src/main/java/com/endroid/fern/monitor/MetricsParse.kt b/app/src/main/java/com/endroid/fern/monitor/MetricsParse.kt index 11b41c9..e3922fd 100644 --- a/app/src/main/java/com/endroid/fern/monitor/MetricsParse.kt +++ b/app/src/main/java/com/endroid/fern/monitor/MetricsParse.kt @@ -53,4 +53,19 @@ object MetricsParse { val busy = (dTotal - dIdle).coerceAtLeast(0L) return (busy.toDouble() / dTotal.toDouble() * 100.0).toFloat().coerceIn(0f, 100f) } + + /** A single package name segment: starts with a letter, then letters, digits or underscores. */ + private val packageSegment = Regex("[a-zA-Z][a-zA-Z0-9_]*") + + /** + * Check an Android package name: dot-separated segments, each starting + * with a letter and holding only letters, digits or underscores, at + * least one dot, and at most 255 characters in total. + */ + fun isValidPackageName(name: String?): Boolean { + if (name.isNullOrEmpty() || name.length > 255) return false + val segments = name.split(".") + if (segments.size < 2) return false + return segments.all { packageSegment.matches(it) } + } } diff --git a/app/src/test/java/com/endroid/fern/SystemMetricsParseTest.kt b/app/src/test/java/com/endroid/fern/SystemMetricsParseTest.kt index 8586d43..61d3900 100644 --- a/app/src/test/java/com/endroid/fern/SystemMetricsParseTest.kt +++ b/app/src/test/java/com/endroid/fern/SystemMetricsParseTest.kt @@ -3,6 +3,7 @@ package com.endroid.fern import com.endroid.fern.monitor.HistoryExport import com.endroid.fern.monitor.MetricsParse import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse import org.junit.Assert.assertNotNull import org.junit.Assert.assertNull import org.junit.Assert.assertTrue @@ -46,6 +47,71 @@ class SystemMetricsParseTest { assertNull(MetricsParse.parseLoadavg(null)) } + @Test + fun parseMeminfoMissingAvailable() { + val sample = """ + MemTotal: 8000000 kB + MemFree: 1000000 kB + """.trimIndent() + assertNull(MetricsParse.parseMeminfoKb(sample)) + } + + @Test + fun parseMeminfoZeroTotal() { + val sample = """ + MemTotal: 0 kB + MemAvailable: 3000000 kB + """.trimIndent() + assertNull(MetricsParse.parseMeminfoKb(sample)) + } + + @Test + fun parseMeminfoExtraWhitespace() { + val sample = "MemTotal: \t 8000000 kB\nMemAvailable:\t3000000 kB" + val (totalKb, availKb) = MetricsParse.parseMeminfoKb(sample)!! + assertEquals(8000000L, totalKb) + assertEquals(3000000L, availKb) + } + + @Test + fun parseLoadavgFewerThanThreeFields() { + assertNull(MetricsParse.parseLoadavg("0.1")) + assertNull(MetricsParse.parseLoadavg("0.1 0.2")) + } + + @Test + fun parseLoadavgNonNumericFields() { + assertNull(MetricsParse.parseLoadavg("abc 0.2 0.3")) + assertNull(MetricsParse.parseLoadavg("0.1 xx 0.3")) + assertNull(MetricsParse.parseLoadavg("0.1 0.2 0.3x")) + } + + @Test + fun parseLoadavgBlankInput() { + assertNull(MetricsParse.parseLoadavg("")) + assertNull(MetricsParse.parseLoadavg(" ")) + } + + @Test + fun isValidPackageNameAccepts() { + assertTrue(MetricsParse.isValidPackageName("com.example.app")) + assertTrue(MetricsParse.isValidPackageName("com.endroid.fern.beta")) + assertTrue(MetricsParse.isValidPackageName("com.example.app_2")) + } + + @Test + fun isValidPackageNameRejects() { + assertFalse(MetricsParse.isValidPackageName("foo")) + assertFalse(MetricsParse.isValidPackageName("a b")) + assertFalse(MetricsParse.isValidPackageName("a;b.c")) + assertFalse(MetricsParse.isValidPackageName("x.y\$(id)")) + assertFalse(MetricsParse.isValidPackageName("")) + assertFalse(MetricsParse.isValidPackageName(null)) + assertFalse(MetricsParse.isValidPackageName("com.example." + "a".repeat(244))) + assertFalse(MetricsParse.isValidPackageName("1com.example")) + assertFalse(MetricsParse.isValidPackageName("com..example")) + } + @Test fun parseStatCpuDelta() { val a = MetricsParse.parseProcStatLine("cpu 100 10 50 1000 0 0 0")!!