grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Secure WS-RPC: grant access to all apis (#10246)

Browse Source
This commit is contained in:
Axel Chalon 2019-02-08 14:11:55 +01:00 committed by Afri Schoedon
parent 046b8bbc8a
commit 3502b36232
2 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parity/rpc.rs
View File

@ -151,7 +151,7 @@ pub fn new_ws<D: rpc_apis::Dependencies>(
let url = format!("{}:{}", conf.interface, conf.port); let url = format!("{}:{}", conf.interface, conf.port);
let addr = url.parse().map_err(|_| format!("Invalid WebSockets listen host/port given: {}", url))?; let addr = url.parse().map_err(|_| format!("Invalid WebSockets listen host/port given: {}", url))?;
let full_handler = setup_apis(rpc_apis::ApiSet::SafeContext, deps); let full_handler = setup_apis(rpc_apis::ApiSet::All, deps);
let handler = { let handler = {
let mut handler = MetaIoHandler::with_middleware(( let mut handler = MetaIoHandler::with_middleware((
rpc::WsDispatcher::new(full_handler), rpc::WsDispatcher::new(full_handler),

41
parity/rpc_apis.rs
View File

@ -113,11 +113,9 @@ impl FromStr for Api {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub enum ApiSet { pub enum ApiSet {
// Safe context (like token-protected WS interface)
SafeContext,
// Unsafe context (like jsonrpc over http) // Unsafe context (like jsonrpc over http)
UnsafeContext, UnsafeContext,
// All possible APIs // All possible APIs (safe context like token-protected WS interface)
All, All,
// Local "unsafe" context and accounts access // Local "unsafe" context and accounts access
IpcContext, IpcContext,
@ -723,16 +721,6 @@ impl ApiSet {
public_list.insert(Api::ParityAccounts); public_list.insert(Api::ParityAccounts);
public_list public_list
} }
ApiSet::SafeContext => {
public_list.insert(Api::Debug);
public_list.insert(Api::Traces);
public_list.insert(Api::ParityPubSub);
public_list.insert(Api::ParityAccounts);
public_list.insert(Api::ParitySet);
public_list.insert(Api::Signer);
public_list.insert(Api::SecretStore);
public_list
}
ApiSet::All => { ApiSet::All => {
public_list.insert(Api::Debug); public_list.insert(Api::Debug);
public_list.insert(Api::Traces); public_list.insert(Api::Traces);
@ -838,33 +826,6 @@ mod test {
assert_eq!(ApiSet::IpcContext.list_apis(), expected); assert_eq!(ApiSet::IpcContext.list_apis(), expected);
} }
#[test]
fn test_api_set_safe_context() {
let expected = vec![
// safe
Api::Web3,
Api::Net,
Api::Eth,
Api::EthPubSub,
Api::Parity,
Api::ParityPubSub,
Api::Traces,
Api::Rpc,
Api::SecretStore,
Api::Whisper,
Api::WhisperPubSub,
Api::Private,
// semi-safe
Api::ParityAccounts,
// Unsafe
Api::ParitySet,
Api::Signer,
Api::Debug,
].into_iter()
.collect();
assert_eq!(ApiSet::SafeContext.list_apis(), expected);
}
#[test] #[test]
fn test_all_apis() { fn test_all_apis() {
assert_eq!( assert_eq!(