noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disallow zero-length SQL Ident values

Browse source 
Closes #1583
This commit is contained in:
Tobie Morgan Hitchcock 2023-01-08 09:05:31 +00:00
parent 9c5178ef0a
commit 369a100c92
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lib/src/sql/ident.rs
View file

@ -2,12 +2,11 @@ use crate::sql::common::val_char;
use crate::sql::error::IResult; use crate::sql::error::IResult;
use crate::sql::escape::escape_ident; use crate::sql::escape::escape_ident;
use nom::branch::alt; use nom::branch::alt;
use nom::bytes::complete::escaped; use nom::bytes::complete::escaped_transform;
use nom::bytes::complete::is_not; use nom::bytes::complete::is_not;
use nom::bytes::complete::tag;
use nom::bytes::complete::take_while1; use nom::bytes::complete::take_while1;
use nom::character::complete::char; use nom::character::complete::char;
use nom::character::complete::one_of; use nom::combinator::value;
use nom::sequence::delimited; use nom::sequence::delimited;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::fmt::{self, Display, Formatter}; use std::fmt::{self, Display, Formatter};
@ -18,7 +17,7 @@ const BRACKET_L: char = '⟨';
const BRACKET_R: char = '⟩'; const BRACKET_R: char = '⟩';
const BRACKET_END: &str = r#"⟩"#; const BRACKET_END: &str = r#"⟩"#;
const BACKTICK: &str = r#"`"#; const BACKTICK: char = '`';
const BACKTICK_ESC: &str = r#"\`"#; const BACKTICK_ESC: &str = r#"\`"#;
#[derive(Clone, Debug, Default, Eq, Ord, PartialEq, PartialOrd, Serialize, Deserialize, Hash)] #[derive(Clone, Debug, Default, Eq, Ord, PartialEq, PartialOrd, Serialize, Deserialize, Hash)]
@ -76,10 +75,23 @@ fn ident_default(i: &str) -> IResult<&str, String> {
} }
fn ident_backtick(i: &str) -> IResult<&str, String> { fn ident_backtick(i: &str) -> IResult<&str, String> {
let (i, _) = char('`')(i)?; let (i, _) = char(BACKTICK)(i)?;
let (i, v) = alt((escaped(is_not(BACKTICK_ESC), '\\', one_of(BACKTICK)), tag("")))(i)?; let (i, v) = escaped_transform(
let (i, _) = char('`')(i)?; is_not(BACKTICK_ESC),
Ok((i, String::from(v).replace(BACKTICK_ESC, BACKTICK))) '\\',
alt((
value('\u{5c}', char('\\')),
value('\u{60}', char('`')),
value('\u{2f}', char('/')),
value('\u{08}', char('b')),
value('\u{0c}', char('f')),
value('\u{0a}', char('n')),
value('\u{0d}', char('r')),
value('\u{09}', char('t')),
)),
)(i)?;
let (i, _) = char(BACKTICK)(i)?;
Ok((i, v))
} }
fn ident_brackets(i: &str) -> IResult<&str, String> { fn ident_brackets(i: &str) -> IResult<&str, String> {