moparisthebest/xmpp-proxy
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

New state InsideAttribute for StanzaFilter, more tests

Browse Source
This commit is contained in:
Travis Burtrum 2021-04-16 01:57:02 -04:00
parent 8af6034b18
commit 5c966d9166
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/stanzafilter.rs
View File

@ -9,6 +9,7 @@ enum StanzaState {
StanzaFirstChar, StanzaFirstChar,
InsideTagFirstChar, InsideTagFirstChar,
InsideTag, InsideTag,
InsideAttribute(u8),
BetweenTags, BetweenTags,
ExclamationTag(usize), ExclamationTag(usize),
InsideCDATA, InsideCDATA,
@ -71,18 +72,18 @@ impl StanzaFilter {
} }
StanzaFirstChar => match b { StanzaFirstChar => match b {
b'/' => self.state = EndStream, b'/' => self.state = EndStream,
b'!' => bail!("illegal stanza: {}", to_str(&self.buf[..(self.cnt + 1)])), b'!' | b'>' | b'\'' | b'"' => bail!("illegal stanza: {}", to_str(&self.buf[..(self.cnt + 1)])),
b'?' => self.state = QuestionTag(self.cnt + 4), // 4 is length of b"xml " b'?' => self.state = QuestionTag(self.cnt + 4), // 4 is length of b"xml "
_ => self.state = InsideTag, _ => self.state = InsideTag,
}, },
InsideTagFirstChar => match b { InsideTagFirstChar => match b {
b'/' => self.tag_cnt -= 2, b'/' => self.tag_cnt -= 2,
b'!' => self.state = ExclamationTag(self.cnt + 7), // 7 is length of b"[CDATA[" b'!' => self.state = ExclamationTag(self.cnt + 7), // 7 is length of b"[CDATA["
b'?' => bail!("illegal stanza: {}", to_str(&self.buf[..(self.cnt + 1)])), b'?' | b'>' | b'\'' | b'"' => bail!("illegal stanza: {}", to_str(&self.buf[..(self.cnt + 1)])),
_ => self.state = InsideTag, _ => self.state = InsideTag,
}, },
InsideTag => { InsideTag => match b {
if b == b'>' { b'>' => {
if self.buf[self.cnt - 1] == b'/' { if self.buf[self.cnt - 1] == b'/' {
// state can't be InsideTag unless we are on at least the second character, so can't go out of range // state can't be InsideTag unless we are on at least the second character, so can't go out of range
// self-closing tag // self-closing tag
@ -97,6 +98,13 @@ impl StanzaFilter {
} }
self.state = BetweenTags; self.state = BetweenTags;
} }
b'\'' | b'"' => self.state = InsideAttribute(b),
_ => {}
},
InsideAttribute(end) => {
if b == end {
self.state = InsideTag;
}
} }
QuestionTag(idx) => { QuestionTag(idx) => {
if idx == self.cnt { if idx == self.cnt {
@ -206,6 +214,7 @@ mod tests {
async fn process_next_byte() -> std::result::Result<(), anyhow::Error> { async fn process_next_byte() -> std::result::Result<(), anyhow::Error> {
let mut filter = StanzaFilter::new(262_144); let mut filter = StanzaFilter::new(262_144);
//todo: <x a='/>'>This is going to be fun.</x>
assert_eq!( assert_eq!(
StanzaReader(Cursor::new( StanzaReader(Cursor::new(
br###" br###"
@ -213,6 +222,11 @@ mod tests {
<stream:stream xmlns='jabber:server' xmlns:stream='http://etherx.jabber.org/streams' xmlns:db='jabber:server:dialback' version='1.0' to='example.org' from='example.com' xml:lang='en'> <stream:stream xmlns='jabber:server' xmlns:stream='http://etherx.jabber.org/streams' xmlns:db='jabber:server:dialback' version='1.0' to='example.org' from='example.com' xml:lang='en'>
<a/><b>inside b before c<c>inside c</c></b></stream:stream> <a/><b>inside b before c<c>inside c</c></b></stream:stream>
<q>bla<![CDATA[<this>is</not><xml/>]]>bloo</q> <q>bla<![CDATA[<this>is</not><xml/>]]>bloo</q>
<x><![CDATA[ lol</x> ]]></x>
<z><x><![CDATA[ lol</x> ]]></x></z>
<a a='![CDATA['/>
<x a='/>'>This is going to be fun.</x>
<z><x a='/>'>This is going to be fun.</x></y>
<d></d><e><![CDATA[what]>]]]]></e></stream:stream> <d></d><e><![CDATA[what]>]]]]></e></stream:stream>
"###, "###,
)) ))
@ -225,6 +239,11 @@ mod tests {
"<b>inside b before c<c>inside c</c></b>", "<b>inside b before c<c>inside c</c></b>",
"</stream:stream>", "</stream:stream>",
"<q>bla<![CDATA[<this>is</not><xml/>]]>bloo</q>", "<q>bla<![CDATA[<this>is</not><xml/>]]>bloo</q>",
"<x><![CDATA[ lol</x> ]]></x>",
"<z><x><![CDATA[ lol</x> ]]></x></z>",
"<a a='![CDATA['/>",
"<x a='/>'>This is going to be fun.</x>",
"<z><x a='/>'>This is going to be fun.</x></y>",
"<d></d>", "<d></d>",
"<e><![CDATA[what]>]]]]></e>", "<e><![CDATA[what]>]]]]></e>",
"</stream:stream>", "</stream:stream>",