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.
119 lines
3.2 KiB
Rust
119 lines
3.2 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/>.
|
|
|
|
use devtools::http_client;
|
|
use jsonrpc_core::MetaIoHandler;
|
|
use http::{self, hyper};
|
|
|
|
use {HttpServer};
|
|
use tests::helpers::Server;
|
|
use v1::{extractors, Metadata};
|
|
|
|
fn serve(handler: Option<MetaIoHandler<Metadata>>) -> Server<HttpServer> {
|
|
let address = "127.0.0.1:0".parse().unwrap();
|
|
let handler = handler.unwrap_or_default();
|
|
|
|
Server::new(|_remote| ::start_http_with_middleware(
|
|
&address,
|
|
http::DomainsValidation::Disabled,
|
|
http::DomainsValidation::Disabled,
|
|
handler,
|
|
extractors::RpcExtractor,
|
|
|request: hyper::Request<hyper::Body>| {
|
|
http::RequestMiddlewareAction::Proceed {
|
|
should_continue_on_invalid_cors: false,
|
|
request,
|
|
}
|
|
},
|
|
1,
|
|
5,
|
|
).unwrap())
|
|
}
|
|
|
|
/// Test a single request to running server
|
|
fn request(server: Server<HttpServer>, request: &str) -> http_client::Response {
|
|
http_client::request(server.server.address(), request)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use jsonrpc_core::{MetaIoHandler, Value};
|
|
use v1::Metadata;
|
|
use super::{request, Server};
|
|
|
|
fn serve() -> (Server<::HttpServer>, ::std::net::SocketAddr) {
|
|
let mut io = MetaIoHandler::default();
|
|
io.add_method_with_meta("hello", |_, meta: Metadata| {
|
|
Ok(Value::String(format!("{}", meta.origin)))
|
|
});
|
|
let server = super::serve(Some(io));
|
|
let address = server.server.address().to_owned();
|
|
|
|
(server, address)
|
|
}
|
|
|
|
#[test]
|
|
fn should_extract_rpc_origin() {
|
|
// given
|
|
let (server, address) = serve();
|
|
|
|
// when
|
|
let req = r#"{"method":"hello","params":[],"jsonrpc":"2.0","id":1}"#;
|
|
let expected = "{\"jsonrpc\":\"2.0\",\"result\":\"unknown origin / unknown agent via RPC\",\"id\":1}\n";
|
|
let res = request(server,
|
|
&format!("\
|
|
POST / HTTP/1.1\r\n\
|
|
Host: {}\r\n\
|
|
Content-Type: application/json\r\n\
|
|
Content-Length: {}\r\n\
|
|
Connection: close\r\n\
|
|
\r\n\
|
|
{}
|
|
", address, req.len(), req)
|
|
);
|
|
|
|
// then
|
|
res.assert_status("HTTP/1.1 200 OK");
|
|
assert_eq!(res.body, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn should_extract_rpc_origin_with_service() {
|
|
// given
|
|
let (server, address) = serve();
|
|
|
|
// when
|
|
let req = r#"{"method":"hello","params":[],"jsonrpc":"2.0","id":1}"#;
|
|
let expected = "{\"jsonrpc\":\"2.0\",\"result\":\"unknown origin / curl/7.16.3 via RPC\",\"id\":1}\n";
|
|
let res = request(server,
|
|
&format!("\
|
|
POST / HTTP/1.1\r\n\
|
|
Host: {}\r\n\
|
|
Content-Type: application/json\r\n\
|
|
Content-Length: {}\r\n\
|
|
Connection: close\r\n\
|
|
User-Agent: curl/7.16.3\r\n\
|
|
\r\n\
|
|
{}
|
|
", address, req.len(), req)
|
|
);
|
|
|
|
// then
|
|
res.assert_status("HTTP/1.1 200 OK");
|
|
assert_eq!(res.body, expected);
|
|
}
|
|
}
|