feat(headers): add origin header

Add an Origin header so users may properly send CORS requests

Closes #651
This commit is contained in:
Michael
2016-07-06 16:01:20 -04:00
committed by Sean McArthur
parent 220d09fc3a
commit 01843f8822
3 changed files with 145 additions and 32 deletions

View File

@@ -1,6 +1,8 @@
use header::{Header};
use std::fmt;
use std::str::FromStr;
use header::parsing::from_one_raw_str;
use url::idna::domain_to_unicode;
/// The `Host` header.
///
@@ -48,38 +50,7 @@ impl Header for Host {
}
fn parse_header(raw: &[Vec<u8>]) -> ::Result<Host> {
from_one_raw_str(raw).and_then(|mut s: String| {
// FIXME: use rust-url to parse this
// https://github.com/servo/rust-url/issues/42
let idx = {
let slice = &s[..];
if slice.starts_with('[') {
match slice.rfind(']') {
Some(idx) => {
if slice.len() > idx + 2 {
Some(idx + 1)
} else {
None
}
}
None => return Err(::Error::Header) // this is a bad ipv6 address...
}
} else {
slice.rfind(':')
}
};
let port = idx.and_then(|idx| s[idx + 1..].parse().ok());
if let Some(idx) = idx {
s.truncate(idx)
}
Ok(Host {
hostname: s,
port: port
})
})
from_one_raw_str(raw)
}
fn fmt_header(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -90,6 +61,35 @@ impl Header for Host {
}
}
impl fmt::Display for Host {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
self.fmt_header(f)
}
}
impl FromStr for Host {
type Err = ::Error;
fn from_str(s: &str) -> ::Result<Host> {
let (host_port, res) = domain_to_unicode(s);
if res.is_err() {
return Err(::Error::Header)
}
let idx = host_port.rfind(':');
let port = idx.and_then(
|idx| s[idx + 1..].parse().ok()
);
let hostname = match idx {
None => host_port,
Some(idx) => host_port[..idx].to_owned()
};
Ok(Host {
hostname: hostname,
port: port
})
}
}
#[cfg(test)]
mod tests {
use super::Host;