From 65e221a4f6039b48e7ef17738ed12d2247855040 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 28 Nov 2021 23:27:09 -0800 Subject: [PATCH] Improved IP address regex. --- src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt | 5 ++--- .../kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt | 5 ++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt index 703f138..83caf6e 100644 --- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt +++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt @@ -54,9 +54,8 @@ class Lookup : AbstractModule() { event.respondWith(nslookup(args).prependIndent()) } catch (ignore: UnknownHostException) { if (args.matches( - ("(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." + - "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." + - "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)").toRegex() + ("(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)") + .toRegex() ) ) { try { diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt index b3e3dff..b0fdfcd 100644 --- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt +++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt @@ -45,8 +45,11 @@ class LookupTest { @Test @Throws(Exception::class) fun testLookup() { - val result = nslookup("apple.com") + var result = nslookup("apple.com") assertThat(result, "lookup(apple.com)").contains("17.253.144.10") + + result = nslookup("204.122.17.9") + assertThat(result, "lookup(204.122.17.9)").contains("nix3.thauvin.us") } @Test