Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to rust-url 1.0 #70

Merged
merged 1 commit into from
Apr 22, 2016
Merged

Update to rust-url 1.0 #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "websocket"
version = "0.16.2"
version = "0.17.0"
authors = ["cyderize <[email protected]>"]

description = "A WebSocket (RFC6455) library for Rust."
Expand All @@ -17,10 +17,10 @@ keywords = ["websocket", "websockets", "rfc6455"]
license = "MIT"

[dependencies]
hyper = ">=0.7, <0.9"
hyper = ">=0.7, <0.10"
unicase = "1.0.1"
openssl = "0.7.6"
url = "0.5.0"
url = "1.0"
rustc-serialize = "0.3.16"
bitflags = "0.3.3"
rand = "0.3.12"
Expand Down
74 changes: 24 additions & 50 deletions src/ws/util/url.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Utility functions for dealing with URLs

use url::Url;
use url::{Url, Position};
use url::Host as UrlHost;
use hyper::header::Host;
use result::{WebSocketResult, WSUrlErrorKind};
Expand Down Expand Up @@ -63,7 +63,7 @@ impl ToWebSocketUrlComponents for (UrlHost, u16, String, bool) {
/// Convert a Host, port, resource name and secure flag to WebSocket URL components.
fn to_components(&self) -> WebSocketResult<(Host, String, bool)> {
(Host {
hostname: self.0.serialize(),
hostname: self.0.to_string(),
port: Some(self.1)
}, self.2.clone(), self.3).to_components()
}
Expand All @@ -73,7 +73,7 @@ impl<'a> ToWebSocketUrlComponents for (UrlHost, u16, &'a str, bool) {
/// Convert a Host, port, resource name and secure flag to WebSocket URL components.
fn to_components(&self) -> WebSocketResult<(Host, String, bool)> {
(Host {
hostname: self.0.serialize(),
hostname: self.0.to_string(),
port: Some(self.1)
}, self.2, self.3).to_components()
}
Expand All @@ -98,29 +98,23 @@ pub fn parse_url(url: &Url) -> WebSocketResult<(Host, String, bool)> {
// https://html.spec.whatwg.org/multipage/#parse-a-websocket-url's-components

// Step 4
if url.fragment != None {
if url.fragment().is_some() {
return Err(From::from(WSUrlErrorKind::CannotSetFragment));
}

let secure = match url.scheme.as_ref() {
let secure = match url.scheme() {
// step 5
"ws" => false,
"wss" => true,
// step 3
_ => return Err(From::from(WSUrlErrorKind::InvalidScheme)),
};

let host = url.host().unwrap().serialize(); // Step 6
let port = url.port_or_default(); // Steps 7 and 8
let host = url.host_str().unwrap().to_owned(); // Step 6
let port = url.port_or_known_default(); // Steps 7 and 8

let mut resource = "/".to_owned(); // step 10
resource.push_str(url.path().unwrap().join("/").as_ref()); // step 9

// Step 11
if let Some(ref query) = url.query {
resource.push('?');
resource.push_str(query);
}
// steps 9, 10, 11
let resource = url[Position::BeforePath..Position::AfterQuery].to_owned();

// Step 12
Ok((Host { hostname: host, port: port }, resource, secure))
Expand All @@ -130,29 +124,17 @@ pub fn parse_url(url: &Url) -> WebSocketResult<(Host, String, bool)> {
mod tests {
use super::*;
//use test;
use url::{Url, SchemeData, RelativeSchemeData, Host};
use url::Url;
use result::{WebSocketError, WSUrlErrorKind};

fn url_for_test() -> Url {
Url {
fragment: None,
scheme: "ws".to_owned(),
scheme_data: SchemeData::Relative(RelativeSchemeData {
username: "".to_owned(),
password: None,
host: Host::Domain("www.example.com".to_owned()),
port: Some(8080),
default_port: Some(80),
path: vec!["some".to_owned(), "path".to_owned()]
}),
query: Some("a=b&c=d".to_owned()),
}
Url::parse("ws://www.example.com:8080/some/path?a=b&c=d").unwrap()
}

#[test]
fn test_parse_url_fragments_not_accepted() {
let url = &mut url_for_test();
url.fragment = Some("non_null_fragment".to_owned());
url.set_fragment(Some("non_null_fragment"));

let result = parse_url(url);
match result {
Expand All @@ -166,10 +148,10 @@ mod tests {
#[test]
fn test_parse_url_invalid_schemes_return_error() {
let url = &mut url_for_test();

let invalid_schemes = &["http", "https", "gopher", "file", "ftp", "other"];
for scheme in invalid_schemes {
url.scheme = scheme.to_string();
url.set_scheme(scheme).unwrap();

let result = parse_url(url);
match result {
Expand All @@ -180,14 +162,14 @@ mod tests {
}
}
}

#[test]
fn test_parse_url_valid_schemes_return_ok() {
let url = &mut url_for_test();

let valid_schemes = &["ws", "wss"];
for scheme in valid_schemes {
url.scheme = scheme.to_string();
url.set_scheme(scheme).unwrap();

let result = parse_url(url);
match result {
Expand All @@ -200,7 +182,7 @@ mod tests {
#[test]
fn test_parse_url_ws_returns_unset_secure_flag() {
let url = &mut url_for_test();
url.scheme = "ws".to_owned();
url.set_scheme("ws").unwrap();

let result = parse_url(url);
let secure = match result {
Expand All @@ -213,7 +195,7 @@ mod tests {
#[test]
fn test_parse_url_wss_returns_set_secure_flag() {
let url = &mut url_for_test();
url.scheme = "wss".to_owned();
url.set_scheme("wss").unwrap();

let result = parse_url(url);
let secure = match result {
Expand All @@ -222,7 +204,7 @@ mod tests {
};
assert!(secure);
}

#[test]
fn test_parse_url_generates_proper_output() {
let url = &url_for_test();
Expand All @@ -232,7 +214,7 @@ mod tests {
Ok((host, resource, _)) => (host, resource),
Err(e) => panic!(e),
};

assert_eq!(host.hostname, "www.example.com".to_owned());
assert_eq!(resource, "/some/path?a=b&c=d".to_owned());

Expand All @@ -245,10 +227,7 @@ mod tests {
#[test]
fn test_parse_url_empty_path_should_give_slash() {
let url = &mut url_for_test();
match url.scheme_data {
SchemeData::Relative(ref mut scheme_data) => { scheme_data.path = vec![]; },
_ => ()
}
url.set_path("/");

let result = parse_url(url);
let resource = match result {
Expand All @@ -262,7 +241,7 @@ mod tests {
#[test]
fn test_parse_url_none_query_should_not_append_question_mark() {
let url = &mut url_for_test();
url.query = None;
url.set_query(None);

let result = parse_url(url);
let resource = match result {
Expand All @@ -276,12 +255,7 @@ mod tests {
#[test]
fn test_parse_url_none_port_should_use_default_port() {
let url = &mut url_for_test();
match url.scheme_data {
SchemeData::Relative(ref mut scheme_data) => {
scheme_data.port = None;
},
_ => ()
}
url.set_port(None).unwrap();

let result = parse_url(url);
let host = match result {
Expand Down