Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Return None for Over-Segmented IPv6 Addresses #590

Merged
merged 1 commit into from
Jun 6, 2024
Merged

Fix: Return None for Over-Segmented IPv6 Addresses #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 27 additions & 18 deletions shared/src/main/scala/com/comcast/ip4s/Host.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,6 +773,7 @@ object Ipv6Address extends Ipv6AddressCompanionPlatform {
}
idx += 1
}

if (result ne null) {
result
} else if (fields.isEmpty && (trimmed.isEmpty || trimmed != "::")) {
Expand All @@ -781,26 +782,34 @@ object Ipv6Address extends Ipv6AddressCompanionPlatform {
val bytes = new Array[Byte](16)
idx = 0
val prefixSize = prefix.size
var prefixIdx = prefixSize - 1
while (prefixIdx >= 0) {
val value = prefix(prefixIdx)
bytes(idx) = (value >> 8).toByte
bytes(idx + 1) = value.toByte
prefixIdx -= 1
idx += 2
}
val suffixSize = suffix.size
val numCondensedZeroes = bytes.size - idx - (suffixSize * 2)
idx += numCondensedZeroes
var suffixIdx = suffixSize - 1
while (suffixIdx >= 0) {
val value = suffix(suffixIdx)
bytes(idx) = (value >> 8).toByte
bytes(idx + 1) = value.toByte
suffixIdx -= 1
idx += 2
val numCondensedZeroes = 8 - (prefixSize + suffixSize)

if (numCondensedZeroes < 0) {
None
} else {
var prefixIdx = prefixSize - 1
while (prefixIdx >= 0) {
val value = prefix(prefixIdx)
bytes(idx) = (value >> 8).toByte
bytes(idx + 1) = value.toByte
prefixIdx -= 1
idx += 2
}

idx += numCondensedZeroes * 2

var suffixIdx = suffixSize - 1
while (suffixIdx >= 0) {
val value = suffix(suffixIdx)
bytes(idx) = (value >> 8).toByte
bytes(idx + 1) = value.toByte
suffixIdx -= 1
idx += 2
}

Some(unsafeFromBytes(bytes))
}
Some(unsafeFromBytes(bytes))
}
}

Expand Down
6 changes: 6 additions & 0 deletions test-kit/shared/src/test/scala/com/comcast/ip4s/Ipv6AddressTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ class Ipv6AddressTest extends BaseTestSuite {
assertEquals(Ipv6Address.fromString(" : "), None)
}

test("parsing from string - does not parse invalid number of sections in ipv6") {
assertEquals(Ipv6Address.fromString("::1:1:1:1:1:1:2:1:3"), None)
assertEquals(Ipv6Address.fromString("1:1:1:1:1:1:2:1:3"), None)
}

test("parsing from string - does parse ::") {
assertEquals(Ipv6Address.fromString("::").isDefined, true)
assertEquals(Ipv6Address.fromString(" :: ").isDefined, true)
Expand Down Expand Up @@ -150,4 +155,5 @@ class Ipv6AddressTest extends BaseTestSuite {
assert(ipv6"fe80::1".isLinkLocal)
assert(ipv6"::ffff:169.254.0.0".isLinkLocal)
}

}