Fix console dapp (#4544)

* Fixing linting issues. Better support for console as secure app * Fixing linting issues
openethereum · Feb 16, 2017 · d3b89f2 · d3b89f2
1 parent 9ee0895
commit d3b89f2
Show file tree

Hide file tree

Showing 6 changed files with 573 additions and 460 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dapps/src/lib.rs b/dapps/src/lib.rs
@@ -312,7 +312,7 @@ impl Server {
 
 		let special = Arc::new({
 			let mut special = HashMap::new();
-			special.insert(router::SpecialEndpoint::Rpc, rpc::rpc(handler, panic_handler.clone()));
+			special.insert(router::SpecialEndpoint::Rpc, rpc::rpc(handler, cors_domains.clone(), panic_handler.clone()));
 			special.insert(router::SpecialEndpoint::Utils, apps::utils());
 			special.insert(
 				router::SpecialEndpoint::Api,

diff --git a/dapps/src/rpc.rs b/dapps/src/rpc.rs
@@ -21,11 +21,15 @@ use jsonrpc_core::{IoHandler, ResponseHandler, Request, Response};
 use jsonrpc_http_server::{ServerHandler, PanicHandler, AccessControlAllowOrigin, RpcHandler};
 use endpoint::{Endpoint, EndpointPath, Handler};
 
-pub fn rpc(handler: Arc<IoHandler>, panic_handler: Arc<Mutex<Option<Box<Fn() -> () + Send>>>>) -> Box<Endpoint> {
+pub fn rpc(
+	handler: Arc<IoHandler>,
+	cors_domains: Vec<String>,
+	panic_handler: Arc<Mutex<Option<Box<Fn() -> () + Send>>>>,
+) -> Box<Endpoint> {
 	Box::new(RpcEndpoint {
 		handler: Arc::new(RpcMiddleware::new(handler)),
 		panic_handler: panic_handler,
-		cors_domain: None,
+		cors_domain: Some(cors_domains.into_iter().map(AccessControlAllowOrigin::Value).collect()),
 		// NOTE [ToDr] We don't need to do any hosts validation here. It's already done in router.
 		allowed_hosts: None,
 	})