Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@ private DefaultTypeProvider() {
"optional_type",
// TODO: Move to CelOptionalLibrary and register it on demand
OptionalType.create(SimpleType.DYN));
typeMapBuilder.put(
"net.IP",
// TODO: Move to CelNetworkExtensions and register it on demand
OpaqueType.create("net.IP"));
typeMapBuilder.put(
"net.CIDR",
// TODO: Move to CelNetworkExtensions and register it on demand
OpaqueType.create("net.CIDR"));
this.commonTypes = typeMapBuilder.buildOrThrow();
}
}
27 changes: 27 additions & 0 deletions extensions/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -197,3 +197,30 @@ cel_android_library(
name = "regex_runtime_library_android",
exports = ["//extensions/src/main/java/dev/cel/extensions:regex_runtime_library_android"],
)

java_library(
name = "network_types",
exports = ["//extensions/src/main/java/dev/cel/extensions:network_types"],
)

cel_android_library(
name = "network_types_android",
exports = ["//extensions/src/main/java/dev/cel/extensions:network_types_android"],
)

java_library(
name = "network_compiler_library",
visibility = ["//:internal"],
exports = ["//extensions/src/main/java/dev/cel/extensions:network_compiler_library"],
)

java_library(
name = "network_runtime_library",
visibility = ["//:internal"],
exports = ["//extensions/src/main/java/dev/cel/extensions:network_runtime_library"],
)

cel_android_library(
name = "network_runtime_library_android",
exports = ["//extensions/src/main/java/dev/cel/extensions:network_runtime_library_android"],
)
83 changes: 83 additions & 0 deletions extensions/src/main/java/dev/cel/extensions/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,89 @@ cel_android_library(
],
)

