Skip to content

Enhance IP validation #256

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

Merged
merged 17 commits into from
Apr 3, 2025
Merged

Enhance IP validation #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
52f012b
Merge
Apr 1, 2025
2f06269
Fix
Apr 1, 2025
756f4a0
Remove test logging
Apr 1, 2025
9cc805f
Cleanup
Apr 1, 2025
ce80f4c
Revert
Apr 1, 2025
69b15dc
Revert back to JDK 8
Apr 1, 2025
9666630
Remove ip address
Apr 1, 2025
edae74f
Remove ip address
Apr 1, 2025
7c1deef
Feedback
Apr 2, 2025
847a663
URI
Apr 2, 2025
2cda9db
Fix
Apr 2, 2025
bd1628c
Fix
Apr 2, 2025
80d4168
Feedback
Apr 2, 2025
0f7a79a
Updates
Apr 2, 2025
f050ad7
Update
Apr 2, 2025
01971b0
Cleanup
Apr 2, 2025
8ecbe58
Remove unsigned shift to 0
Apr 2, 2025
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
1 change: 0 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,6 @@ dependencies {
implementation(enforcedPlatform(libs.cel))
implementation(libs.cel.core)
implementation(libs.guava)
Copy link
Contributor Author

@smaye81 smaye81 Apr 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We actually can't remove Guava. It's used in a bunch of places after looking more in-depth.

implementation(libs.ipaddress)

buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

Expand Down
88 changes: 0 additions & 88 deletions conformance/expected-failures.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,94 +107,6 @@ custom_constraints:
#ERROR: <input>:1:1: expression of type 'int' cannot be range of a comprehension (must be list, map, or dynamic)
# | this.all(e, e == 1)
# | ^
library/is_host_and_port:
- port_required/false/invalid/ipv6_zone-id_too_short
# input: [type.googleapis.com/buf.validate.conformance.cases.IsHostAndPort]:{val:"[::1%]"}
# want: validation error (1 violation)
# 1. constraint_id: "library.is_host_and_port"
# got: valid
- port_required/false/invalid/port_number_sign
# input: [type.googleapis.com/buf.validate.conformance.cases.IsHostAndPort]:{val:"example.com:+0"}
# want: validation error (1 violation)
# 1. constraint_id: "library.is_host_and_port"
# got: valid
- port_required/false/valid/ipv6_embedded_ipv4
# input: [type.googleapis.com/buf.validate.conformance.cases.IsHostAndPort]:{val:"[0:0:0:0:0:ffff:192.1.56.10]"}
# want: valid
# got: validation error (1 violation)
# 1. constraint_id: "library.is_host_and_port"
# message: ""
- port_required/false/valid/ipv6_with_zone-id
# input: [type.googleapis.com/buf.validate.conformance.cases.IsHostAndPort]:{val:"[::1%foo]"}
# want: valid
# got: validation error (1 violation)
# 1. constraint_id: "library.is_host_and_port"
# message: ""
- port_required/false/valid/ipv6_zone-id_any_non_null_character
# input: [type.googleapis.com/buf.validate.conformance.cases.IsHostAndPort]:{val:"[::1%% :x\x1f]"}
# want: valid
# got: validation error (1 violation)
# 1. constraint_id: "library.is_host_and_port"
# message: ""
- port_required/true/invalid/port_number_sign
# input: [type.googleapis.com/buf.validate.conformance.cases.IsHostAndPort]:{val:"example.com:+0" port_required:true}
# want: validation error (1 violation)
# 1. constraint_id: "library.is_host_and_port"
# got: valid
library/is_ip:
- version/omitted/invalid/ipv6_zone-id
# input: [type.googleapis.com/buf.validate.conformance.cases.IsIp]:{val:"::1%"}
# want: validation error (1 violation)
# 1. constraint_id: "library.is_ip"
# got: valid
- version/omitted/valid/ipv6_zone-id
# input: [type.googleapis.com/buf.validate.conformance.cases.IsIp]:{val:"::1%foo"}
# want: valid
# got: validation error (1 violation)
# 1. constraint_id: "library.is_ip"
# message: ""
- version/omitted/valid/ipv6_zone-id_any_non_null_character
# input: [type.googleapis.com/buf.validate.conformance.cases.IsIp]:{val:"::1%% :x\x1f"}
# want: valid
# got: validation error (1 violation)
# 1. constraint_id: "library.is_ip"
# message: ""
library/is_ip_prefix:
- version/omitted/strict/omitted/invalid/ipv4_bad_leading_zero_in_prefix-length
# input: [type.googleapis.com/buf.validate.conformance.cases.IsIpPrefix]:{val:"192.168.1.0/024"}
# want: validation error (1 violation)
# 1. constraint_id: "library.is_ip_prefix"
# got: valid
- version/omitted/strict/omitted/invalid/ipv4_prefix_leading_space
# input: [type.googleapis.com/buf.validate.conformance.cases.IsIpPrefix]:{val:" 127.0.0.1/16"}
# want: validation error (1 violation)
# 1. constraint_id: "library.is_ip_prefix"
# got: valid
- version/omitted/strict/omitted/invalid/ipv4_prefix_trailing_space
# input: [type.googleapis.com/buf.validate.conformance.cases.IsIpPrefix]:{val:"127.0.0.1/16 "}
# want: validation error (1 violation)
# 1. constraint_id: "library.is_ip_prefix"
# got: valid
- version/omitted/strict/omitted/invalid/ipv6_bad_leading_zero_in_prefix-length
# input: [type.googleapis.com/buf.validate.conformance.cases.IsIpPrefix]:{val:"2001:0DB8:ABCD:0012:FFFF:FFFF:FFFF:FFFF/024"}
# want: validation error (1 violation)
# 1. constraint_id: "library.is_ip_prefix"
# got: valid
- version/omitted/strict/omitted/invalid/ipv6_prefix_leading_space
# input: [type.googleapis.com/buf.validate.conformance.cases.IsIpPrefix]:{val:" ::1/64"}
# want: validation error (1 violation)
# 1. constraint_id: "library.is_ip_prefix"
# got: valid
- version/omitted/strict/omitted/invalid/ipv6_prefix_trailing_space
# input: [type.googleapis.com/buf.validate.conformance.cases.IsIpPrefix]:{val:"::1/64 "}
# want: validation error (1 violation)
# 1. constraint_id: "library.is_ip_prefix"
# got: valid
- version/omitted/strict/omitted/invalid/ipv6_zone-id/a
# input: [type.googleapis.com/buf.validate.conformance.cases.IsIpPrefix]:{val:"::1%en1/64"}
# want: validation error (1 violation)
# 1. constraint_id: "library.is_ip_prefix"
# got: valid
library/is_uri:
- invalid/host/c
# input: [type.googleapis.com/buf.validate.conformance.cases.IsUri]:{val:"https://foo@你好.com"}
Expand Down
2 changes: 0 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
assertj = "3.27.3"
buf = "1.50.1"
cel = "0.5.1"
ipaddress = "5.5.1"
junit = "5.12.1"
maven-publish = "0.31.0"
# When updating, make sure to update versions in the following files to match and regenerate code with 'make generate'.
Expand All @@ -19,7 +18,6 @@ cel = { module = "org.projectnessie.cel:cel-bom", version.ref = "cel" }
cel-core = { module = "org.projectnessie.cel:cel-core" }
errorprone = { module = "com.google.errorprone:error_prone_core", version = "2.37.0" }
guava = { module = "com.google.guava:guava", version = "33.4.0-jre" }
ipaddress = { module = "com.github.seancfoley:ipaddress", version.ref = "ipaddress" }
junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
maven-plugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "maven-publish" }
nullaway = { module = "com.uber.nullaway:nullaway", version = "0.12.4" }
Expand Down
Loading