Skip to content

Use from_normalized_str when parsing extension names in EST #1789

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 1 commit into from
Aug 15, 2025
Merged

Use from_normalized_str when parsing extension names in EST #1789

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
22 changes: 12 additions & 10 deletions cedar-policy-core/src/est/expr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use super::FromJsonError;
use crate::ast::expr_allows_errors::AstExprErrorKind;
#[cfg(feature = "tolerant-ast")]
use crate::ast::Infallible;
use crate::ast::{self, BoundedDisplay, EntityUID};
use crate::ast::{self, BoundedDisplay, EntityUID, Name};
use crate::entities::json::{
err::EscapeKind, err::JsonDeserializationError, err::JsonDeserializationErrorContext,
CedarValueJson, FnAndArgs,
Expand All @@ -31,6 +31,7 @@ use crate::parser::cst_to_ast;
use crate::parser::err::ParseErrors;
use crate::parser::Node;
use crate::parser::{cst, Loc};
use crate::FromNormalizedStr;
use itertools::Itertools;
use serde::{de::Visitor, Deserialize, Serialize};
use serde_with::serde_as;
Expand Down Expand Up @@ -1034,22 +1035,23 @@ impl Expr {
.into_iter()
.next()
.expect("already checked that len was 1");
let fn_name: ast::Name = fn_name.parse().map_err(|errs| {
let fn_name = Name::from_normalized_str(&fn_name).map_err(|errs| {
JsonDeserializationError::parse_escape(
EscapeKind::Extension,
fn_name,
errs,
)
})?;
if !cst_to_ast::is_known_extension_func_name(&fn_name) {
return Err(FromJsonError::UnknownExtensionFunction(fn_name));
if cst_to_ast::is_known_extension_func_name(&fn_name) {
Ok(ast::Expr::call_extension_fn(
fn_name,
args.into_iter()
.map(|arg| arg.try_into_ast(id))
.collect::<Result<_, _>>()?,
))
} else {
Err(FromJsonError::UnknownExtensionFunction(fn_name))
}
Ok(ast::Expr::call_extension_fn(
fn_name,
args.into_iter()
.map(|arg| arg.try_into_ast(id))
.collect::<Result<_, _>>()?,
))
}
_ => Err(FromJsonError::MultipleOperators {
ops: call.into_keys().collect(),
Expand Down
Loading