java_library(
name = "network_types",
srcs = [
"CelCidr.java",
"CelIp.java",
],
tags = [
],
deps = [
"//common/types",
"//common/values",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

cel_android_library(
name = "network_types_android",
srcs = [
"CelCidr.java",
"CelIp.java",
],
tags = [
],
deps = [
"//common/types:types_android",
"//common/values:values_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

java_library(
name = "network_compiler_library",
srcs = ["CelNetworkCompilerLibrary.java"],
tags = [
],
deps = [
":extension_library",
":network_types",
"//checker:checker_builder",
"//common:cel_function_decl",
"//common:cel_overload_decl",
"//common:cel_var_decl",
"//common/types",
"//compiler:compiler_builder",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
)

java_library(
name = "network_runtime_library",
srcs = ["CelNetworkRuntimeLibrary.java"],
tags = [
],
exports = [":network_types"],
deps = [
":network_types",
"//common/exceptions:bad_format",
"//runtime:function_binding",
"//runtime:lite_runtime",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
)

cel_android_library(
name = "network_runtime_library_android",
srcs = ["CelNetworkRuntimeLibrary.java"],
tags = [
],
exports = [":network_types_android"],
deps = [
":network_types_android",
"//common/exceptions:bad_format",
"//runtime:function_binding_android",
"//runtime:lite_runtime_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "comprehensions",
srcs = ["CelComprehensionsExtensions.java"],
Expand Down
171 changes: 171 additions & 0 deletions extensions/src/main/java/dev/cel/extensions/CelCidr.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
// Copyright 2026 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.extensions;

import com.google.errorprone.annotations.CheckReturnValue;
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.types.OpaqueType;
import dev.cel.common.values.OpaqueValue;
import java.util.Objects;
import org.jspecify.annotations.Nullable;

/** Immutable CEL opaque value representing an IPv4 or IPv6 CIDR prefix ({@code net.CIDR}). */
@Immutable
@CheckReturnValue
public final class CelCidr extends OpaqueValue {

/** CEL opaque type for {@code net.CIDR}. */
public static final OpaqueType CIDR_TYPE = OpaqueType.create("net.CIDR");

private final CelIp ip;
private final int prefixLength;

private CelCidr(CelIp ip, int prefixLength) {
this.ip = ip;
this.prefixLength = prefixLength;
}

/**
* Parses a CIDR string strictly according to Go {@code netip.ParsePrefix} semantics, preserving
* host bits and disallowing zone identifiers and IPv4-mapped IPv6 addresses.
*/
public static CelCidr parse(String raw) {
int slash = raw.lastIndexOf('/');
if (slash < 0) {
throw new IllegalArgumentException(
"CIDR '" + raw + "' parse error during conversion from string: no '/'");
}
String ipPart = raw.substring(0, slash);
String prefixPart = raw.substring(slash + 1);

CelIp.ParsedIp parsed = CelIp.parseWithOptionalZone(ipPart, "CIDR", raw);
if (parsed.zone != null) {
throw new IllegalArgumentException("CIDR '" + raw + "' with zone value is not allowed");
}
if (parsed.ip.is4In6()) {
throw new IllegalArgumentException("IPv4-mapped IPv6 address '" + raw + "' is not allowed");
}

int maxBits = parsed.ip.family() == 4L ? 32 : 128;
int prefixLen = parsePrefixLength(prefixPart, maxBits, raw);
return new CelCidr(parsed.ip, prefixLen);
}

private static int parsePrefixLength(String prefixPart, int maxBits, String rawForError) {
if (prefixPart.isEmpty()) {
throw new IllegalArgumentException(
"CIDR '" + rawForError + "' parse error during conversion from string: empty prefix");
}
if (prefixPart.length() > 1 && prefixPart.charAt(0) == '0') {
throw new IllegalArgumentException(
"CIDR '"
+ rawForError
+ "' parse error during conversion from string: prefix length has leading zero");
}
if (prefixPart.length() > 3) {
throw new IllegalArgumentException(
"CIDR '"
+ rawForError
+ "' parse error during conversion from string: prefix length out of range");
}
int value = 0;
for (int i = 0; i < prefixPart.length(); i++) {
char c = prefixPart.charAt(i);
if (c < '0' || c > '9') {
throw new IllegalArgumentException(
"CIDR '"
+ rawForError
+ "' parse error during conversion from string: invalid prefix length");
}
value = value * 10 + (c - '0');
}
if (value > maxBits) {
throw new IllegalArgumentException(
"CIDR '"
+ rawForError
+ "' parse error during conversion from string: prefix length out of range");
}
return value;
}

@Override
public CelCidr value() {
return this;
}

@Override
public OpaqueType celType() {
return CIDR_TYPE;
}

/** Returns the underlying {@link CelIp} address, preserving any unmasked host bits. */
public CelIp ip() {
return ip;
}

/** Returns the CIDR prefix length in bits. */
public long prefixLength() {
return prefixLength;
}

/** Returns a new {@link CelCidr} with host bits beyond {@link #prefixLength()} zeroed out. */
public CelCidr masked() {
return new CelCidr(ip.mask(prefixLength), prefixLength);
}

/** Returns true iff all host bits beyond {@link #prefixLength()} are zero. */
public boolean isMask() {
return ip.equals(ip.mask(prefixLength));
}

/** Returns true iff {@code other} belongs to the network masked by this CIDR. */
public boolean containsIp(CelIp other) {
return ip.matchesPrefix(other, prefixLength);
}

/** Returns true iff this CIDR contains all addresses in {@code child}. */
public boolean containsCidr(CelCidr child) {
return this.ip.family() == child.ip.family()
&& this.prefixLength <= child.prefixLength
&& this.containsIp(child.ip);
}

/** Returns the canonical string form {@code "<canonical-ip>/<prefixLength>"}. */
public String toCanonicalString() {
return ip.toCanonicalString() + "/" + prefixLength;
}

@Override
public String toString() {
return toCanonicalString();
}

@Override
public boolean equals(@Nullable Object obj) {
if (this == obj) {
return true;
}
if (!(obj instanceof CelCidr)) {
return false;
}
CelCidr other = (CelCidr) obj;
return this.prefixLength == other.prefixLength && this.ip.equals(other.ip);
}

@Override
public int hashCode() {
return Objects.hash(ip, prefixLength);
}
}
Loading
Loading