2018-06-04 16:06:08 +00:00
|
|
|
#![allow(dead_code)]
|
|
|
|
|
|
|
|
use std::borrow::Cow;
|
|
|
|
use std::ops::{Index, Range};
|
|
|
|
use std::fmt::{self, Debug};
|
|
|
|
|
|
|
|
use pear::{Input, Length};
|
|
|
|
|
2019-06-13 01:33:40 +00:00
|
|
|
use crate::ext::IntoOwned;
|
Overhaul URI types.
This is fairly large commit with several entangled logical changes.
The primary change in this commit is to completely overhaul how URI
handling in Rocket works. Prior to this commit, the `Uri` type acted as
an origin API. Its parser was minimal and lenient, allowing URIs that
were invalid according to RFC 7230. By contrast, the new `Uri` type
brings with it a strict RFC 7230 compliant parser. The `Uri` type now
represents any kind of valid URI, not simply `Origin` types. Three new
URI types were introduced:
* `Origin` - represents valid origin URIs
* `Absolute` - represents valid absolute URIs
* `Authority` - represents valid authority URIs
The `Origin` type replaces `Uri` in many cases:
* As fields and method inputs of `Route`
* The `&Uri` request guard is now `&Origin`
* The `uri!` macro produces an `Origin` instead of a `Uri`
The strict nature of URI parsing cascaded into the following changes:
* Several `Route` methods now `panic!` on invalid URIs
* The `Rocket::mount()` method is (correctly) stricter with URIs
* The `Redirect` constructors take a `TryInto<Uri>` type
* Dispatching of a `LocalRequest` correctly validates URIs
Overall, URIs are now properly and uniformly handled throughout Rocket's
codebase, resulting in a more reliable and correct system.
In addition to these URI changes, the following changes are also part of
this commit:
* The `LocalRequest::cloned_dispatch()` method was removed in favor of
chaining `.clone().dispatch()`.
* The entire Rocket codebase uses `crate` instead of `pub(crate)` as a
visibility modifier.
* Rocket uses the `crate_visibility_modifier` and `try_from` features.
A note on unsafety: this commit introduces many uses of `unsafe` in the
URI parser. All of these uses are a result of unsafely transforming byte
slices (`&[u8]` or similar) into strings (`&str`). The parser ensures
that these casts are safe, but of course, we must label their use
`unsafe`. The parser was written to be as generic and efficient as
possible and thus can parse directly from byte sources. Rocket, however,
does not make use of this fact and so would be able to remove all uses
of `unsafe` by parsing from an existing `&str`. This should be
considered in the future.
Fixes #443.
Resolves #263.
2018-07-29 01:26:15 +00:00
|
|
|
|
2018-06-04 16:06:08 +00:00
|
|
|
pub type IndexedString = Indexed<'static, str>;
|
Overhaul URI types.
This is fairly large commit with several entangled logical changes.
The primary change in this commit is to completely overhaul how URI
handling in Rocket works. Prior to this commit, the `Uri` type acted as
an origin API. Its parser was minimal and lenient, allowing URIs that
were invalid according to RFC 7230. By contrast, the new `Uri` type
brings with it a strict RFC 7230 compliant parser. The `Uri` type now
represents any kind of valid URI, not simply `Origin` types. Three new
URI types were introduced:
* `Origin` - represents valid origin URIs
* `Absolute` - represents valid absolute URIs
* `Authority` - represents valid authority URIs
The `Origin` type replaces `Uri` in many cases:
* As fields and method inputs of `Route`
* The `&Uri` request guard is now `&Origin`
* The `uri!` macro produces an `Origin` instead of a `Uri`
The strict nature of URI parsing cascaded into the following changes:
* Several `Route` methods now `panic!` on invalid URIs
* The `Rocket::mount()` method is (correctly) stricter with URIs
* The `Redirect` constructors take a `TryInto<Uri>` type
* Dispatching of a `LocalRequest` correctly validates URIs
Overall, URIs are now properly and uniformly handled throughout Rocket's
codebase, resulting in a more reliable and correct system.
In addition to these URI changes, the following changes are also part of
this commit:
* The `LocalRequest::cloned_dispatch()` method was removed in favor of
chaining `.clone().dispatch()`.
* The entire Rocket codebase uses `crate` instead of `pub(crate)` as a
visibility modifier.
* Rocket uses the `crate_visibility_modifier` and `try_from` features.
A note on unsafety: this commit introduces many uses of `unsafe` in the
URI parser. All of these uses are a result of unsafely transforming byte
slices (`&[u8]` or similar) into strings (`&str`). The parser ensures
that these casts are safe, but of course, we must label their use
`unsafe`. The parser was written to be as generic and efficient as
possible and thus can parse directly from byte sources. Rocket, however,
does not make use of this fact and so would be able to remove all uses
of `unsafe` by parsing from an existing `&str`. This should be
considered in the future.
Fixes #443.
Resolves #263.
2018-07-29 01:26:15 +00:00
|
|
|
pub type IndexedStr<'a> = Indexed<'a, str>;
|
|
|
|
pub type IndexedBytes<'a> = Indexed<'a, [u8]>;
|
2018-06-04 16:06:08 +00:00
|
|
|
|
|
|
|
pub trait AsPtr {
|
|
|
|
fn as_ptr(&self) -> *const u8;
|
|
|
|
}
|
|
|
|
|
|
|
|
impl AsPtr for str {
|
|
|
|
#[inline(always)]
|
|
|
|
fn as_ptr(&self) -> *const u8 {
|
|
|
|
str::as_ptr(self)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl AsPtr for [u8] {
|
|
|
|
#[inline(always)]
|
|
|
|
fn as_ptr(&self) -> *const u8 {
|
|
|
|
<[u8]>::as_ptr(self)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(PartialEq)]
|
2019-06-13 01:33:40 +00:00
|
|
|
pub enum Indexed<'a, T: ?Sized + ToOwned> {
|
2018-06-04 16:06:08 +00:00
|
|
|
Indexed(usize, usize),
|
|
|
|
Concrete(Cow<'a, T>)
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a, T: ?Sized + ToOwned + 'a, C: Into<Cow<'a, T>>> From<C> for Indexed<'a, T> {
|
|
|
|
#[inline(always)]
|
|
|
|
fn from(value: C) -> Indexed<'a, T> {
|
|
|
|
Indexed::Concrete(value.into())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a, T: ?Sized + ToOwned + 'a> Indexed<'a, T> {
|
2018-09-20 04:14:30 +00:00
|
|
|
/// Panics if `self` is not an `Indexed`.
|
|
|
|
#[inline(always)]
|
|
|
|
pub fn indices(self) -> (usize, usize) {
|
|
|
|
match self {
|
|
|
|
Indexed::Indexed(a, b) => (a, b),
|
|
|
|
_ => panic!("cannot convert indexed T to U unless indexed")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Panics if `self` is not an `Indexed`.
|
2018-06-04 16:06:08 +00:00
|
|
|
#[inline(always)]
|
2018-06-20 12:02:12 +00:00
|
|
|
pub fn coerce<U: ?Sized + ToOwned>(self) -> Indexed<'a, U> {
|
2018-06-04 16:06:08 +00:00
|
|
|
match self {
|
|
|
|
Indexed::Indexed(a, b) => Indexed::Indexed(a, b),
|
|
|
|
_ => panic!("cannot convert indexed T to U unless indexed")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-09-20 04:14:30 +00:00
|
|
|
/// Panics if `self` is not an `Indexed`.
|
2018-06-04 16:06:08 +00:00
|
|
|
#[inline(always)]
|
2018-06-20 12:02:12 +00:00
|
|
|
pub fn coerce_lifetime<'b>(self) -> Indexed<'b, T> {
|
2018-06-04 16:06:08 +00:00
|
|
|
match self {
|
|
|
|
Indexed::Indexed(a, b) => Indexed::Indexed(a, b),
|
|
|
|
_ => panic!("cannot coerce lifetime unless indexed")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-06-13 01:33:40 +00:00
|
|
|
impl<T: 'static + ?Sized + ToOwned> IntoOwned for Indexed<'_, T> {
|
Overhaul URI types.
This is fairly large commit with several entangled logical changes.
The primary change in this commit is to completely overhaul how URI
handling in Rocket works. Prior to this commit, the `Uri` type acted as
an origin API. Its parser was minimal and lenient, allowing URIs that
were invalid according to RFC 7230. By contrast, the new `Uri` type
brings with it a strict RFC 7230 compliant parser. The `Uri` type now
represents any kind of valid URI, not simply `Origin` types. Three new
URI types were introduced:
* `Origin` - represents valid origin URIs
* `Absolute` - represents valid absolute URIs
* `Authority` - represents valid authority URIs
The `Origin` type replaces `Uri` in many cases:
* As fields and method inputs of `Route`
* The `&Uri` request guard is now `&Origin`
* The `uri!` macro produces an `Origin` instead of a `Uri`
The strict nature of URI parsing cascaded into the following changes:
* Several `Route` methods now `panic!` on invalid URIs
* The `Rocket::mount()` method is (correctly) stricter with URIs
* The `Redirect` constructors take a `TryInto<Uri>` type
* Dispatching of a `LocalRequest` correctly validates URIs
Overall, URIs are now properly and uniformly handled throughout Rocket's
codebase, resulting in a more reliable and correct system.
In addition to these URI changes, the following changes are also part of
this commit:
* The `LocalRequest::cloned_dispatch()` method was removed in favor of
chaining `.clone().dispatch()`.
* The entire Rocket codebase uses `crate` instead of `pub(crate)` as a
visibility modifier.
* Rocket uses the `crate_visibility_modifier` and `try_from` features.
A note on unsafety: this commit introduces many uses of `unsafe` in the
URI parser. All of these uses are a result of unsafely transforming byte
slices (`&[u8]` or similar) into strings (`&str`). The parser ensures
that these casts are safe, but of course, we must label their use
`unsafe`. The parser was written to be as generic and efficient as
possible and thus can parse directly from byte sources. Rocket, however,
does not make use of this fact and so would be able to remove all uses
of `unsafe` by parsing from an existing `&str`. This should be
considered in the future.
Fixes #443.
Resolves #263.
2018-07-29 01:26:15 +00:00
|
|
|
type Owned = Indexed<'static, T>;
|
|
|
|
|
|
|
|
fn into_owned(self) -> Indexed<'static, T> {
|
|
|
|
match self {
|
|
|
|
Indexed::Indexed(a, b) => Indexed::Indexed(a, b),
|
|
|
|
Indexed::Concrete(cow) => Indexed::Concrete(IntoOwned::into_owned(cow))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-06-04 16:06:08 +00:00
|
|
|
use std::ops::Add;
|
|
|
|
|
|
|
|
impl<'a, T: ?Sized + ToOwned + 'a> Add for Indexed<'a, T> {
|
|
|
|
type Output = Indexed<'a, T>;
|
|
|
|
|
|
|
|
#[inline]
|
|
|
|
fn add(self, other: Indexed<'a, T>) -> Indexed<'a, T> {
|
|
|
|
match self {
|
|
|
|
Indexed::Indexed(a, b) => match other {
|
|
|
|
Indexed::Indexed(c, d) if b == c && a < d => Indexed::Indexed(a, d),
|
|
|
|
_ => panic!("+ requires indexed")
|
|
|
|
}
|
|
|
|
_ => panic!("+ requires indexed")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a, T: ?Sized + ToOwned + 'a> Indexed<'a, T>
|
|
|
|
where T: Length + AsPtr + Index<Range<usize>, Output = T>
|
|
|
|
{
|
|
|
|
// Returns `None` if `needle` is not a substring of `haystack`.
|
|
|
|
pub fn checked_from(needle: &T, haystack: &T) -> Option<Indexed<'a, T>> {
|
|
|
|
let haystack_start = haystack.as_ptr() as usize;
|
|
|
|
let needle_start = needle.as_ptr() as usize;
|
|
|
|
|
|
|
|
if needle_start < haystack_start {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (needle_start + needle.len()) > (haystack_start + haystack.len()) {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
|
|
|
let start = needle_start - haystack_start;
|
|
|
|
let end = start + needle.len();
|
|
|
|
Some(Indexed::Indexed(start, end))
|
|
|
|
}
|
|
|
|
|
|
|
|
// Caller must ensure that `needle` is a substring of `haystack`.
|
|
|
|
pub unsafe fn unchecked_from(needle: &T, haystack: &T) -> Indexed<'a, T> {
|
|
|
|
let haystack_start = haystack.as_ptr() as usize;
|
|
|
|
let needle_start = needle.as_ptr() as usize;
|
|
|
|
|
|
|
|
let start = needle_start - haystack_start;
|
|
|
|
let end = start + needle.len();
|
|
|
|
Indexed::Indexed(start, end)
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Whether this string is derived from indexes or not.
|
|
|
|
#[inline]
|
|
|
|
pub fn is_indexed(&self) -> bool {
|
|
|
|
match *self {
|
|
|
|
Indexed::Indexed(..) => true,
|
|
|
|
Indexed::Concrete(..) => false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Whether this string is derived from indexes or not.
|
|
|
|
#[inline]
|
|
|
|
pub fn is_empty(&self) -> bool {
|
|
|
|
self.len() == 0
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Retrieves the string `self` corresponds to. If `self` is derived from
|
|
|
|
/// indexes, the corresponding subslice of `source` is returned. Otherwise,
|
|
|
|
/// the concrete string is returned.
|
|
|
|
///
|
|
|
|
/// # Panics
|
|
|
|
///
|
|
|
|
/// Panics if `self` is an indexed string and `string` is None.
|
|
|
|
// pub fn to_source(&self, source: Option<&'a T>) -> &T {
|
2019-06-13 01:33:40 +00:00
|
|
|
pub fn from_cow_source<'s>(&'s self, source: &'s Option<Cow<'_, T>>) -> &'s T {
|
2018-06-04 16:06:08 +00:00
|
|
|
if self.is_indexed() && source.is_none() {
|
|
|
|
panic!("Cannot convert indexed str to str without base string!")
|
|
|
|
}
|
|
|
|
|
|
|
|
match *self {
|
|
|
|
Indexed::Indexed(i, j) => &source.as_ref().unwrap()[i..j],
|
|
|
|
Indexed::Concrete(ref mstr) => mstr.as_ref(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Retrieves the string `self` corresponds to. If `self` is derived from
|
|
|
|
/// indexes, the corresponding subslice of `string` is returned. Otherwise,
|
|
|
|
/// the concrete string is returned.
|
|
|
|
///
|
|
|
|
/// # Panics
|
|
|
|
///
|
|
|
|
/// Panics if `self` is an indexed string and `string` is None.
|
|
|
|
pub fn from_source<'s>(&'s self, source: Option<&'s T>) -> &'s T {
|
|
|
|
if self.is_indexed() && source.is_none() {
|
|
|
|
panic!("Cannot convert indexed str to str without base string!")
|
|
|
|
}
|
|
|
|
|
|
|
|
match *self {
|
|
|
|
Indexed::Indexed(i, j) => &source.unwrap()[(i as usize)..(j as usize)],
|
|
|
|
Indexed::Concrete(ref mstr) => &*mstr,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a, T: ToOwned + ?Sized + 'a> Clone for Indexed<'a, T> {
|
|
|
|
fn clone(&self) -> Self {
|
|
|
|
match *self {
|
|
|
|
Indexed::Indexed(a, b) => Indexed::Indexed(a, b),
|
|
|
|
Indexed::Concrete(ref cow) => Indexed::Concrete(cow.clone())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a, T: ?Sized + 'a> Debug for Indexed<'a, T>
|
|
|
|
where T: ToOwned + Debug, T::Owned: Debug
|
|
|
|
{
|
2019-06-13 01:33:40 +00:00
|
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
2018-06-04 16:06:08 +00:00
|
|
|
match *self {
|
|
|
|
Indexed::Indexed(a, b) => fmt::Debug::fmt(&(a, b), f),
|
|
|
|
Indexed::Concrete(ref cow) => fmt::Debug::fmt(cow, f),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a, T: ?Sized + Length + ToOwned + 'a> Length for Indexed<'a, T> {
|
|
|
|
#[inline(always)]
|
|
|
|
fn len(&self) -> usize {
|
|
|
|
match *self {
|
|
|
|
Indexed::Indexed(a, b) => (b - a) as usize,
|
|
|
|
Indexed::Concrete(ref cow) => cow.len()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug)]
|
2019-06-13 01:33:40 +00:00
|
|
|
pub struct IndexedInput<'a, T: ?Sized> {
|
2018-06-04 16:06:08 +00:00
|
|
|
source: &'a T,
|
|
|
|
current: &'a T
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a, T: ?Sized + 'a> IndexedInput<'a, T> {
|
|
|
|
#[inline(always)]
|
|
|
|
pub fn source(&self) -> &T {
|
|
|
|
self.source
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a, T: ToOwned + ?Sized + 'a> IndexedInput<'a, T> {
|
|
|
|
#[inline(always)]
|
|
|
|
pub fn cow_source(&self) -> Cow<'a, T> {
|
|
|
|
Cow::Borrowed(self.source)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-06-13 01:33:40 +00:00
|
|
|
impl IndexedInput<'_, [u8]> {
|
|
|
|
pub fn backtrack(&mut self, n: usize) -> pear::Result<(), Self> {
|
2018-06-04 16:06:08 +00:00
|
|
|
let source_addr = self.source.as_ptr() as usize;
|
|
|
|
let current_addr = self.current.as_ptr() as usize;
|
|
|
|
if current_addr > n && (current_addr - n) >= source_addr {
|
2018-06-20 12:02:12 +00:00
|
|
|
let forward = (current_addr - n) - source_addr;
|
|
|
|
self.current = &self.source[forward..];
|
2018-06-04 16:06:08 +00:00
|
|
|
Ok(())
|
|
|
|
} else {
|
|
|
|
let diag = format!("({}, {:x} in {:x})", n, current_addr, source_addr);
|
|
|
|
Err(pear_error!([backtrack; self] "internal error: {}", diag))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn len(&self) -> usize {
|
|
|
|
self.source.len()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
macro_rules! impl_indexed_input {
|
|
|
|
($T:ty, token = $token:ty) => (
|
|
|
|
impl<'a> From<&'a $T> for IndexedInput<'a, $T> {
|
|
|
|
#[inline(always)]
|
|
|
|
fn from(source: &'a $T) -> Self {
|
|
|
|
IndexedInput { source: source, current: source }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> Input for IndexedInput<'a, $T> {
|
|
|
|
type Token = $token;
|
|
|
|
type InSlice = &'a $T;
|
|
|
|
type Slice = Indexed<'static, $T>;
|
|
|
|
type Many = Indexed<'static, $T>;
|
|
|
|
type Context = Context;
|
|
|
|
|
|
|
|
#[inline(always)]
|
|
|
|
fn peek(&mut self) -> Option<Self::Token> {
|
|
|
|
self.current.peek()
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline(always)]
|
|
|
|
fn peek_slice(&mut self, slice: Self::InSlice) -> Option<Self::Slice> {
|
|
|
|
self.current.peek_slice(slice)
|
|
|
|
.map(|slice| unsafe {
|
|
|
|
Indexed::unchecked_from(slice, self.source)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline(always)]
|
|
|
|
fn skip_many<F>(&mut self, cond: F) -> usize
|
|
|
|
where F: FnMut(Self::Token) -> bool
|
|
|
|
{
|
|
|
|
self.current.skip_many(cond)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline(always)]
|
|
|
|
fn take_many<F>(&mut self, cond: F) -> Self::Many
|
|
|
|
where F: FnMut(Self::Token) -> bool
|
|
|
|
{
|
|
|
|
let many = self.current.take_many(cond);
|
|
|
|
unsafe { Indexed::unchecked_from(many, self.source) }
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline(always)]
|
|
|
|
fn advance(&mut self, count: usize) {
|
|
|
|
self.current.advance(count)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline(always)]
|
|
|
|
fn is_empty(&mut self) -> bool {
|
|
|
|
self.current.is_empty()
|
|
|
|
}
|
|
|
|
|
|
|
|
fn context(&mut self) -> Option<Context> {
|
|
|
|
let offset = self.source.len() - self.current.len();
|
|
|
|
let bytes: &[u8] = self.current.as_ref();
|
|
|
|
let string = String::from_utf8(bytes.into()).ok()?;
|
|
|
|
Some(Context { offset, string })
|
|
|
|
}
|
|
|
|
}
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug, PartialEq, Eq, Clone, Hash)]
|
|
|
|
pub struct Context {
|
|
|
|
pub offset: usize,
|
|
|
|
pub string: String
|
|
|
|
}
|
|
|
|
|
2019-06-13 01:33:40 +00:00
|
|
|
impl std::fmt::Display for Context {
|
|
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
2018-06-04 16:06:08 +00:00
|
|
|
const LIMIT: usize = 7;
|
Overhaul URI types.
This is fairly large commit with several entangled logical changes.
The primary change in this commit is to completely overhaul how URI
handling in Rocket works. Prior to this commit, the `Uri` type acted as
an origin API. Its parser was minimal and lenient, allowing URIs that
were invalid according to RFC 7230. By contrast, the new `Uri` type
brings with it a strict RFC 7230 compliant parser. The `Uri` type now
represents any kind of valid URI, not simply `Origin` types. Three new
URI types were introduced:
* `Origin` - represents valid origin URIs
* `Absolute` - represents valid absolute URIs
* `Authority` - represents valid authority URIs
The `Origin` type replaces `Uri` in many cases:
* As fields and method inputs of `Route`
* The `&Uri` request guard is now `&Origin`
* The `uri!` macro produces an `Origin` instead of a `Uri`
The strict nature of URI parsing cascaded into the following changes:
* Several `Route` methods now `panic!` on invalid URIs
* The `Rocket::mount()` method is (correctly) stricter with URIs
* The `Redirect` constructors take a `TryInto<Uri>` type
* Dispatching of a `LocalRequest` correctly validates URIs
Overall, URIs are now properly and uniformly handled throughout Rocket's
codebase, resulting in a more reliable and correct system.
In addition to these URI changes, the following changes are also part of
this commit:
* The `LocalRequest::cloned_dispatch()` method was removed in favor of
chaining `.clone().dispatch()`.
* The entire Rocket codebase uses `crate` instead of `pub(crate)` as a
visibility modifier.
* Rocket uses the `crate_visibility_modifier` and `try_from` features.
A note on unsafety: this commit introduces many uses of `unsafe` in the
URI parser. All of these uses are a result of unsafely transforming byte
slices (`&[u8]` or similar) into strings (`&str`). The parser ensures
that these casts are safe, but of course, we must label their use
`unsafe`. The parser was written to be as generic and efficient as
possible and thus can parse directly from byte sources. Rocket, however,
does not make use of this fact and so would be able to remove all uses
of `unsafe` by parsing from an existing `&str`. This should be
considered in the future.
Fixes #443.
Resolves #263.
2018-07-29 01:26:15 +00:00
|
|
|
write!(f, "[{}:]", self.offset)?;
|
2018-06-04 16:06:08 +00:00
|
|
|
|
|
|
|
if self.string.len() > LIMIT {
|
Overhaul URI types.
This is fairly large commit with several entangled logical changes.
The primary change in this commit is to completely overhaul how URI
handling in Rocket works. Prior to this commit, the `Uri` type acted as
an origin API. Its parser was minimal and lenient, allowing URIs that
were invalid according to RFC 7230. By contrast, the new `Uri` type
brings with it a strict RFC 7230 compliant parser. The `Uri` type now
represents any kind of valid URI, not simply `Origin` types. Three new
URI types were introduced:
* `Origin` - represents valid origin URIs
* `Absolute` - represents valid absolute URIs
* `Authority` - represents valid authority URIs
The `Origin` type replaces `Uri` in many cases:
* As fields and method inputs of `Route`
* The `&Uri` request guard is now `&Origin`
* The `uri!` macro produces an `Origin` instead of a `Uri`
The strict nature of URI parsing cascaded into the following changes:
* Several `Route` methods now `panic!` on invalid URIs
* The `Rocket::mount()` method is (correctly) stricter with URIs
* The `Redirect` constructors take a `TryInto<Uri>` type
* Dispatching of a `LocalRequest` correctly validates URIs
Overall, URIs are now properly and uniformly handled throughout Rocket's
codebase, resulting in a more reliable and correct system.
In addition to these URI changes, the following changes are also part of
this commit:
* The `LocalRequest::cloned_dispatch()` method was removed in favor of
chaining `.clone().dispatch()`.
* The entire Rocket codebase uses `crate` instead of `pub(crate)` as a
visibility modifier.
* Rocket uses the `crate_visibility_modifier` and `try_from` features.
A note on unsafety: this commit introduces many uses of `unsafe` in the
URI parser. All of these uses are a result of unsafely transforming byte
slices (`&[u8]` or similar) into strings (`&str`). The parser ensures
that these casts are safe, but of course, we must label their use
`unsafe`. The parser was written to be as generic and efficient as
possible and thus can parse directly from byte sources. Rocket, however,
does not make use of this fact and so would be able to remove all uses
of `unsafe` by parsing from an existing `&str`. This should be
considered in the future.
Fixes #443.
Resolves #263.
2018-07-29 01:26:15 +00:00
|
|
|
write!(f, " {}..", &self.string[..LIMIT])
|
2018-06-04 16:06:08 +00:00
|
|
|
} else if !self.string.is_empty() {
|
Overhaul URI types.
This is fairly large commit with several entangled logical changes.
The primary change in this commit is to completely overhaul how URI
handling in Rocket works. Prior to this commit, the `Uri` type acted as
an origin API. Its parser was minimal and lenient, allowing URIs that
were invalid according to RFC 7230. By contrast, the new `Uri` type
brings with it a strict RFC 7230 compliant parser. The `Uri` type now
represents any kind of valid URI, not simply `Origin` types. Three new
URI types were introduced:
* `Origin` - represents valid origin URIs
* `Absolute` - represents valid absolute URIs
* `Authority` - represents valid authority URIs
The `Origin` type replaces `Uri` in many cases:
* As fields and method inputs of `Route`
* The `&Uri` request guard is now `&Origin`
* The `uri!` macro produces an `Origin` instead of a `Uri`
The strict nature of URI parsing cascaded into the following changes:
* Several `Route` methods now `panic!` on invalid URIs
* The `Rocket::mount()` method is (correctly) stricter with URIs
* The `Redirect` constructors take a `TryInto<Uri>` type
* Dispatching of a `LocalRequest` correctly validates URIs
Overall, URIs are now properly and uniformly handled throughout Rocket's
codebase, resulting in a more reliable and correct system.
In addition to these URI changes, the following changes are also part of
this commit:
* The `LocalRequest::cloned_dispatch()` method was removed in favor of
chaining `.clone().dispatch()`.
* The entire Rocket codebase uses `crate` instead of `pub(crate)` as a
visibility modifier.
* Rocket uses the `crate_visibility_modifier` and `try_from` features.
A note on unsafety: this commit introduces many uses of `unsafe` in the
URI parser. All of these uses are a result of unsafely transforming byte
slices (`&[u8]` or similar) into strings (`&str`). The parser ensures
that these casts are safe, but of course, we must label their use
`unsafe`. The parser was written to be as generic and efficient as
possible and thus can parse directly from byte sources. Rocket, however,
does not make use of this fact and so would be able to remove all uses
of `unsafe` by parsing from an existing `&str`. This should be
considered in the future.
Fixes #443.
Resolves #263.
2018-07-29 01:26:15 +00:00
|
|
|
write!(f, " {}", &self.string)
|
2018-06-04 16:06:08 +00:00
|
|
|
} else {
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl_indexed_input!([u8], token = u8);
|
|
|
|
impl_indexed_input!(str, token = char);
|