Skip to content

Handle Hyper 0.11's Headers implementation#90

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

Merged
bors merged 4 commits into from
Dec 12, 2019
Merged

Handle Hyper 0.11's Headers implementation #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68b64b0
Handle Hyper 0.11's Headers implementation
richardwhiuk Dec 12, 2019
6cc9881
Fix warnings in Rust 1.39
richardwhiuk Dec 12, 2019
1b90891
Fix formatting
richardwhiuk Dec 12, 2019
ed5b6a9
Update CHANGELOG
richardwhiuk Dec 12, 2019
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]
### Added
- Add `SafeHeaders` to work around Hyper 0.11 panic handling differently type headers with the same name - e.g. Authorization
- Fix warnings present on Rust 1.39

### Changed

Expand Down
2 changes: 1 addition & 1 deletion src/base64_format.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ impl<'de> Deserialize<'de> for ByteArray {
where
D: Deserializer<'de>,
{
let s = try!(String::deserialize(deserializer));
let s = String::deserialize(deserializer)?;
match decode(&s) {
Ok(bin) => Ok(ByteArray(bin)),
_ => Err(D::Error::custom("invalid base64")),
Expand Down
8 changes: 4 additions & 4 deletions src/composites.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,10 +41,10 @@ impl NotFound for Response {
}
}

type BoxedFuture<V, W> = Box<Future<Item = V, Error = W>>;
type CompositeNewServiceVec<U, V, W> = Vec<(&'static str, Box<BoxedNewService<U, V, W>>)>;
type BoxedFuture<V, W> = Box<dyn Future<Item = V, Error = W>>;
type CompositeNewServiceVec<U, V, W> = Vec<(&'static str, Box<dyn BoxedNewService<U, V, W>>)>;
type BoxedService<U, V, W> =
Box<Service<Request = U, Response = V, Error = W, Future = BoxedFuture<V, W>>>;
Box<dyn Service<Request = U, Response = V, Error = W, Future = BoxedFuture<V, W>>>;

/// Trait for wrapping hyper `NewService`s to make the return type of `new_service` uniform.
/// This is necessary in order for the `NewService`s with different `Instance` types to
Expand DownExpand Up@@ -185,7 +185,7 @@ where
type Request = U;
type Response = V;
type Error = W;
type Future = Box<Future<Item = V, Error = W>>;
type Future = Box<dyn Future<Item = V, Error = W>>;

fn call(&self, req: Self::Request) -> Self::Future {
let mut result = None;
Expand Down
10 changes: 5 additions & 5 deletions src/connector.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ use hyper;

/// Returns a function which creates an http-connector. Used for instantiating
/// clients with custom connectors
pub fn http_connector() -> Box<Fn(&Handle) -> hyper::client::HttpConnector + Send + Sync> {
pub fn http_connector() -> Box<dyn Fn(&Handle) -> hyper::client::HttpConnector + Send + Sync> {
Box::new(move |handle: &Handle| hyper::client::HttpConnector::new(4, handle))
}

Expand All@@ -25,7 +25,7 @@ pub fn http_connector() -> Box<Fn(&Handle) -> hyper::client::HttpConnector + Sen
#[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))]
pub fn https_connector<CA>(
ca_certificate: CA,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
CA: AsRef<Path>,
{
Expand DownExpand Up@@ -53,7 +53,7 @@ where
#[cfg(any(target_os = "macos", target_os = "windows", target_os = "ios"))]
pub fn https_connector<CA>(
_ca_certificate: CA,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
CA: AsRef<Path>,
{
Expand All@@ -71,7 +71,7 @@ pub fn https_mutual_connector<CA, K, C>(
ca_certificate: CA,
client_key: K,
client_certificate: C,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
CA: AsRef<Path>,
K: AsRef<Path>,
Expand DownExpand Up@@ -112,7 +112,7 @@ pub fn https_mutual_connector<CA, K, C>(
_ca_certificate: CA,
_client_key: K,
_client_certificate: C,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
CA: AsRef<Path>,
K: AsRef<Path>,
Expand Down
8 changes: 4 additions & 4 deletions src/context.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use std::marker::Sized;
/// type Request = (hyper::Request, C);
/// type Response = hyper::Response;
/// type Error = hyper::Error;
/// type Future = Box<Future<Item=Self::Response, Error=Self::Error>>;
/// type Future = Box<dyn Future<Item=Self::Response, Error=Self::Error>>;
/// fn call(&self, (req, context) : Self::Request) -> Self::Future {
/// do_something_with_my_item(Has::<MyItem>::get(&context));
/// Box::new(ok(hyper::Response::new()))
Expand DownExpand Up@@ -546,7 +546,7 @@ pub trait SwaggerService<C>:
Request = (hyper::server::Request, C),
Response = hyper::server::Response,
Error = hyper::Error,
Future = Box<Future<Item = hyper::server::Response, Error = hyper::Error>>,
Future = Box<dyn Future<Item = hyper::server::Response, Error = hyper::Error>>,
>
where
C: Has<Option<AuthData>> + Has<Option<Authorization>> + Has<XSpanIdString> + Clone + 'static,
Expand All@@ -560,7 +560,7 @@ where
Request = (hyper::server::Request, C),
Response = hyper::server::Response,
Error = hyper::Error,
Future = Box<Future<Item = hyper::server::Response, Error = hyper::Error>>,
Future = Box<dyn Future<Item = hyper::server::Response, Error = hyper::Error>>,
>,
C: Has<Option<AuthData>> + Has<Option<Authorization>> + Has<XSpanIdString> + Clone + 'static,
{
Expand DownExpand Up@@ -603,7 +603,7 @@ mod context_tests {
type Request = (Request, C);
type Response = Response;
type Error = Error;
type Future = Box<Future<Item = Response, Error = Error>>;
type Future = Box<dyn Future<Item = Response, Error = Error>>;
fn call(&self, (_, context): Self::Request) -> Self::Future {
use_item_2(Has::<ContextItem2>::get(&context));

Expand Down
39 changes: 39 additions & 0 deletions src/headers.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
//! Support library for handling headers in a safe manner

use hyper::header::{Header, Headers};

/// Trait to add a mechanism to safely retrieve a header.
///
/// In Hyper 0.11, if you add an Authorization<Basic> header,
/// and then attempt get an Authorization<Bearer> header, the code
/// will panic, as the type ID doesn't match.
pub trait SafeHeaders {
/// Safely get a header from a hyper::header::Headers
fn safe_get<H: Header>(&self) -> Option<H>;
}

impl SafeHeaders for Headers {
fn safe_get<H: Header>(&self) -> Option<H> {
self.get_raw(H::header_name())
.map(H::parse_header)
.map(Result::ok)
.unwrap_or(None)
Comment thread
richardwhiuk marked this conversation as resolved.
}
}

#[cfg(test)]
mod tests {
use super::*;
use hyper::header::{Authorization, Basic, Bearer};

#[test]
fn test() {
let mut headers = Headers::default();
let basic = Basic {
username: "richard".to_string(),
password: None,
};
headers.set::<Authorization<Basic>>(Authorization(basic));
println!("Auth: {:?}", headers.safe_get::<Authorization<Bearer>>());
}
}
4 changes: 3 additions & 1 deletion src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,8 @@ pub use drop_context::DropContext;
pub mod request_parser;
pub use request_parser::RequestParser;

pub mod headers;

header! {
/// `X-Span-ID` header, used to track a request through a chain of microservices.
(XSpanId, "X-Span-ID") => [String]
Expand DownExpand Up@@ -91,7 +93,7 @@ pub struct ApiError(pub String);

impl fmt::Display for ApiError {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let debug: &fmt::Debug = self;
let debug: &dyn fmt::Debug = self;
debug.fmt(f)
}
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Handle Hyper 0.11's Headers implementation by richardwhiuk · Pull Request #90 · Metaswitch/swagger-rs · GitHub
Skip to content
Handle Hyper 0.11's Headers implementation#90

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

 Merged

bors
merged 4 commits into

from

Dec 12, 2019
 Merged


Handle Hyper 0.11's Headers implementation
#90
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
68b64b0

Handle Hyper 0.11's Headers implementation


richardwhiuk Dec 12, 2019
6cc9881

Fix warnings in Rust 1.39


richardwhiuk Dec 12, 2019
1b90891

Fix formatting


richardwhiuk Dec 12, 2019
ed5b6a9

Update CHANGELOG


richardwhiuk Dec 12, 2019

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


2 changes: 2 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]
### Added
- Add `SafeHeaders` to work around Hyper 0.11 panic handling differently type headers with the same name - e.g. Authorization
- Fix warnings present on Rust 1.39

### Changed

Expand Down

2 changes: 1 addition & 1 deletion
src/base64_format.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ impl<'de> Deserialize<'de> for ByteArray {
 where
 D: Deserializer<'de>,
 {
 let s = try!(String::deserialize(deserializer));
 let s = String::deserialize(deserializer)?;
 match decode(&s) {
 Ok(bin) => Ok(ByteArray(bin)),
 _ => Err(D::Error::custom("invalid base64")),
Expand Down

8 changes: 4 additions & 4 deletions
src/composites.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,10 +41,10 @@ impl NotFound for Response {
 }
}

type BoxedFuture<V, W> = Box<Future<Item = V, Error = W>>;
type CompositeNewServiceVec<U, V, W> = Vec<(&'static str, Box<BoxedNewService<U, V, W>>)>;
type BoxedFuture<V, W> = Box<dyn Future<Item = V, Error = W>>;
type CompositeNewServiceVec<U, V, W> = Vec<(&'static str, Box<dyn BoxedNewService<U, V, W>>)>;
type BoxedService<U, V, W> =
 Box<Service<Request = U, Response = V, Error = W, Future = BoxedFuture<V, W>>>;
 Box<dyn Service<Request = U, Response = V, Error = W, Future = BoxedFuture<V, W>>>;

/// Trait for wrapping hyper `NewService`s to make the return type of `new_service` uniform.
/// This is necessary in order for the `NewService`s with different `Instance` types to
Expand DownExpand Up@@ -185,7 +185,7 @@ where
 type Request = U;
 type Response = V;
 type Error = W;
 type Future = Box<Future<Item = V, Error = W>>;
 type Future = Box<dyn Future<Item = V, Error = W>>;

 fn call(&self, req: Self::Request) -> Self::Future {
 let mut result = None;
Expand Down

10 changes: 5 additions & 5 deletions
src/connector.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ use hyper;

/// Returns a function which creates an http-connector. Used for instantiating
/// clients with custom connectors
pub fn http_connector() -> Box<Fn(&Handle) -> hyper::client::HttpConnector + Send + Sync> {
pub fn http_connector() -> Box<dyn Fn(&Handle) -> hyper::client::HttpConnector + Send + Sync> {
 Box::new(move |handle: &Handle| hyper::client::HttpConnector::new(4, handle))
}

Expand All@@ -25,7 +25,7 @@ pub fn http_connector() -> Box<Fn(&Handle) -> hyper::client::HttpConnector + Sen
#[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))]
pub fn https_connector<CA>(
 ca_certificate: CA,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
{
Expand DownExpand Up@@ -53,7 +53,7 @@ where
#[cfg(any(target_os = "macos", target_os = "windows", target_os = "ios"))]
pub fn https_connector<CA>(
 _ca_certificate: CA,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
{
Expand All@@ -71,7 +71,7 @@ pub fn https_mutual_connector<CA, K, C>(
 ca_certificate: CA,
 client_key: K,
 client_certificate: C,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
 K: AsRef<Path>,
Expand DownExpand Up@@ -112,7 +112,7 @@ pub fn https_mutual_connector<CA, K, C>(
 _ca_certificate: CA,
 _client_key: K,
 _client_certificate: C,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
 K: AsRef<Path>,
Expand Down

8 changes: 4 additions & 4 deletions
src/context.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use std::marker::Sized;
/// type Request = (hyper::Request, C);
/// type Response = hyper::Response;
/// type Error = hyper::Error;
/// type Future = Box<Future<Item=Self::Response, Error=Self::Error>>;
/// type Future = Box<dyn Future<Item=Self::Response, Error=Self::Error>>;
/// fn call(&self, (req, context) : Self::Request) -> Self::Future {
/// do_something_with_my_item(Has::<MyItem>::get(&context));
/// Box::new(ok(hyper::Response::new()))
Expand DownExpand Up@@ -546,7 +546,7 @@ pub trait SwaggerService<C>:
 Request = (hyper::server::Request, C),
 Response = hyper::server::Response,
 Error = hyper::Error,
 Future = Box<Future<Item = hyper::server::Response, Error = hyper::Error>>,
 Future = Box<dyn Future<Item = hyper::server::Response, Error = hyper::Error>>,
 >
where
 C: Has<Option<AuthData>> + Has<Option<Authorization>> + Has<XSpanIdString> + Clone + 'static,
Expand All@@ -560,7 +560,7 @@ where
 Request = (hyper::server::Request, C),
 Response = hyper::server::Response,
 Error = hyper::Error,
 Future = Box<Future<Item = hyper::server::Response, Error = hyper::Error>>,
 Future = Box<dyn Future<Item = hyper::server::Response, Error = hyper::Error>>,
 >,
 C: Has<Option<AuthData>> + Has<Option<Authorization>> + Has<XSpanIdString> + Clone + 'static,
{
Expand DownExpand Up@@ -603,7 +603,7 @@ mod context_tests {
 type Request = (Request, C);
 type Response = Response;
 type Error = Error;
 type Future = Box<Future<Item = Response, Error = Error>>;
 type Future = Box<dyn Future<Item = Response, Error = Error>>;
 fn call(&self, (_, context): Self::Request) -> Self::Future {
 use_item_2(Has::<ContextItem2>::get(&context));

Expand Down

39 changes: 39 additions & 0 deletions
src/headers.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
//! Support library for handling headers in a safe manner

use hyper::header::{Header, Headers};

/// Trait to add a mechanism to safely retrieve a header.
///
/// In Hyper 0.11, if you add an Authorization<Basic> header,
/// and then attempt get an Authorization<Bearer> header, the code
/// will panic, as the type ID doesn't match.
pub trait SafeHeaders {
 /// Safely get a header from a hyper::header::Headers
 fn safe_get<H: Header>(&self) -> Option<H>;
}

impl SafeHeaders for Headers {
 fn safe_get<H: Header>(&self) -> Option<H> {
 self.get_raw(H::header_name())
 .map(H::parse_header)
 .map(Result::ok)
 .unwrap_or(None)
Comment thread
richardwhiuk marked this conversation as resolved.

 }
}

#[cfg(test)]
mod tests {
 use super::*;
 use hyper::header::{Authorization, Basic, Bearer};

 #[test]
 fn test() {
 let mut headers = Headers::default();
 let basic = Basic {
 username: "richard".to_string(),
 password: None,
 };
 headers.set::<Authorization<Basic>>(Authorization(basic));
 println!("Auth: {:?}", headers.safe_get::<Authorization<Bearer>>());
 }
}

4 changes: 3 additions & 1 deletion
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,8 @@ pub use drop_context::DropContext;
pub mod request_parser;
pub use request_parser::RequestParser;

pub mod headers;

header! {
 /// `X-Span-ID` header, used to track a request through a chain of microservices.
 (XSpanId, "X-Span-ID") => [String]
Expand DownExpand Up@@ -91,7 +93,7 @@ pub struct ApiError(pub String);

impl fmt::Display for ApiError {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 let debug: &fmt::Debug = self;
 let debug: &dyn fmt::Debug = self;
 debug.fmt(f)
 }
}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Handle Hyper 0.11's Headers implementation by richardwhiuk · Pull Request #90 · Metaswitch/swagger-rs · GitHub
Skip to content
Handle Hyper 0.11's Headers implementation#90

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

 Merged

bors
merged 4 commits into

from

Dec 12, 2019
 Merged


Handle Hyper 0.11's Headers implementation
#90
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
68b64b0

Handle Hyper 0.11's Headers implementation


richardwhiuk Dec 12, 2019
6cc9881

Fix warnings in Rust 1.39


richardwhiuk Dec 12, 2019
1b90891

Fix formatting


richardwhiuk Dec 12, 2019
ed5b6a9

Update CHANGELOG


richardwhiuk Dec 12, 2019

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


2 changes: 2 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]
### Added
- Add `SafeHeaders` to work around Hyper 0.11 panic handling differently type headers with the same name - e.g. Authorization
- Fix warnings present on Rust 1.39

### Changed

Expand Down

2 changes: 1 addition & 1 deletion
src/base64_format.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ impl<'de> Deserialize<'de> for ByteArray {
 where
 D: Deserializer<'de>,
 {
 let s = try!(String::deserialize(deserializer));
 let s = String::deserialize(deserializer)?;
 match decode(&s) {
 Ok(bin) => Ok(ByteArray(bin)),
 _ => Err(D::Error::custom("invalid base64")),
Expand Down

8 changes: 4 additions & 4 deletions
src/composites.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,10 +41,10 @@ impl NotFound for Response {
 }
}

type BoxedFuture<V, W> = Box<Future<Item = V, Error = W>>;
type CompositeNewServiceVec<U, V, W> = Vec<(&'static str, Box<BoxedNewService<U, V, W>>)>;
type BoxedFuture<V, W> = Box<dyn Future<Item = V, Error = W>>;
type CompositeNewServiceVec<U, V, W> = Vec<(&'static str, Box<dyn BoxedNewService<U, V, W>>)>;
type BoxedService<U, V, W> =
 Box<Service<Request = U, Response = V, Error = W, Future = BoxedFuture<V, W>>>;
 Box<dyn Service<Request = U, Response = V, Error = W, Future = BoxedFuture<V, W>>>;

/// Trait for wrapping hyper `NewService`s to make the return type of `new_service` uniform.
/// This is necessary in order for the `NewService`s with different `Instance` types to
Expand DownExpand Up@@ -185,7 +185,7 @@ where
 type Request = U;
 type Response = V;
 type Error = W;
 type Future = Box<Future<Item = V, Error = W>>;
 type Future = Box<dyn Future<Item = V, Error = W>>;

 fn call(&self, req: Self::Request) -> Self::Future {
 let mut result = None;
Expand Down

10 changes: 5 additions & 5 deletions
src/connector.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ use hyper;

/// Returns a function which creates an http-connector. Used for instantiating
/// clients with custom connectors
pub fn http_connector() -> Box<Fn(&Handle) -> hyper::client::HttpConnector + Send + Sync> {
pub fn http_connector() -> Box<dyn Fn(&Handle) -> hyper::client::HttpConnector + Send + Sync> {
 Box::new(move |handle: &Handle| hyper::client::HttpConnector::new(4, handle))
}

Expand All@@ -25,7 +25,7 @@ pub fn http_connector() -> Box<Fn(&Handle) -> hyper::client::HttpConnector + Sen
#[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))]
pub fn https_connector<CA>(
 ca_certificate: CA,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
{
Expand DownExpand Up@@ -53,7 +53,7 @@ where
#[cfg(any(target_os = "macos", target_os = "windows", target_os = "ios"))]
pub fn https_connector<CA>(
 _ca_certificate: CA,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
{
Expand All@@ -71,7 +71,7 @@ pub fn https_mutual_connector<CA, K, C>(
 ca_certificate: CA,
 client_key: K,
 client_certificate: C,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
 K: AsRef<Path>,
Expand DownExpand Up@@ -112,7 +112,7 @@ pub fn https_mutual_connector<CA, K, C>(
 _ca_certificate: CA,
 _client_key: K,
 _client_certificate: C,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
 K: AsRef<Path>,
Expand Down

8 changes: 4 additions & 4 deletions
src/context.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use std::marker::Sized;
/// type Request = (hyper::Request, C);
/// type Response = hyper::Response;
/// type Error = hyper::Error;
/// type Future = Box<Future<Item=Self::Response, Error=Self::Error>>;
/// type Future = Box<dyn Future<Item=Self::Response, Error=Self::Error>>;
/// fn call(&self, (req, context) : Self::Request) -> Self::Future {
/// do_something_with_my_item(Has::<MyItem>::get(&context));
/// Box::new(ok(hyper::Response::new()))
Expand DownExpand Up@@ -546,7 +546,7 @@ pub trait SwaggerService<C>:
 Request = (hyper::server::Request, C),
 Response = hyper::server::Response,
 Error = hyper::Error,
 Future = Box<Future<Item = hyper::server::Response, Error = hyper::Error>>,
 Future = Box<dyn Future<Item = hyper::server::Response, Error = hyper::Error>>,
 >
where
 C: Has<Option<AuthData>> + Has<Option<Authorization>> + Has<XSpanIdString> + Clone + 'static,
Expand All@@ -560,7 +560,7 @@ where
 Request = (hyper::server::Request, C),
 Response = hyper::server::Response,
 Error = hyper::Error,
 Future = Box<Future<Item = hyper::server::Response, Error = hyper::Error>>,
 Future = Box<dyn Future<Item = hyper::server::Response, Error = hyper::Error>>,
 >,
 C: Has<Option<AuthData>> + Has<Option<Authorization>> + Has<XSpanIdString> + Clone + 'static,
{
Expand DownExpand Up@@ -603,7 +603,7 @@ mod context_tests {
 type Request = (Request, C);
 type Response = Response;
 type Error = Error;
 type Future = Box<Future<Item = Response, Error = Error>>;
 type Future = Box<dyn Future<Item = Response, Error = Error>>;
 fn call(&self, (_, context): Self::Request) -> Self::Future {
 use_item_2(Has::<ContextItem2>::get(&context));

Expand Down

39 changes: 39 additions & 0 deletions
src/headers.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
//! Support library for handling headers in a safe manner

use hyper::header::{Header, Headers};

/// Trait to add a mechanism to safely retrieve a header.
///
/// In Hyper 0.11, if you add an Authorization<Basic> header,
/// and then attempt get an Authorization<Bearer> header, the code
/// will panic, as the type ID doesn't match.
pub trait SafeHeaders {
 /// Safely get a header from a hyper::header::Headers
 fn safe_get<H: Header>(&self) -> Option<H>;
}

impl SafeHeaders for Headers {
 fn safe_get<H: Header>(&self) -> Option<H> {
 self.get_raw(H::header_name())
 .map(H::parse_header)
 .map(Result::ok)
 .unwrap_or(None)
Comment thread
richardwhiuk marked this conversation as resolved.

 }
}

#[cfg(test)]
mod tests {
 use super::*;
 use hyper::header::{Authorization, Basic, Bearer};

 #[test]
 fn test() {
 let mut headers = Headers::default();
 let basic = Basic {
 username: "richard".to_string(),
 password: None,
 };
 headers.set::<Authorization<Basic>>(Authorization(basic));
 println!("Auth: {:?}", headers.safe_get::<Authorization<Bearer>>());
 }
}

4 changes: 3 additions & 1 deletion
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,8 @@ pub use drop_context::DropContext;
pub mod request_parser;
pub use request_parser::RequestParser;

pub mod headers;

header! {
 /// `X-Span-ID` header, used to track a request through a chain of microservices.
 (XSpanId, "X-Span-ID") => [String]
Expand DownExpand Up@@ -91,7 +93,7 @@ pub struct ApiError(pub String);

impl fmt::Display for ApiError {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 let debug: &fmt::Debug = self;
 let debug: &dyn fmt::Debug = self;
 debug.fmt(f)
 }
}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Handle Hyper 0.11's Headers implementation by richardwhiuk · Pull Request #90 · Metaswitch/swagger-rs · GitHub
Skip to content
Handle Hyper 0.11's Headers implementation#90

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

 Merged

bors
merged 4 commits into

from

Dec 12, 2019
 Merged


Handle Hyper 0.11's Headers implementation
#90
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
68b64b0

Handle Hyper 0.11's Headers implementation


richardwhiuk Dec 12, 2019
6cc9881

Fix warnings in Rust 1.39


richardwhiuk Dec 12, 2019
1b90891

Fix formatting


richardwhiuk Dec 12, 2019
ed5b6a9

Update CHANGELOG


richardwhiuk Dec 12, 2019

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


2 changes: 2 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]
### Added
- Add `SafeHeaders` to work around Hyper 0.11 panic handling differently type headers with the same name - e.g. Authorization
- Fix warnings present on Rust 1.39

### Changed

Expand Down

2 changes: 1 addition & 1 deletion
src/base64_format.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ impl<'de> Deserialize<'de> for ByteArray {
 where
 D: Deserializer<'de>,
 {
 let s = try!(String::deserialize(deserializer));
 let s = String::deserialize(deserializer)?;
 match decode(&s) {
 Ok(bin) => Ok(ByteArray(bin)),
 _ => Err(D::Error::custom("invalid base64")),
Expand Down

8 changes: 4 additions & 4 deletions
src/composites.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,10 +41,10 @@ impl NotFound for Response {
 }
}

type BoxedFuture<V, W> = Box<Future<Item = V, Error = W>>;
type CompositeNewServiceVec<U, V, W> = Vec<(&'static str, Box<BoxedNewService<U, V, W>>)>;
type BoxedFuture<V, W> = Box<dyn Future<Item = V, Error = W>>;
type CompositeNewServiceVec<U, V, W> = Vec<(&'static str, Box<dyn BoxedNewService<U, V, W>>)>;
type BoxedService<U, V, W> =
 Box<Service<Request = U, Response = V, Error = W, Future = BoxedFuture<V, W>>>;
 Box<dyn Service<Request = U, Response = V, Error = W, Future = BoxedFuture<V, W>>>;

/// Trait for wrapping hyper `NewService`s to make the return type of `new_service` uniform.
/// This is necessary in order for the `NewService`s with different `Instance` types to
Expand DownExpand Up@@ -185,7 +185,7 @@ where
 type Request = U;
 type Response = V;
 type Error = W;
 type Future = Box<Future<Item = V, Error = W>>;
 type Future = Box<dyn Future<Item = V, Error = W>>;

 fn call(&self, req: Self::Request) -> Self::Future {
 let mut result = None;
Expand Down

10 changes: 5 additions & 5 deletions
src/connector.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ use hyper;

/// Returns a function which creates an http-connector. Used for instantiating
/// clients with custom connectors
pub fn http_connector() -> Box<Fn(&Handle) -> hyper::client::HttpConnector + Send + Sync> {
pub fn http_connector() -> Box<dyn Fn(&Handle) -> hyper::client::HttpConnector + Send + Sync> {
 Box::new(move |handle: &Handle| hyper::client::HttpConnector::new(4, handle))
}

Expand All@@ -25,7 +25,7 @@ pub fn http_connector() -> Box<Fn(&Handle) -> hyper::client::HttpConnector + Sen
#[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))]
pub fn https_connector<CA>(
 ca_certificate: CA,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
{
Expand DownExpand Up@@ -53,7 +53,7 @@ where
#[cfg(any(target_os = "macos", target_os = "windows", target_os = "ios"))]
pub fn https_connector<CA>(
 _ca_certificate: CA,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
{
Expand All@@ -71,7 +71,7 @@ pub fn https_mutual_connector<CA, K, C>(
 ca_certificate: CA,
 client_key: K,
 client_certificate: C,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
 K: AsRef<Path>,
Expand DownExpand Up@@ -112,7 +112,7 @@ pub fn https_mutual_connector<CA, K, C>(
 _ca_certificate: CA,
 _client_key: K,
 _client_certificate: C,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
 K: AsRef<Path>,
Expand Down

8 changes: 4 additions & 4 deletions
src/context.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use std::marker::Sized;
/// type Request = (hyper::Request, C);
/// type Response = hyper::Response;
/// type Error = hyper::Error;
/// type Future = Box<Future<Item=Self::Response, Error=Self::Error>>;
/// type Future = Box<dyn Future<Item=Self::Response, Error=Self::Error>>;
/// fn call(&self, (req, context) : Self::Request) -> Self::Future {
/// do_something_with_my_item(Has::<MyItem>::get(&context));
/// Box::new(ok(hyper::Response::new()))
Expand DownExpand Up@@ -546,7 +546,7 @@ pub trait SwaggerService<C>:
 Request = (hyper::server::Request, C),
 Response = hyper::server::Response,
 Error = hyper::Error,
 Future = Box<Future<Item = hyper::server::Response, Error = hyper::Error>>,
 Future = Box<dyn Future<Item = hyper::server::Response, Error = hyper::Error>>,
 >
where
 C: Has<Option<AuthData>> + Has<Option<Authorization>> + Has<XSpanIdString> + Clone + 'static,
Expand All@@ -560,7 +560,7 @@ where
 Request = (hyper::server::Request, C),
 Response = hyper::server::Response,
 Error = hyper::Error,
 Future = Box<Future<Item = hyper::server::Response, Error = hyper::Error>>,
 Future = Box<dyn Future<Item = hyper::server::Response, Error = hyper::Error>>,
 >,
 C: Has<Option<AuthData>> + Has<Option<Authorization>> + Has<XSpanIdString> + Clone + 'static,
{
Expand DownExpand Up@@ -603,7 +603,7 @@ mod context_tests {
 type Request = (Request, C);
 type Response = Response;
 type Error = Error;
 type Future = Box<Future<Item = Response, Error = Error>>;
 type Future = Box<dyn Future<Item = Response, Error = Error>>;
 fn call(&self, (_, context): Self::Request) -> Self::Future {
 use_item_2(Has::<ContextItem2>::get(&context));

Expand Down

39 changes: 39 additions & 0 deletions
src/headers.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
//! Support library for handling headers in a safe manner

use hyper::header::{Header, Headers};

/// Trait to add a mechanism to safely retrieve a header.
///
/// In Hyper 0.11, if you add an Authorization<Basic> header,
/// and then attempt get an Authorization<Bearer> header, the code
/// will panic, as the type ID doesn't match.
pub trait SafeHeaders {
 /// Safely get a header from a hyper::header::Headers
 fn safe_get<H: Header>(&self) -> Option<H>;
}

impl SafeHeaders for Headers {
 fn safe_get<H: Header>(&self) -> Option<H> {
 self.get_raw(H::header_name())
 .map(H::parse_header)
 .map(Result::ok)
 .unwrap_or(None)
Comment thread
richardwhiuk marked this conversation as resolved.

 }
}

#[cfg(test)]
mod tests {
 use super::*;
 use hyper::header::{Authorization, Basic, Bearer};

 #[test]
 fn test() {
 let mut headers = Headers::default();
 let basic = Basic {
 username: "richard".to_string(),
 password: None,
 };
 headers.set::<Authorization<Basic>>(Authorization(basic));
 println!("Auth: {:?}", headers.safe_get::<Authorization<Bearer>>());
 }
}

4 changes: 3 additions & 1 deletion
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,8 @@ pub use drop_context::DropContext;
pub mod request_parser;
pub use request_parser::RequestParser;

pub mod headers;

header! {
 /// `X-Span-ID` header, used to track a request through a chain of microservices.
 (XSpanId, "X-Span-ID") => [String]
Expand DownExpand Up@@ -91,7 +93,7 @@ pub struct ApiError(pub String);

impl fmt::Display for ApiError {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 let debug: &fmt::Debug = self;
 let debug: &dyn fmt::Debug = self;
 debug.fmt(f)
 }
}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Handle Hyper 0.11's Headers implementation by richardwhiuk · Pull Request #90 · Metaswitch/swagger-rs · GitHub
Skip to content
Handle Hyper 0.11's Headers implementation#90

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

 Merged

bors
merged 4 commits into

from

Dec 12, 2019
 Merged


Handle Hyper 0.11's Headers implementation
#90
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
68b64b0

Handle Hyper 0.11's Headers implementation


richardwhiuk Dec 12, 2019
6cc9881

Fix warnings in Rust 1.39


richardwhiuk Dec 12, 2019
1b90891

Fix formatting


richardwhiuk Dec 12, 2019
ed5b6a9

Update CHANGELOG


richardwhiuk Dec 12, 2019

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


2 changes: 2 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]
### Added
- Add `SafeHeaders` to work around Hyper 0.11 panic handling differently type headers with the same name - e.g. Authorization
- Fix warnings present on Rust 1.39

### Changed

Expand Down

2 changes: 1 addition & 1 deletion
src/base64_format.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ impl<'de> Deserialize<'de> for ByteArray {
 where
 D: Deserializer<'de>,
 {
 let s = try!(String::deserialize(deserializer));
 let s = String::deserialize(deserializer)?;
 match decode(&s) {
 Ok(bin) => Ok(ByteArray(bin)),
 _ => Err(D::Error::custom("invalid base64")),
Expand Down

8 changes: 4 additions & 4 deletions
src/composites.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,10 +41,10 @@ impl NotFound for Response {
 }
}

type BoxedFuture<V, W> = Box<Future<Item = V, Error = W>>;
type CompositeNewServiceVec<U, V, W> = Vec<(&'static str, Box<BoxedNewService<U, V, W>>)>;
type BoxedFuture<V, W> = Box<dyn Future<Item = V, Error = W>>;
type CompositeNewServiceVec<U, V, W> = Vec<(&'static str, Box<dyn BoxedNewService<U, V, W>>)>;
type BoxedService<U, V, W> =
 Box<Service<Request = U, Response = V, Error = W, Future = BoxedFuture<V, W>>>;
 Box<dyn Service<Request = U, Response = V, Error = W, Future = BoxedFuture<V, W>>>;

/// Trait for wrapping hyper `NewService`s to make the return type of `new_service` uniform.
/// This is necessary in order for the `NewService`s with different `Instance` types to
Expand DownExpand Up@@ -185,7 +185,7 @@ where
 type Request = U;
 type Response = V;
 type Error = W;
 type Future = Box<Future<Item = V, Error = W>>;
 type Future = Box<dyn Future<Item = V, Error = W>>;

 fn call(&self, req: Self::Request) -> Self::Future {
 let mut result = None;
Expand Down

10 changes: 5 additions & 5 deletions
src/connector.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ use hyper;

/// Returns a function which creates an http-connector. Used for instantiating
/// clients with custom connectors
pub fn http_connector() -> Box<Fn(&Handle) -> hyper::client::HttpConnector + Send + Sync> {
pub fn http_connector() -> Box<dyn Fn(&Handle) -> hyper::client::HttpConnector + Send + Sync> {
 Box::new(move |handle: &Handle| hyper::client::HttpConnector::new(4, handle))
}

Expand All@@ -25,7 +25,7 @@ pub fn http_connector() -> Box<Fn(&Handle) -> hyper::client::HttpConnector + Sen
#[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))]
pub fn https_connector<CA>(
 ca_certificate: CA,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
{
Expand DownExpand Up@@ -53,7 +53,7 @@ where
#[cfg(any(target_os = "macos", target_os = "windows", target_os = "ios"))]
pub fn https_connector<CA>(
 _ca_certificate: CA,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
{
Expand All@@ -71,7 +71,7 @@ pub fn https_mutual_connector<CA, K, C>(
 ca_certificate: CA,
 client_key: K,
 client_certificate: C,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
 K: AsRef<Path>,
Expand DownExpand Up@@ -112,7 +112,7 @@ pub fn https_mutual_connector<CA, K, C>(
 _ca_certificate: CA,
 _client_key: K,
 _client_certificate: C,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
 K: AsRef<Path>,
Expand Down

8 changes: 4 additions & 4 deletions
src/context.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use std::marker::Sized;
/// type Request = (hyper::Request, C);
/// type Response = hyper::Response;
/// type Error = hyper::Error;
/// type Future = Box<Future<Item=Self::Response, Error=Self::Error>>;
/// type Future = Box<dyn Future<Item=Self::Response, Error=Self::Error>>;
/// fn call(&self, (req, context) : Self::Request) -> Self::Future {
/// do_something_with_my_item(Has::<MyItem>::get(&context));
/// Box::new(ok(hyper::Response::new()))
Expand DownExpand Up@@ -546,7 +546,7 @@ pub trait SwaggerService<C>:
 Request = (hyper::server::Request, C),
 Response = hyper::server::Response,
 Error = hyper::Error,
 Future = Box<Future<Item = hyper::server::Response, Error = hyper::Error>>,
 Future = Box<dyn Future<Item = hyper::server::Response, Error = hyper::Error>>,
 >
where
 C: Has<Option<AuthData>> + Has<Option<Authorization>> + Has<XSpanIdString> + Clone + 'static,
Expand All@@ -560,7 +560,7 @@ where
 Request = (hyper::server::Request, C),
 Response = hyper::server::Response,
 Error = hyper::Error,
 Future = Box<Future<Item = hyper::server::Response, Error = hyper::Error>>,
 Future = Box<dyn Future<Item = hyper::server::Response, Error = hyper::Error>>,
 >,
 C: Has<Option<AuthData>> + Has<Option<Authorization>> + Has<XSpanIdString> + Clone + 'static,
{
Expand DownExpand Up@@ -603,7 +603,7 @@ mod context_tests {
 type Request = (Request, C);
 type Response = Response;
 type Error = Error;
 type Future = Box<Future<Item = Response, Error = Error>>;
 type Future = Box<dyn Future<Item = Response, Error = Error>>;
 fn call(&self, (_, context): Self::Request) -> Self::Future {
 use_item_2(Has::<ContextItem2>::get(&context));

Expand Down

39 changes: 39 additions & 0 deletions
src/headers.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
//! Support library for handling headers in a safe manner

use hyper::header::{Header, Headers};

/// Trait to add a mechanism to safely retrieve a header.
///
/// In Hyper 0.11, if you add an Authorization<Basic> header,
/// and then attempt get an Authorization<Bearer> header, the code
/// will panic, as the type ID doesn't match.
pub trait SafeHeaders {
 /// Safely get a header from a hyper::header::Headers
 fn safe_get<H: Header>(&self) -> Option<H>;
}

impl SafeHeaders for Headers {
 fn safe_get<H: Header>(&self) -> Option<H> {
 self.get_raw(H::header_name())
 .map(H::parse_header)
 .map(Result::ok)
 .unwrap_or(None)
Comment thread
richardwhiuk marked this conversation as resolved.

 }
}

#[cfg(test)]
mod tests {
 use super::*;
 use hyper::header::{Authorization, Basic, Bearer};

 #[test]
 fn test() {
 let mut headers = Headers::default();
 let basic = Basic {
 username: "richard".to_string(),
 password: None,
 };
 headers.set::<Authorization<Basic>>(Authorization(basic));
 println!("Auth: {:?}", headers.safe_get::<Authorization<Bearer>>());
 }
}

4 changes: 3 additions & 1 deletion
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,8 @@ pub use drop_context::DropContext;
pub mod request_parser;
pub use request_parser::RequestParser;

pub mod headers;

header! {
 /// `X-Span-ID` header, used to track a request through a chain of microservices.
 (XSpanId, "X-Span-ID") => [String]
Expand DownExpand Up@@ -91,7 +93,7 @@ pub struct ApiError(pub String);

impl fmt::Display for ApiError {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 let debug: &fmt::Debug = self;
 let debug: &dyn fmt::Debug = self;
 debug.fmt(f)
 }
}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Handle Hyper 0.11's Headers implementation by richardwhiuk · Pull Request #90 · Metaswitch/swagger-rs · GitHub
Skip to content
Handle Hyper 0.11's Headers implementation#90

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

 Merged

bors
merged 4 commits into

from

Dec 12, 2019
 Merged


Handle Hyper 0.11's Headers implementation
#90
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
68b64b0

Handle Hyper 0.11's Headers implementation


richardwhiuk Dec 12, 2019
6cc9881

Fix warnings in Rust 1.39


richardwhiuk Dec 12, 2019
1b90891

Fix formatting


richardwhiuk Dec 12, 2019
ed5b6a9

Update CHANGELOG


richardwhiuk Dec 12, 2019

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


2 changes: 2 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]
### Added
- Add `SafeHeaders` to work around Hyper 0.11 panic handling differently type headers with the same name - e.g. Authorization
- Fix warnings present on Rust 1.39

### Changed

Expand Down

2 changes: 1 addition & 1 deletion
src/base64_format.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ impl<'de> Deserialize<'de> for ByteArray {
 where
 D: Deserializer<'de>,
 {
 let s = try!(String::deserialize(deserializer));
 let s = String::deserialize(deserializer)?;
 match decode(&s) {
 Ok(bin) => Ok(ByteArray(bin)),
 _ => Err(D::Error::custom("invalid base64")),
Expand Down

8 changes: 4 additions & 4 deletions
src/composites.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,10 +41,10 @@ impl NotFound for Response {
 }
}

type BoxedFuture<V, W> = Box<Future<Item = V, Error = W>>;
type CompositeNewServiceVec<U, V, W> = Vec<(&'static str, Box<BoxedNewService<U, V, W>>)>;
type BoxedFuture<V, W> = Box<dyn Future<Item = V, Error = W>>;
type CompositeNewServiceVec<U, V, W> = Vec<(&'static str, Box<dyn BoxedNewService<U, V, W>>)>;
type BoxedService<U, V, W> =
 Box<Service<Request = U, Response = V, Error = W, Future = BoxedFuture<V, W>>>;
 Box<dyn Service<Request = U, Response = V, Error = W, Future = BoxedFuture<V, W>>>;

/// Trait for wrapping hyper `NewService`s to make the return type of `new_service` uniform.
/// This is necessary in order for the `NewService`s with different `Instance` types to
Expand DownExpand Up@@ -185,7 +185,7 @@ where
 type Request = U;
 type Response = V;
 type Error = W;
 type Future = Box<Future<Item = V, Error = W>>;
 type Future = Box<dyn Future<Item = V, Error = W>>;

 fn call(&self, req: Self::Request) -> Self::Future {
 let mut result = None;
Expand Down

10 changes: 5 additions & 5 deletions
src/connector.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ use hyper;

/// Returns a function which creates an http-connector. Used for instantiating
/// clients with custom connectors
pub fn http_connector() -> Box<Fn(&Handle) -> hyper::client::HttpConnector + Send + Sync> {
pub fn http_connector() -> Box<dyn Fn(&Handle) -> hyper::client::HttpConnector + Send + Sync> {
 Box::new(move |handle: &Handle| hyper::client::HttpConnector::new(4, handle))
}

Expand All@@ -25,7 +25,7 @@ pub fn http_connector() -> Box<Fn(&Handle) -> hyper::client::HttpConnector + Sen
#[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))]
pub fn https_connector<CA>(
 ca_certificate: CA,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
{
Expand DownExpand Up@@ -53,7 +53,7 @@ where
#[cfg(any(target_os = "macos", target_os = "windows", target_os = "ios"))]
pub fn https_connector<CA>(
 _ca_certificate: CA,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
{
Expand All@@ -71,7 +71,7 @@ pub fn https_mutual_connector<CA, K, C>(
 ca_certificate: CA,
 client_key: K,
 client_certificate: C,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
 K: AsRef<Path>,
Expand DownExpand Up@@ -112,7 +112,7 @@ pub fn https_mutual_connector<CA, K, C>(
 _ca_certificate: CA,
 _client_key: K,
 _client_certificate: C,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
 K: AsRef<Path>,
Expand Down

8 changes: 4 additions & 4 deletions
src/context.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use std::marker::Sized;
/// type Request = (hyper::Request, C);
/// type Response = hyper::Response;
/// type Error = hyper::Error;
/// type Future = Box<Future<Item=Self::Response, Error=Self::Error>>;
/// type Future = Box<dyn Future<Item=Self::Response, Error=Self::Error>>;
/// fn call(&self, (req, context) : Self::Request) -> Self::Future {
/// do_something_with_my_item(Has::<MyItem>::get(&context));
/// Box::new(ok(hyper::Response::new()))
Expand DownExpand Up@@ -546,7 +546,7 @@ pub trait SwaggerService<C>:
 Request = (hyper::server::Request, C),
 Response = hyper::server::Response,
 Error = hyper::Error,
 Future = Box<Future<Item = hyper::server::Response, Error = hyper::Error>>,
 Future = Box<dyn Future<Item = hyper::server::Response, Error = hyper::Error>>,
 >
where
 C: Has<Option<AuthData>> + Has<Option<Authorization>> + Has<XSpanIdString> + Clone + 'static,
Expand All@@ -560,7 +560,7 @@ where
 Request = (hyper::server::Request, C),
 Response = hyper::server::Response,
 Error = hyper::Error,
 Future = Box<Future<Item = hyper::server::Response, Error = hyper::Error>>,
 Future = Box<dyn Future<Item = hyper::server::Response, Error = hyper::Error>>,
 >,
 C: Has<Option<AuthData>> + Has<Option<Authorization>> + Has<XSpanIdString> + Clone + 'static,
{
Expand DownExpand Up@@ -603,7 +603,7 @@ mod context_tests {
 type Request = (Request, C);
 type Response = Response;
 type Error = Error;
 type Future = Box<Future<Item = Response, Error = Error>>;
 type Future = Box<dyn Future<Item = Response, Error = Error>>;
 fn call(&self, (_, context): Self::Request) -> Self::Future {
 use_item_2(Has::<ContextItem2>::get(&context));

Expand Down

39 changes: 39 additions & 0 deletions
src/headers.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
//! Support library for handling headers in a safe manner

use hyper::header::{Header, Headers};

/// Trait to add a mechanism to safely retrieve a header.
///
/// In Hyper 0.11, if you add an Authorization<Basic> header,
/// and then attempt get an Authorization<Bearer> header, the code
/// will panic, as the type ID doesn't match.
pub trait SafeHeaders {
 /// Safely get a header from a hyper::header::Headers
 fn safe_get<H: Header>(&self) -> Option<H>;
}

impl SafeHeaders for Headers {
 fn safe_get<H: Header>(&self) -> Option<H> {
 self.get_raw(H::header_name())
 .map(H::parse_header)
 .map(Result::ok)
 .unwrap_or(None)
Comment thread
richardwhiuk marked this conversation as resolved.

 }
}

#[cfg(test)]
mod tests {
 use super::*;
 use hyper::header::{Authorization, Basic, Bearer};

 #[test]
 fn test() {
 let mut headers = Headers::default();
 let basic = Basic {
 username: "richard".to_string(),
 password: None,
 };
 headers.set::<Authorization<Basic>>(Authorization(basic));
 println!("Auth: {:?}", headers.safe_get::<Authorization<Bearer>>());
 }
}

4 changes: 3 additions & 1 deletion
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,8 @@ pub use drop_context::DropContext;
pub mod request_parser;
pub use request_parser::RequestParser;

pub mod headers;

header! {
 /// `X-Span-ID` header, used to track a request through a chain of microservices.
 (XSpanId, "X-Span-ID") => [String]
Expand DownExpand Up@@ -91,7 +93,7 @@ pub struct ApiError(pub String);

impl fmt::Display for ApiError {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 let debug: &fmt::Debug = self;
 let debug: &dyn fmt::Debug = self;
 debug.fmt(f)
 }
}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Handle Hyper 0.11's Headers implementation by richardwhiuk · Pull Request #90 · Metaswitch/swagger-rs · GitHub
Skip to content
Handle Hyper 0.11's Headers implementation#90

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

 Merged

bors
merged 4 commits into

from

Dec 12, 2019
 Merged


Handle Hyper 0.11's Headers implementation
#90
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
68b64b0

Handle Hyper 0.11's Headers implementation


richardwhiuk Dec 12, 2019
6cc9881

Fix warnings in Rust 1.39


richardwhiuk Dec 12, 2019
1b90891

Fix formatting


richardwhiuk Dec 12, 2019
ed5b6a9

Update CHANGELOG


richardwhiuk Dec 12, 2019

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


2 changes: 2 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]
### Added
- Add `SafeHeaders` to work around Hyper 0.11 panic handling differently type headers with the same name - e.g. Authorization
- Fix warnings present on Rust 1.39

### Changed

Expand Down

2 changes: 1 addition & 1 deletion
src/base64_format.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ impl<'de> Deserialize<'de> for ByteArray {
 where
 D: Deserializer<'de>,
 {
 let s = try!(String::deserialize(deserializer));
 let s = String::deserialize(deserializer)?;
 match decode(&s) {
 Ok(bin) => Ok(ByteArray(bin)),
 _ => Err(D::Error::custom("invalid base64")),
Expand Down

8 changes: 4 additions & 4 deletions
src/composites.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,10 +41,10 @@ impl NotFound for Response {
 }
}

type BoxedFuture<V, W> = Box<Future<Item = V, Error = W>>;
type CompositeNewServiceVec<U, V, W> = Vec<(&'static str, Box<BoxedNewService<U, V, W>>)>;
type BoxedFuture<V, W> = Box<dyn Future<Item = V, Error = W>>;
type CompositeNewServiceVec<U, V, W> = Vec<(&'static str, Box<dyn BoxedNewService<U, V, W>>)>;
type BoxedService<U, V, W> =
 Box<Service<Request = U, Response = V, Error = W, Future = BoxedFuture<V, W>>>;
 Box<dyn Service<Request = U, Response = V, Error = W, Future = BoxedFuture<V, W>>>;

/// Trait for wrapping hyper `NewService`s to make the return type of `new_service` uniform.
/// This is necessary in order for the `NewService`s with different `Instance` types to
Expand DownExpand Up@@ -185,7 +185,7 @@ where
 type Request = U;
 type Response = V;
 type Error = W;
 type Future = Box<Future<Item = V, Error = W>>;
 type Future = Box<dyn Future<Item = V, Error = W>>;

 fn call(&self, req: Self::Request) -> Self::Future {
 let mut result = None;
Expand Down

10 changes: 5 additions & 5 deletions
src/connector.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ use hyper;

/// Returns a function which creates an http-connector. Used for instantiating
/// clients with custom connectors
pub fn http_connector() -> Box<Fn(&Handle) -> hyper::client::HttpConnector + Send + Sync> {
pub fn http_connector() -> Box<dyn Fn(&Handle) -> hyper::client::HttpConnector + Send + Sync> {
 Box::new(move |handle: &Handle| hyper::client::HttpConnector::new(4, handle))
}

Expand All@@ -25,7 +25,7 @@ pub fn http_connector() -> Box<Fn(&Handle) -> hyper::client::HttpConnector + Sen
#[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))]
pub fn https_connector<CA>(
 ca_certificate: CA,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
{
Expand DownExpand Up@@ -53,7 +53,7 @@ where
#[cfg(any(target_os = "macos", target_os = "windows", target_os = "ios"))]
pub fn https_connector<CA>(
 _ca_certificate: CA,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
{
Expand All@@ -71,7 +71,7 @@ pub fn https_mutual_connector<CA, K, C>(
 ca_certificate: CA,
 client_key: K,
 client_certificate: C,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
 K: AsRef<Path>,
Expand DownExpand Up@@ -112,7 +112,7 @@ pub fn https_mutual_connector<CA, K, C>(
 _ca_certificate: CA,
 _client_key: K,
 _client_certificate: C,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
 K: AsRef<Path>,
Expand Down

8 changes: 4 additions & 4 deletions
src/context.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use std::marker::Sized;
/// type Request = (hyper::Request, C);
/// type Response = hyper::Response;
/// type Error = hyper::Error;
/// type Future = Box<Future<Item=Self::Response, Error=Self::Error>>;
/// type Future = Box<dyn Future<Item=Self::Response, Error=Self::Error>>;
/// fn call(&self, (req, context) : Self::Request) -> Self::Future {
/// do_something_with_my_item(Has::<MyItem>::get(&context));
/// Box::new(ok(hyper::Response::new()))
Expand DownExpand Up@@ -546,7 +546,7 @@ pub trait SwaggerService<C>:
 Request = (hyper::server::Request, C),
 Response = hyper::server::Response,
 Error = hyper::Error,
 Future = Box<Future<Item = hyper::server::Response, Error = hyper::Error>>,
 Future = Box<dyn Future<Item = hyper::server::Response, Error = hyper::Error>>,
 >
where
 C: Has<Option<AuthData>> + Has<Option<Authorization>> + Has<XSpanIdString> + Clone + 'static,
Expand All@@ -560,7 +560,7 @@ where
 Request = (hyper::server::Request, C),
 Response = hyper::server::Response,
 Error = hyper::Error,
 Future = Box<Future<Item = hyper::server::Response, Error = hyper::Error>>,
 Future = Box<dyn Future<Item = hyper::server::Response, Error = hyper::Error>>,
 >,
 C: Has<Option<AuthData>> + Has<Option<Authorization>> + Has<XSpanIdString> + Clone + 'static,
{
Expand DownExpand Up@@ -603,7 +603,7 @@ mod context_tests {
 type Request = (Request, C);
 type Response = Response;
 type Error = Error;
 type Future = Box<Future<Item = Response, Error = Error>>;
 type Future = Box<dyn Future<Item = Response, Error = Error>>;
 fn call(&self, (_, context): Self::Request) -> Self::Future {
 use_item_2(Has::<ContextItem2>::get(&context));

Expand Down

39 changes: 39 additions & 0 deletions
src/headers.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
//! Support library for handling headers in a safe manner

use hyper::header::{Header, Headers};

/// Trait to add a mechanism to safely retrieve a header.
///
/// In Hyper 0.11, if you add an Authorization<Basic> header,
/// and then attempt get an Authorization<Bearer> header, the code
/// will panic, as the type ID doesn't match.
pub trait SafeHeaders {
 /// Safely get a header from a hyper::header::Headers
 fn safe_get<H: Header>(&self) -> Option<H>;
}

impl SafeHeaders for Headers {
 fn safe_get<H: Header>(&self) -> Option<H> {
 self.get_raw(H::header_name())
 .map(H::parse_header)
 .map(Result::ok)
 .unwrap_or(None)
Comment thread
richardwhiuk marked this conversation as resolved.

 }
}

#[cfg(test)]
mod tests {
 use super::*;
 use hyper::header::{Authorization, Basic, Bearer};

 #[test]
 fn test() {
 let mut headers = Headers::default();
 let basic = Basic {
 username: "richard".to_string(),
 password: None,
 };
 headers.set::<Authorization<Basic>>(Authorization(basic));
 println!("Auth: {:?}", headers.safe_get::<Authorization<Bearer>>());
 }
}

4 changes: 3 additions & 1 deletion
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,8 @@ pub use drop_context::DropContext;
pub mod request_parser;
pub use request_parser::RequestParser;

pub mod headers;

header! {
 /// `X-Span-ID` header, used to track a request through a chain of microservices.
 (XSpanId, "X-Span-ID") => [String]
Expand DownExpand Up@@ -91,7 +93,7 @@ pub struct ApiError(pub String);

impl fmt::Display for ApiError {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 let debug: &fmt::Debug = self;
 let debug: &dyn fmt::Debug = self;
 debug.fmt(f)
 }
}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Handle Hyper 0.11's Headers implementation by richardwhiuk · Pull Request #90 · Metaswitch/swagger-rs · GitHub
Skip to content
Handle Hyper 0.11's Headers implementation#90

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

 Merged

bors
merged 4 commits into

from

Dec 12, 2019
 Merged


Handle Hyper 0.11's Headers implementation
#90
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
68b64b0

Handle Hyper 0.11's Headers implementation


richardwhiuk Dec 12, 2019
6cc9881

Fix warnings in Rust 1.39


richardwhiuk Dec 12, 2019
1b90891

Fix formatting


richardwhiuk Dec 12, 2019
ed5b6a9

Update CHANGELOG


richardwhiuk Dec 12, 2019

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


2 changes: 2 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]
### Added
- Add `SafeHeaders` to work around Hyper 0.11 panic handling differently type headers with the same name - e.g. Authorization
- Fix warnings present on Rust 1.39

### Changed

Expand Down

2 changes: 1 addition & 1 deletion
src/base64_format.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ impl<'de> Deserialize<'de> for ByteArray {
 where
 D: Deserializer<'de>,
 {
 let s = try!(String::deserialize(deserializer));
 let s = String::deserialize(deserializer)?;
 match decode(&s) {
 Ok(bin) => Ok(ByteArray(bin)),
 _ => Err(D::Error::custom("invalid base64")),
Expand Down

8 changes: 4 additions & 4 deletions
src/composites.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,10 +41,10 @@ impl NotFound for Response {
 }
}

type BoxedFuture<V, W> = Box<Future<Item = V, Error = W>>;
type CompositeNewServiceVec<U, V, W> = Vec<(&'static str, Box<BoxedNewService<U, V, W>>)>;
type BoxedFuture<V, W> = Box<dyn Future<Item = V, Error = W>>;
type CompositeNewServiceVec<U, V, W> = Vec<(&'static str, Box<dyn BoxedNewService<U, V, W>>)>;
type BoxedService<U, V, W> =
 Box<Service<Request = U, Response = V, Error = W, Future = BoxedFuture<V, W>>>;
 Box<dyn Service<Request = U, Response = V, Error = W, Future = BoxedFuture<V, W>>>;

/// Trait for wrapping hyper `NewService`s to make the return type of `new_service` uniform.
/// This is necessary in order for the `NewService`s with different `Instance` types to
Expand DownExpand Up@@ -185,7 +185,7 @@ where
 type Request = U;
 type Response = V;
 type Error = W;
 type Future = Box<Future<Item = V, Error = W>>;
 type Future = Box<dyn Future<Item = V, Error = W>>;

 fn call(&self, req: Self::Request) -> Self::Future {
 let mut result = None;
Expand Down

10 changes: 5 additions & 5 deletions
src/connector.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ use hyper;

/// Returns a function which creates an http-connector. Used for instantiating
/// clients with custom connectors
pub fn http_connector() -> Box<Fn(&Handle) -> hyper::client::HttpConnector + Send + Sync> {
pub fn http_connector() -> Box<dyn Fn(&Handle) -> hyper::client::HttpConnector + Send + Sync> {
 Box::new(move |handle: &Handle| hyper::client::HttpConnector::new(4, handle))
}

Expand All@@ -25,7 +25,7 @@ pub fn http_connector() -> Box<Fn(&Handle) -> hyper::client::HttpConnector + Sen
#[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))]
pub fn https_connector<CA>(
 ca_certificate: CA,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
{
Expand DownExpand Up@@ -53,7 +53,7 @@ where
#[cfg(any(target_os = "macos", target_os = "windows", target_os = "ios"))]
pub fn https_connector<CA>(
 _ca_certificate: CA,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
{
Expand All@@ -71,7 +71,7 @@ pub fn https_mutual_connector<CA, K, C>(
 ca_certificate: CA,
 client_key: K,
 client_certificate: C,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
 K: AsRef<Path>,
Expand DownExpand Up@@ -112,7 +112,7 @@ pub fn https_mutual_connector<CA, K, C>(
 _ca_certificate: CA,
 _client_key: K,
 _client_certificate: C,
) -> Box<Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
) -> Box<dyn Fn(&Handle) -> hyper_tls::HttpsConnector<hyper::client::HttpConnector> + Send + Sync>
where
 CA: AsRef<Path>,
 K: AsRef<Path>,
Expand Down

8 changes: 4 additions & 4 deletions
src/context.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use std::marker::Sized;
/// type Request = (hyper::Request, C);
/// type Response = hyper::Response;
/// type Error = hyper::Error;
/// type Future = Box<Future<Item=Self::Response, Error=Self::Error>>;
/// type Future = Box<dyn Future<Item=Self::Response, Error=Self::Error>>;
/// fn call(&self, (req, context) : Self::Request) -> Self::Future {
/// do_something_with_my_item(Has::<MyItem>::get(&context));
/// Box::new(ok(hyper::Response::new()))
Expand DownExpand Up@@ -546,7 +546,7 @@ pub trait SwaggerService<C>:
 Request = (hyper::server::Request, C),
 Response = hyper::server::Response,
 Error = hyper::Error,
 Future = Box<Future<Item = hyper::server::Response, Error = hyper::Error>>,
 Future = Box<dyn Future<Item = hyper::server::Response, Error = hyper::Error>>,
 >
where
 C: Has<Option<AuthData>> + Has<Option<Authorization>> + Has<XSpanIdString> + Clone + 'static,
Expand All@@ -560,7 +560,7 @@ where
 Request = (hyper::server::Request, C),
 Response = hyper::server::Response,
 Error = hyper::Error,
 Future = Box<Future<Item = hyper::server::Response, Error = hyper::Error>>,
 Future = Box<dyn Future<Item = hyper::server::Response, Error = hyper::Error>>,
 >,
 C: Has<Option<AuthData>> + Has<Option<Authorization>> + Has<XSpanIdString> + Clone + 'static,
{
Expand DownExpand Up@@ -603,7 +603,7 @@ mod context_tests {
 type Request = (Request, C);
 type Response = Response;
 type Error = Error;
 type Future = Box<Future<Item = Response, Error = Error>>;
 type Future = Box<dyn Future<Item = Response, Error = Error>>;
 fn call(&self, (_, context): Self::Request) -> Self::Future {
 use_item_2(Has::<ContextItem2>::get(&context));

Expand Down

39 changes: 39 additions & 0 deletions
src/headers.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
//! Support library for handling headers in a safe manner

use hyper::header::{Header, Headers};

/// Trait to add a mechanism to safely retrieve a header.
///
/// In Hyper 0.11, if you add an Authorization<Basic> header,
/// and then attempt get an Authorization<Bearer> header, the code
/// will panic, as the type ID doesn't match.
pub trait SafeHeaders {
 /// Safely get a header from a hyper::header::Headers
 fn safe_get<H: Header>(&self) -> Option<H>;
}

impl SafeHeaders for Headers {
 fn safe_get<H: Header>(&self) -> Option<H> {
 self.get_raw(H::header_name())
 .map(H::parse_header)
 .map(Result::ok)
 .unwrap_or(None)
Comment thread
richardwhiuk marked this conversation as resolved.

 }
}

#[cfg(test)]
mod tests {
 use super::*;
 use hyper::header::{Authorization, Basic, Bearer};

 #[test]
 fn test() {
 let mut headers = Headers::default();
 let basic = Basic {
 username: "richard".to_string(),
 password: None,
 };
 headers.set::<Authorization<Basic>>(Authorization(basic));
 println!("Auth: {:?}", headers.safe_get::<Authorization<Bearer>>());
 }
}

4 changes: 3 additions & 1 deletion
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,8 @@ pub use drop_context::DropContext;
pub mod request_parser;
pub use request_parser::RequestParser;

pub mod headers;

header! {
 /// `X-Span-ID` header, used to track a request through a chain of microservices.
 (XSpanId, "X-Span-ID") => [String]
Expand DownExpand Up@@ -91,7 +93,7 @@ pub struct ApiError(pub String);

impl fmt::Display for ApiError {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 let debug: &fmt::Debug = self;
 let debug: &dyn fmt::Debug = self;
 debug.fmt(f)
 }
}
Expand Down