Skip to content

Commit 70db44a

Browse files
maskri17copybara-github
authored andcommitted
Add the CelIp opaque value representation (net.IP) to support the CEL network extension library (cel.lib.ext.network) in Java with parity against cel-go and cel-spec.
`CelIp` extends `OpaqueValue` directly using immutable primitive fields for Java 8, ErrorProne `@Immutable` and `@CheckReturnValue`, and Android (`CelLiteRuntime`) compatibility without external networking dependencies. Parsing enforces strict `netip` and RFC 4291 rules (rejecting leading zeros in IPv4 octets, zone identifiers, and IPv4-mapped IPv6 addresses) and formats canonical strings per RFC 5952. Also register `net.IP` in `DefaultTypeProvider` so type identifiers resolve during evaluation. PiperOrigin-RevId: 1024996980
1 parent 85d6295 commit 70db44a

6 files changed

Lines changed: 638 additions & 0 deletions

File tree

‎common/src/main/java/dev/cel/common/types/DefaultTypeProvider.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ private DefaultTypeProvider() {
5050
"optional_type",
5151
// TODO: Move to CelOptionalLibrary and register it on demand
5252
OptionalType.create(SimpleType.DYN));
53+
typeMapBuilder.put(
54+
"net.IP",
55+
// TODO: Move to CelNetworkExtensions and register it on demand
56+
OpaqueType.create("net.IP"));
5357
this.commonTypes = typeMapBuilder.buildOrThrow();
5458
}
5559
}

‎extensions/BUILD.bazel‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,3 +197,13 @@ cel_android_library(
197197
name = "regex_runtime_library_android",
198198
exports = ["//extensions/src/main/java/dev/cel/extensions:regex_runtime_library_android"],
199199
)
200+
201+
java_library(
202+
name = "network_types",
203+
exports = ["//extensions/src/main/java/dev/cel/extensions:network_types"],
204+
)
205+
206+
cel_android_library(
207+
name = "network_types_android",
208+
exports = ["//extensions/src/main/java/dev/cel/extensions:network_types_android"],
209+
)

‎extensions/src/main/java/dev/cel/extensions/BUILD.bazel‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,32 @@ cel_android_library(
599599
],
600600
)
601601

602+
java_library(
603+
name = "network_types",
604+
srcs = ["CelIp.java"],
605+
tags = [
606+
],
607+
deps = [
608+
"//common/types",
609+
"//common/values",
610+
"@maven//:com_google_errorprone_error_prone_annotations",
611+
"@maven//:org_jspecify_jspecify",
612+
],
613+
)
614+
615+
cel_android_library(
616+
name = "network_types_android",
617+
srcs = ["CelIp.java"],
618+
tags = [
619+
],
620+
deps = [
621+
"//common/types:types_android",
622+
"//common/values:values_android",
623+
"@maven//:com_google_errorprone_error_prone_annotations",
624+
"@maven//:org_jspecify_jspecify",
625+
],
626+
)
627+
602628
java_library(
603629
name = "comprehensions",
604630
srcs = ["CelComprehensionsExtensions.java"],

0 commit comments

Comments
 (0)