68ca8df22f
* Replace `tokio_core` with `tokio`.
* Remove `tokio-core` and replace with `tokio` in
- `ethcore/stratum`
- `secret_store`
- `util/fetch`
- `util/reactor`
* Bump hyper to 0.12 in
- `miner`
- `util/fake-fetch`
- `util/fetch`
- `secret_store`
* Bump `jsonrpc-***` to 0.9 in
- `parity`
- `ethcore/stratum`
- `ipfs`
- `rpc`
- `rpc_client`
- `whisper`
* Bump `ring` to 0.13
* Use a more graceful shutdown process in `secret_store` tests.
* Convert some mutexes to rwlocks in `secret_store`.
* Consolidate Tokio Runtime use, remove `CpuPool`.
* Rename and move the `tokio_reactor` crate (`util/reactor`) to
`tokio_runtime` (`util/runtime`).
* Rename `EventLoop` to `Runtime`.
- Rename `EventLoop::spawn` to `Runtime::with_default_thread_count`.
- Add the `Runtime::with_thread_count` method.
- Rename `Remote` to `Executor`.
* Remove uses of `CpuPool` and spawn all tasks via the `Runtime` executor
instead.
* Other changes related to `CpuPool` removal:
- Remove `Reservations::with_pool`. `::new` now takes an `Executor` as an argument.
- Remove `SenderReservations::with_pool`. `::new` now takes an `Executor` as an argument.
55 lines
1.7 KiB
Rust
55 lines
1.7 KiB
Rust
// Copyright 2015-2018 Parity Technologies (UK) Ltd.
|
|
// This file is part of Parity.
|
|
|
|
// Parity is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Parity is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
//! Transport-specific metadata extractors.
|
|
|
|
use jsonrpc_core;
|
|
use http;
|
|
use hyper;
|
|
|
|
/// HTTP RPC server impl-independent metadata extractor
|
|
pub trait HttpMetaExtractor: Send + Sync + 'static {
|
|
/// Type of Metadata
|
|
type Metadata: jsonrpc_core::Metadata;
|
|
/// Extracts metadata from given params.
|
|
fn read_metadata(&self, origin: Option<String>, user_agent: Option<String>) -> Self::Metadata;
|
|
}
|
|
|
|
pub struct MetaExtractor<T> {
|
|
extractor: T,
|
|
}
|
|
|
|
impl<T> MetaExtractor<T> {
|
|
pub fn new(extractor: T) -> Self {
|
|
MetaExtractor { extractor }
|
|
}
|
|
}
|
|
|
|
impl<M, T> http::MetaExtractor<M> for MetaExtractor<T> where
|
|
T: HttpMetaExtractor<Metadata = M>,
|
|
M: jsonrpc_core::Metadata,
|
|
{
|
|
fn read_metadata(&self, req: &hyper::Request<hyper::Body>) -> M {
|
|
let as_string = |header: Option<&hyper::header::HeaderValue>| {
|
|
header.and_then(|val| val.to_str().ok().map(|s| s.to_owned()))
|
|
};
|
|
|
|
let origin = as_string(req.headers().get("origin"));
|
|
let user_agent = as_string(req.headers().get("user-agent"));
|
|
self.extractor.read_metadata(origin, user_agent)
|
|
}
|
|
}
|