1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478
//! # Untrustended - Untrusted Extended. //! //! Untrustended is a compilation of primitives for parsing values from //! untrusted input. It's building on top of //! [untrusted](https://crates.io/crates/untrusted)'s //! [`Reader::read_byte()`](https://briansmith.org/rustdoc/untrusted/struct.Reader.html#method.read_byte). //! //! Please, consult [untrusted](https://crates.io/crates/untrusted)'s //! documentation about how to use that crate before attempting to use this one. //! //! To use the new methods provided by this crate: //! //! ```rust,no_run //! use untrustended::ReaderExt; //! ``` //! //! then construct a `Reader` as usual and enjoy. //! //! Example: //! //! ```rust //! extern crate untrusted; //! extern crate untrustended; //! //! use untrusted::{Input, Reader}; //! use untrustended::{ReaderExt, Error}; //! //! fn read_stuff(input: &mut Reader) -> Result<(u8, u16, u32), Error> { //! let one_byte = input.read_u8()?; //! let big_endian_u16 = input.read_u16be()?; //! let little_endian_u32 = input.read_u32le()?; //! Ok((one_byte, big_endian_u16, little_endian_u32)) //! } //! //! fn main() { //! let buf = vec![0, 1, 2, 3, 4, 5, 6]; //! let input = Input::from(&buf); //! //! input.read_all(Error::UnknownError, read_stuff).expect("read_all to succeed"); //! } //! ``` #![deny(warnings, missing_docs)] #![cfg_attr(not(feature = "use_std"), no_std)] extern crate untrusted; use untrusted::{Reader, Input, EndOfInput}; pub use error::Error; #[cfg(feature = "use_std")] use std::net::{Ipv4Addr, Ipv6Addr}; /// A trait extending [untrusted](https://crates.io/crates/untrusted)'s /// [`Reader`](https://briansmith.org/rustdoc/untrusted/struct.Reader.html). pub trait ReaderExt<'a> { /// Read one byte. This is the basic building block of every other read /// method provided. fn read_byte(&mut self) -> Result<u8, EndOfInput>; /// Skips num_bytes of the input, returning the skipped input as an Input. /// /// Returns Ok(i) where i is an Input if there are at least num_bytes of /// input remaining, and Err(EndOfInput) otherwise. fn skip_and_get_input(&mut self, num_bytes: usize) -> Result<Input<'a>, EndOfInput>; /// Reads 8 bit unsigned integer. /// /// Returns Ok(v) where v is the value read, or Err(Error::EndOfInput) if /// the Reader is at the end of the input. #[inline] fn read_u8(&mut self) -> Result<u8, Error> { self.read_byte().map_err(From::from) } /// Reads 16 bit unsigned integer in big endian. /// /// Returns Ok(v) where v is the value read, or Err(Error::EndOfInput) if /// the Reader encountered an end of the input while reading. #[inline] fn read_u16be(&mut self) -> Result<u16, Error> { let b1 = self.read_u8()? as u16; let b2 = self.read_u8()? as u16; Ok((b1 << 8) + b2) } /// Reads 24 bit unsigned integer in big endian. /// /// This method reads three bytes, but returns `u32` because Rust doesn't /// have 24 bit integer type. /// /// Returns Ok(v) where v is the value read, or Err(Error::EndOfInput) if /// the Reader encountered an end of the input while reading. #[inline] fn read_u24be(&mut self) -> Result<u32, Error> { let b1 = self.read_u16be()? as u32; let b2 = self.read_u8()? as u32; Ok((b1 << 8) + b2) } /// Reads 32 bit unsigned integer in big endian. /// /// Returns Ok(v) where v is the value read, or Err(Error::EndOfInput) if /// the Reader encountered an end of the input while reading. #[inline] fn read_u32be(&mut self) -> Result<u32, Error> { let b1 = self.read_u16be()? as u32; let b2 = self.read_u16be()? as u32; Ok((b1 << 16) + b2) } /// Reads 48 bit unsigned integer in big endian. /// /// This method reads six bytes, but returns `u64` because Rust doesn't have /// 48 bit integer type. /// /// Returns Ok(v) where v is the value read, or Err(Error::EndOfInput) if /// the Reader encountered an end of the input while reading. #[inline] fn read_u48be(&mut self) -> Result<u64, Error> { let b1 = self.read_u24be()? as u64; let b2 = self.read_u24be()? as u64; Ok((b1 << 24) + b2) } /// Reads 64 bit unsigned integer in big endian. /// /// Returns Ok(v) where v is the value read, or Err(Error::EndOfInput) if /// the Reader encountered an end of the input while reading. #[inline] fn read_u64be(&mut self) -> Result<u64, Error> { let b1 = self.read_u32be()? as u64; let b2 = self.read_u32be()? as u64; Ok((b1 << 32) + b2) } /// Reads 16 bit unsigned integer in little endian. /// /// Returns Ok(v) where v is the value read, or Err(Error::EndOfInput) if /// the Reader encountered an end of the input while reading. #[inline] fn read_u16le(&mut self) -> Result<u16, Error> { let b2 = self.read_u8()? as u16; let b1 = self.read_u8()? as u16; Ok((b1 << 8) + b2) } /// Reads 24 bit unsigned integer in little endian. /// /// This method reads three bytes, but returns `u32` because Rust doesn't /// have 24 bit integer type. /// /// Returns Ok(v) where v is the value read, or Err(Error::EndOfInput) if /// the Reader encountered an end of the input while reading. #[inline] fn read_u24le(&mut self) -> Result<u32, Error> { let b2 = self.read_u8()? as u32; let b1 = self.read_u16le()? as u32; Ok((b1 << 8) + b2) } /// Reads 32 bit unsigned integer in little endian. /// /// Returns Ok(v) where v is the value read, or Err(Error::EndOfInput) if /// the Reader encountered an end of the input while reading. #[inline] fn read_u32le(&mut self) -> Result<u32, Error> { let b2 = self.read_u16le()? as u32; let b1 = self.read_u16le()? as u32; Ok((b1 << 16) + b2) } /// Reads 48 bit unsigned integer in little endian. /// /// This method reads six bytes, but returns `u64` because Rust doesn't have /// 48 bit integer type. /// /// Returns Ok(v) where v is the value read, or Err(Error::EndOfInput) if /// the Reader encountered an end of the input while reading. #[inline] fn read_u48le(&mut self) -> Result<u64, Error> { let b2 = self.read_u24le()? as u64; let b1 = self.read_u24le()? as u64; Ok((b1 << 24) + b2) } /// Reads 64 bit unsigned integer in little endian. /// /// Returns Ok(v) where v is the value read, or Err(Error::EndOfInput) if /// the Reader encountered an end of the input while reading. #[inline] fn read_u64le(&mut self) -> Result<u64, Error> { let b2 = self.read_u32le()? as u64; let b1 = self.read_u32le()? as u64; Ok((b1 << 32) + b2) } /// Reads 8 bit signed integer. /// /// Returns Ok(v) where v is the value read, or Err(Error::EndOfInput) if /// the Reader is at the end of the input. #[inline] fn read_i8(&mut self) -> Result<i8, Error> { Ok(self.read_u8()? as i8) } /// Reads 16 bit signed integer in big endian. /// /// Returns Ok(v) where v is the value read, or Err(Error::EndOfInput) if /// the Reader encountered an end of the input while reading. #[inline] fn read_i16be(&mut self) -> Result<i16, Error> { let b1 = self.read_u8()? as i16; let b2 = self.read_u8()? as i16; Ok((b1 << 8) + b2) } /// Reads 24 bit signed integer in big endian. /// /// This method reads three bytes, but returns `i32` because Rust doesn't /// have 24 bit integer type. /// /// Returns Ok(v) where v is the value read, or Err(Error::EndOfInput) if /// the Reader encountered an end of the input while reading. #[inline] fn read_i24be(&mut self) -> Result<i32, Error> { let b1 = self.read_i16be()? as i32; let b2 = self.read_u8()? as i32; Ok((b1 << 8) + b2) } /// Reads 32 bit signed integer in big endian. /// /// Returns Ok(v) where v is the value read, or Err(Error::EndOfInput) if /// the Reader encountered an end of the input while reading. #[inline] fn read_i32be(&mut self) -> Result<i32, Error> { let b1 = self.read_u16be()? as i32; let b2 = self.read_u16be()? as i32; Ok((b1 << 16) + b2) } /// Reads 48 bit signed integer in big endian. /// /// This method reads six bytes, but returns `i64` because Rust doesn't have /// 48 bit integer type. /// /// Returns Ok(v) where v is the value read, or Err(Error::EndOfInput) if /// the Reader encountered an end of the input while reading. #[inline] fn read_i48be(&mut self) -> Result<i64, Error> { let b1 = self.read_i24be()? as i64; let b2 = self.read_u24be()? as i64; Ok((b1 << 24) + b2) } /// Reads 64 bit signed integer in big endian. /// /// Returns Ok(v) where v is the value read, or Err(Error::EndOfInput) if /// the Reader encountered an end of the input while reading. #[inline] fn read_i64be(&mut self) -> Result<i64, Error> { let b1 = self.read_u32be()? as i64; let b2 = self.read_u32be()? as i64; Ok((b1 << 32) + b2) } /// Reads 16 bit signed integer in little endian. /// /// Returns Ok(v) where v is the value read, or Err(Error::EndOfInput) if /// the Reader encountered an end of the input while reading. #[inline] fn read_i16le(&mut self) -> Result<i16, Error> { let b2 = self.read_u8()? as i16; let b1 = self.read_u8()? as i16; Ok((b1 << 8) + b2) } /// Reads 24 bit signed integer in little endian. /// /// This method reads three bytes, but returns `i32` because Rust doesn't /// have 24 bit integer type. /// /// Returns Ok(v) where v is the value read, or Err(Error::EndOfInput) if /// the Reader encountered an end of the input while reading. #[inline] fn read_i24le(&mut self) -> Result<i32, Error> { let b2 = self.read_u8()? as i32; let b1 = self.read_i16le()? as i32; Ok((b1 << 8) + b2) } /// Reads 32 bit signed integer in little endian. /// /// Returns Ok(v) where v is the value read, or Err(Error::EndOfInput) if /// the Reader encountered an end of the input while reading. #[inline] fn read_i32le(&mut self) -> Result<i32, Error> { let b2 = self.read_u16le()? as i32; let b1 = self.read_u16le()? as i32; Ok((b1 << 16) + b2) } /// Reads 48 bit signed integer in little endian. /// /// This method reads six bytes, but returns `i64` because Rust doesn't have /// 48 bit integer type. /// /// Returns Ok(v) where v is the value read, or Err(Error::EndOfInput) if /// the Reader encountered an end of the input while reading. #[inline] fn read_i48le(&mut self) -> Result<i64, Error> { let b2 = self.read_u24le()? as i64; let b1 = self.read_i24le()? as i64; Ok((b1 << 24) + b2) } /// Reads 64 bit signed integer in little endian. /// /// Returns Ok(v) where v is the value read, or Err(Error::EndOfInput) if /// the Reader encountered an end of the input while reading. #[inline] fn read_i64le(&mut self) -> Result<i64, Error> { let b2 = self.read_u32le()? as i64; let b1 = self.read_u32le()? as i64; Ok((b1 << 32) + b2) } /// Reads given amount of bytes. /// /// Returns Ok(v) where v is a `&[u8]` of bytes read, or /// Err(Error::EndOfInput) if the Reader encountered an end of the input /// while reading. #[inline] fn read_bytes(&mut self, num_bytes: usize) -> Result<&'a [u8], Error> { Ok(self.skip_and_get_input(num_bytes).map( |v| v.as_slice_less_safe(), )?) } /// Reads bytes as UTF-8 String. /// /// Length required is the amount of bytes to read, not the amount of UTF-8 /// characters. /// /// Read bytes are validated to be valid UTF-8 by /// [`str::from_utf8`](https://doc.rust-lang.org/std/str/fn.from_utf8.html) /// method. /// /// Returns Ok(v) where v is a `&str` of bytes read, or /// Err(Error::EndOfInput) if the Reader encountered an end of the input /// while reading, or Err(Error::ParseError) if UTF-8 parsing failed. #[inline] #[cfg(feature = "use_std")] fn read_utf8(&mut self, num_bytes: usize) -> Result<&'a str, Error> { let buf = self.read_bytes(num_bytes)?; std::str::from_utf8(buf).map_err(From::from) } /// Reads bytes as UTF-16 String. /// /// Length is the amount of bytes to read, not the amount of UTF-16 /// characters. Length should be even number and Err(Error::ParseError) is /// returned if it's odd. /// /// Read bytes are validated to be valid UTF-16 by /// [`String::from_utf16`](https://doc.rust-lang.org/std/string/struct.String.html#method.from_utf16) /// method. /// /// Returns Ok(v) where v is a `String` of bytes read, or /// Err(Error::EndOfInput) if the Reader encountered an end of the input /// while reading, or Err(Error::ParseError) if UTF-8 parsing failed. #[inline] #[cfg(feature = "use_std")] fn read_utf16(&mut self, num_bytes: usize) -> Result<String, Error> { if (num_bytes % 2) != 0 { return Err(Error::ParseError); } let len16 = num_bytes / 2; let mut buf: Vec<u16> = Vec::with_capacity(len16); for _ in 0..len16 { let b = self.read_u16be()?; buf.push(b); } String::from_utf16(&buf).map_err(From::from) } /// Reads IPv4 address in big endian format. /// /// Returns Ok(v) where v is a `Ipv4Addr`, or Err(Error::EndOfInput) if the /// Reader encountered an end of the input while reading, or /// Err(Error::ParseError) if parsing of address failed. #[inline] #[cfg(feature = "use_std")] fn read_ipv4addr(&mut self) -> Result<Ipv4Addr, Error> { let bytes = self.read_u32be()?; Ok(Ipv4Addr::from(bytes)) } /// Reads IPv6 address in big endian format. /// /// Returns Ok(v) where v is a `Ipv6Addr`, or Err(Error::EndOfInput) if the /// Reader encountered an end of the input while reading, or /// Err(Error::ParseError) if parsing of address failed. #[inline] #[cfg(feature = "use_std")] fn read_ipv6addr(&mut self) -> Result<Ipv6Addr, Error> { let mut b = [0u16; 8]; for i in &mut b { *i = self.read_u16be()?; } let ip = Ipv6Addr::new(b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7]); Ok(ip) } } impl<'a> ReaderExt<'a> for Reader<'a> { #[inline] fn read_byte(&mut self) -> Result<u8, untrusted::EndOfInput> { self.read_byte() } #[inline] fn skip_and_get_input(&mut self, num_bytes: usize) -> Result<Input<'a>, EndOfInput> { self.skip_and_get_input(num_bytes) } } mod error { #[cfg(feature = "use_std")] use std::fmt; #[cfg(feature = "use_std")] use std::str::Utf8Error; #[cfg(feature = "use_std")] use std::string::FromUtf16Error; use untrusted::EndOfInput; /// Possible errors raised by `ReaderExt`. #[derive(Debug, PartialEq)] pub enum Error { /// The error type used to indicate the end of the input was reached /// before the operation could be completed. EndOfInput, /// The error type used to indicate when a failed parsing while trying /// to convert bytes into a more specific type. ParseError, /// Unknown error occured. UnknownError, } #[cfg(feature = "use_std")] impl fmt::Display for Error { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "reading failed with {:?}", self) } } impl From<EndOfInput> for Error { fn from(_: EndOfInput) -> Self { Error::EndOfInput } } #[cfg(feature = "use_std")] impl From<Utf8Error> for Error { fn from(_: Utf8Error) -> Self { Error::ParseError } } #[cfg(feature = "use_std")] impl From<FromUtf16Error> for Error { fn from(_: FromUtf16Error) -> Self { Error::ParseError } } }