itsscb/askama
1
0
Fork 0
mirror of https://github.com/askama-rs/askama.git synced 2025-09-28 05:21:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deny self etc. as path element

Browse Source
This commit is contained in:
René Kijewski 2025-05-20 21:20:55 +02:00
parent 1b2c54620e
commit f92ed0a074
3 changed files with 126 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
askama_parser/src/target.rs
View File

@ -4,8 +4,8 @@ use winnow::{ModalParser, Parser};
use crate::{
CharLit, ErrorContext, Num, ParseErr, ParseResult, PathOrIdentifier, State, StrLit, WithSpan,
bool_lit, char_lit, identifier, is_rust_keyword, keyword, num_lit, path_or_identifier, str_lit,
ws,
bool_lit, can_be_variable_name, char_lit, identifier, is_rust_keyword, keyword, num_lit,
path_or_identifier, str_lit, ws,
};
#[derive(Clone, Debug, PartialEq)]
@ -108,15 +108,24 @@ impl<'a> Target<'a> {
return Ok(Self::Struct(path, targets));
}
// If the path only contains one item, we need to check the name.
if let [name] = path.as_slice() {
if !crate::can_be_variable_name(name) {
// If the path only contains one item, we need to check the name.
if !can_be_variable_name(name) {
return Err(winnow::error::ErrMode::Cut(ErrorContext::new(
format!("`{name}` cannot be used as an identifier"),
*name,
)));
}
} else {
// Otherwise we need to check every element but the first.
if let Some(name) = path.iter().skip(1).find(|n| !can_be_variable_name(n)) {
return Err(winnow::error::ErrMode::Cut(ErrorContext::new(
format!("`{name}` cannot be used as an identifier"),
*name,
)));
}
}
*i = i_before_matching_with;
return Ok(Self::Path(path));
}
@ -213,7 +222,7 @@ fn verify_name<'a>(
format!("cannot use `{name}` as a name: it is a rust keyword"),
input,
)))
} else if !crate::can_be_variable_name(name) {
} else if !can_be_variable_name(name) {
Err(winnow::error::ErrMode::Cut(ErrorContext::new(
format!("`{name}` cannot be used as an identifier"),
input,

48
testing/tests/ui/crate_identifier.rs
View File

@ -100,4 +100,52 @@ struct SmallSelf3 {
)]
struct Regression {}
#[derive(Template)]
#[template(ext = "html", source = "{% match a %}{% when a::b::super %}{% endmatch %}")]
struct PathElemSuper {
a: u8,
}
#[derive(Template)]
#[template(ext = "html", source = "{% match a %}{% when self::a::b::super %}{% endmatch %}")]
struct PathElemSuper2 {
a: u8,
}
#[derive(Template)]
#[template(ext = "html", source = "{% match a %}{% when a::b::self %}{% endmatch %}")]
struct PathElemSelf {
a: u8,
}
#[derive(Template)]
#[template(ext = "html", source = "{% match a %}{% when self::a::b::self %}{% endmatch %}")]
struct PathElemSelf2 {
a: u8,
}
#[derive(Template)]
#[template(ext = "html", source = "{% match a %}{% when a::b::crate %}{% endmatch %}")]
struct PathElemCrate {
a: u8,
}
#[derive(Template)]
#[template(ext = "html", source = "{% match a %}{% when self::a::b::crate %}{% endmatch %}")]
struct PathElemCrate2 {
a: u8,
}
#[derive(Template)]
#[template(ext = "html", source = "{% match a %}{% when a::b::Self %}{% endmatch %}")]
struct PathElemSelfType {
a: u8,
}
#[derive(Template)]
#[template(ext = "html", source = "{% match a %}{% when self::a::b::Self %}{% endmatch %}")]
struct PathElemSelfType2 {
a: u8,
}
fn main() {}

64
testing/tests/ui/crate_identifier.stderr
View File

@ -173,3 +173,67 @@ error: `crate` cannot be used as an identifier
|
99 | source = "{{\u{c}KK3e331<c7}}61/63m3333u7<c0.}}\u{6}\0\u{c}\u{c}{{c/crate<338<c7}}6unsafe/63a3ae\u{c}\u{c}\u{c}%et"
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: `super` cannot be used as an identifier
--> <source attribute>:1:27
"super %}{% endmatch %}"
--> tests/ui/crate_identifier.rs:104:35
|
104 | #[template(ext = "html", source = "{% match a %}{% when a::b::super %}{% endmatch %}")]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: `super` cannot be used as an identifier
--> <source attribute>:1:33
"super %}{% endmatch %}"
--> tests/ui/crate_identifier.rs:110:35
|
110 | #[template(ext = "html", source = "{% match a %}{% when self::a::b::super %}{% endmatch %}")]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: `self` cannot be used as an identifier
--> <source attribute>:1:27
"self %}{% endmatch %}"
--> tests/ui/crate_identifier.rs:116:35
|
116 | #[template(ext = "html", source = "{% match a %}{% when a::b::self %}{% endmatch %}")]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: `self` cannot be used as an identifier
--> <source attribute>:1:33
"self %}{% endmatch %}"
--> tests/ui/crate_identifier.rs:122:35
|
122 | #[template(ext = "html", source = "{% match a %}{% when self::a::b::self %}{% endmatch %}")]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: `crate` cannot be used as an identifier
--> <source attribute>:1:27
"crate %}{% endmatch %}"
--> tests/ui/crate_identifier.rs:128:35
|
128 | #[template(ext = "html", source = "{% match a %}{% when a::b::crate %}{% endmatch %}")]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: `crate` cannot be used as an identifier
--> <source attribute>:1:33
"crate %}{% endmatch %}"
--> tests/ui/crate_identifier.rs:134:35
|
134 | #[template(ext = "html", source = "{% match a %}{% when self::a::b::crate %}{% endmatch %}")]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: `Self` cannot be used as an identifier
--> <source attribute>:1:27
"Self %}{% endmatch %}"
--> tests/ui/crate_identifier.rs:140:35
|
140 | #[template(ext = "html", source = "{% match a %}{% when a::b::Self %}{% endmatch %}")]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: `Self` cannot be used as an identifier
--> <source attribute>:1:33
"Self %}{% endmatch %}"
--> tests/ui/crate_identifier.rs:146:35
|
146 | #[template(ext = "html", source = "{% match a %}{% when self::a::b::Self %}{% endmatch %}")]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^