Skip to content

cel: patch thread safety issue #13739

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
mattklein123 merged 3 commits into from
Oct 28, 2020
Merged

cel: patch thread safety issue #13739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f4bad0
cel: patch thread safety issue
kyessenov Oct 23, 2020
08f80d0
Merge remote-tracking branch 'upstream/master' into patch_cel_cpp
kyessenov Oct 26, 2020
b168d80
explanation
kyessenov Oct 27, 2020
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
33 changes: 33 additions & 0 deletions bazel/cel-cpp.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
diff --git a/eval/eval/field_backed_map_impl.cc b/eval/eval/field_backed_map_impl.cc
index cd56f51..4d2a546 100644
--- a/eval/eval/field_backed_map_impl.cc
+++ b/eval/eval/field_backed_map_impl.cc
@@ -117,7 +117,9 @@ int FieldBackedMapImpl::size() const {
const CelList* FieldBackedMapImpl::ListKeys() const { return key_list_.get(); }

absl::optional<CelValue> FieldBackedMapImpl::operator[](CelValue key) const {
-#ifdef GOOGLE_PROTOBUF_HAS_CEL_MAP_REFLECTION_FRIEND
+#ifdef XXX_GOOGLE_PROTOBUF_HAS_CEL_MAP_REFLECTION_FRIEND
+ static_assert(false);
+
// Fast implementation.
google::protobuf::MapKey inner_key;
switch (key.type()) {
@@ -171,7 +173,7 @@ absl::optional<CelValue> FieldBackedMapImpl::operator[](CelValue key) const {
return CreateErrorValue(arena_, status.message());
}
return result;
-#else // GOOGLE_PROTOBUF_HAS_CEL_MAP_REFLECTION_FRIEND
+#else // XXX_GOOGLE_PROTOBUF_HAS_CEL_MAP_REFLECTION_FRIEND
// Slow implementation.
CelValue result = CelValue::CreateNull();
CelValue inner_key = CelValue::CreateNull();
@@ -228,7 +230,7 @@ absl::optional<CelValue> FieldBackedMapImpl::operator[](CelValue key) const {
}

return {};
-#endif // GOOGLE_PROTOBUF_HAS_CEL_MAP_REFLECTION_FRIEND
+#endif // XXX_GOOGLE_PROTOBUF_HAS_CEL_MAP_REFLECTION_FRIEND
}

} // namespace runtime
10 changes: 9 additions & 1 deletion bazel/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,15 @@ def _com_github_zlib_ng_zlib_ng():
)

def _com_google_cel_cpp():
external_http_archive("com_google_cel_cpp")
external_http_archive(
"com_google_cel_cpp",
patch_args = ["-p1"],
# Patches to remove "fast" protobuf-internal access
# The patch can be removed when the "fast" access is safe to be enabled back.
# This requires public visibility of Reflection::LookupMapValue in protobuf and
# any release of cel-cpp after 10/27/2020.
patches = ["@envoy//bazel:cel-cpp.patch"],
)
external_http_archive("rules_antlr")

# Parser dependencies
Expand Down