Merge pull request #6566 from paritytech/td-rpc-url-fix

Use host as ws/dapps url if present.

js/src/api/local/localAccountsMiddleware.js

@@ -188,16 +188,6 @@ export default class LocalAccountsMiddleware extends Middleware {
       return [];
     });
 
-    register('parity_wsUrl', () => {
-      // This is a hack, will be replaced by a `hostname` setting on the node itself
-      return `${window.location.hostname}:8546`;
-    });
-
-    register('parity_dappsUrl', () => {
-      // This is a hack, will be replaced by a `hostname` setting on the node itself
-      return `${window.location.hostname}:8545`;
-    });
-
     register('parity_hashContent', () => {
       throw new Error('Functionality unavailable on a public wallet.');
     });

js/src/secureApi.js

@@ -82,7 +82,7 @@ export default class SecureApi extends Api {
 
     return {
       host,
-      port: parseInt(port, 10)
+      port: port ? parseInt(port, 10) : null
     };
   }
 
@@ -93,7 +93,9 @@ export default class SecureApi extends Api {
   get dappsUrl () {
     const { port } = this._dappsAddress;
 
-    return `${this.protocol()}//${this.hostname}:${port}`;
+    return port
+      ? `${this.protocol()}//${this.hostname}:${port}`
+      : `${this.protocol()}//${this.hostname}`;
   }
 
   get hostname () {

parity/configuration.rs

@@ -1322,7 +1322,7 @@ mod tests {
 			origins: Some(vec!["chrome-extension://*".into(), "moz-extension://*".into()]),
 			hosts: Some(vec![]),
 			signer_path: expected.into(),
-			ui_address: Some(("127.0.0.1".to_owned(), 8180)),
+			ui_address: Some("127.0.0.1:8180".into()),
 			support_token_api: true
 		}, UiConfiguration {
 			enabled: true,

parity/dapps.rs

@@ -57,7 +57,7 @@ impl Default for Configuration {
 }
 
 impl Configuration {
-	pub fn address(&self, address: Option<(String, u16)>) -> Option<(String, u16)> {
+	pub fn address(&self, address: Option<::parity_rpc::Host>) -> Option<::parity_rpc::Host> {
 		match self.enabled {
 			true => address,
 			false => None,

parity/rpc.rs

@@ -47,11 +47,8 @@ pub struct HttpConfiguration {
 }
 
 impl HttpConfiguration {
-	pub fn address(&self) -> Option<(String, u16)> {
+	pub fn address(&self) -> Option<rpc::Host> {
-		match self.enabled {
+		address(self.enabled, &self.interface, self.port, &self.hosts)
-			true => Some((self.interface.clone(), self.port)),
-			false => None,
-		}
 	}
 }
 
@@ -79,11 +76,18 @@ pub struct UiConfiguration {
 }
 
 impl UiConfiguration {
-	pub fn address(&self) -> Option<(String, u16)> {
+	pub fn address(&self) -> Option<rpc::Host> {
-		match self.enabled {
+		address(self.enabled, &self.interface, self.port, &self.hosts)
-			true => Some((self.interface.clone(), self.port)),
+	}
-			false => None,
+
-		}
+	pub fn redirection_address(&self) -> Option<(String, u16)> {
+		self.address().map(|host| {
+			let mut it = host.split(':');
+			let hostname: Option<String> = it.next().map(|s| s.to_owned());
+			let port: Option<u16> = it.next().and_then(|s| s.parse().ok());
+
+			(hostname.unwrap_or_else(|| "localhost".into()), port.unwrap_or(8180))
+		})
 	}
 }
 
@@ -145,7 +149,7 @@ pub struct WsConfiguration {
 	pub hosts: Option<Vec<String>>,
 	pub signer_path: PathBuf,
 	pub support_token_api: bool,
-	pub ui_address: Option<(String, u16)>,
+	pub ui_address: Option<rpc::Host>,
 }
 
 impl Default for WsConfiguration {
@@ -160,17 +164,25 @@ impl Default for WsConfiguration {
 			hosts: Some(Vec::new()),
 			signer_path: replace_home(&data_dir, "$BASE/signer").into(),
 			support_token_api: true,
-			ui_address: Some(("127.0.0.1".to_owned(), 8180)),
+			ui_address: Some("127.0.0.1:8180".into()),
 		}
 	}
 }
 
 impl WsConfiguration {
-	pub fn address(&self) -> Option<(String, u16)> {
+	pub fn address(&self) -> Option<rpc::Host> {
-		match self.enabled {
+		address(self.enabled, &self.interface, self.port, &self.hosts)
-			true => Some((self.interface.clone(), self.port)),
+	}
-			false => None,
+}
-		}
+
+fn address(enabled: bool, bind_iface: &str, bind_port: u16, hosts: &Option<Vec<String>>) -> Option<rpc::Host> {
+	if !enabled {
+		return None;
+	}
+
+	match *hosts {
+		Some(ref hosts) if !hosts.is_empty() => Some(hosts[0].clone().into()),
+		_ => Some(format!("{}:{}", bind_iface, bind_port).into()),
 	}
 }
 
@@ -190,17 +202,15 @@ pub fn new_ws<D: rpc_apis::Dependencies>(
 	}
 
 	let domain = DAPPS_DOMAIN;
-	let ws_address = (conf.interface, conf.port);
+	let url = format!("{}:{}", conf.interface, conf.port);
-	let url = format!("{}:{}", ws_address.0, ws_address.1);
 	let addr = url.parse().map_err(|_| format!("Invalid WebSockets listen host/port given: {}", url))?;
 
 
-	let pool = deps.pool.clone();
+	let full_handler = setup_apis(rpc_apis::ApiSet::SafeContext, deps);
-	let full_handler = setup_apis(rpc_apis::ApiSet::SafeContext, deps, pool.clone());
 	let handler = {
 		let mut handler = MetaIoHandler::with_middleware((
 			rpc::WsDispatcher::new(full_handler),
-			Middleware::new(deps.stats.clone(), deps.apis.activity_notifier(), pool)
+			Middleware::new(deps.stats.clone(), deps.apis.activity_notifier(), deps.pool.clone())
 		));
 		let apis = conf.apis.list_apis();
 		deps.apis.extend_with_set(&mut handler, &apis);
@@ -210,8 +220,8 @@ pub fn new_ws<D: rpc_apis::Dependencies>(
 
 	let remote = deps.remote.clone();
 	let ui_address = conf.ui_address.clone();
-	let allowed_origins = into_domains(with_domain(conf.origins, domain, &[ui_address]));
+	let allowed_origins = into_domains(with_domain(conf.origins, domain, &ui_address));
-	let allowed_hosts = into_domains(with_domain(conf.hosts, domain, &[Some(ws_address)]));
+	let allowed_hosts = into_domains(with_domain(conf.hosts, domain, &Some(url.clone().into())));
 
 	let signer_path;
 	let path = match conf.support_token_api && conf.ui_address.is_some() {
@@ -253,15 +263,13 @@ pub fn new_http<D: rpc_apis::Dependencies>(
 	}
 
 	let domain = DAPPS_DOMAIN;
-	let http_address = (conf.interface, conf.port);
+	let url = format!("{}:{}", conf.interface, conf.port);
-	let url = format!("{}:{}", http_address.0, http_address.1);
 	let addr = url.parse().map_err(|_| format!("Invalid {} listen host/port given: {}", id, url))?;
-	let pool = deps.pool.clone();
+	let handler = setup_apis(conf.apis, deps);
-	let handler = setup_apis(conf.apis, deps, pool);
 	let remote = deps.remote.clone();
 
 	let cors_domains = into_domains(conf.cors);
-	let allowed_hosts = into_domains(with_domain(conf.hosts, domain, &[Some(http_address)]));
+	let allowed_hosts = into_domains(with_domain(conf.hosts, domain, &Some(url.clone().into())));
 
 	let start_result = rpc::start_http(
 		&addr,
@@ -296,8 +304,7 @@ pub fn new_ipc<D: rpc_apis::Dependencies>(
 		return Ok(None);
 	}
 
-	let pool = dependencies.pool.clone();
+	let handler = setup_apis(conf.apis, dependencies);
-	let handler = setup_apis(conf.apis, dependencies, pool);
 	let remote = dependencies.remote.clone();
 	match rpc::start_ipc(&conf.socket_addr, handler, remote, rpc::RpcExtractor) {
 		Ok(server) => Ok(Some(server)),
@@ -309,29 +316,46 @@ fn into_domains<T: From<String>>(items: Option<Vec<String>>) -> DomainsValidatio
 	items.map(|vals| vals.into_iter().map(T::from).collect()).into()
 }
 
-fn with_domain(items: Option<Vec<String>>, domain: &str, addresses: &[Option<(String, u16)>]) -> Option<Vec<String>> {
+fn with_domain(items: Option<Vec<String>>, domain: &str, address: &Option<rpc::Host>) -> Option<Vec<String>> {
+	fn extract_port(s: &str) -> Option<u16> {
+		s.split(':').nth(1).and_then(|s| s.parse().ok())
+	}
+
 	items.map(move |items| {
 		let mut items = items.into_iter().collect::<HashSet<_>>();
-		for address in addresses {
+		if let Some(host) = address.clone() {
-			if let Some((host, port)) = address.clone() {
+			items.insert(host.to_string());
-				items.insert(format!("{}:{}", host, port));
+			items.insert(host.replace("127.0.0.1", "localhost"));
-				items.insert(format!("{}:{}", host.replace("127.0.0.1", "localhost"), port));
+			items.insert(format!("http://*.{}", domain)); //proxypac
+			if let Some(port) = extract_port(&*host) {
 				items.insert(format!("http://*.{}:{}", domain, port));
-				items.insert(format!("http://*.{}", domain)); //proxypac
 			}
 		}
 		items.into_iter().collect()
 	})
 }
 
-fn setup_apis<D>(apis: ApiSet, deps: &Dependencies<D>, pool: Option<CpuPool>) -> MetaIoHandler<Metadata, Middleware<D::Notifier>>
+fn setup_apis<D>(apis: ApiSet, deps: &Dependencies<D>) -> MetaIoHandler<Metadata, Middleware<D::Notifier>>
 	where D: rpc_apis::Dependencies
 {
 	let mut handler = MetaIoHandler::with_middleware(
-		Middleware::new(deps.stats.clone(), deps.apis.activity_notifier(), pool)
+		Middleware::new(deps.stats.clone(), deps.apis.activity_notifier(), deps.pool.clone())
 	);
 	let apis = apis.list_apis();
 	deps.apis.extend_with_set(&mut handler, &apis);
 
 	handler
 }
+
+#[cfg(test)]
+mod tests {
+	use super::address;
+
+	#[test]
+	fn should_return_proper_address() {
+		assert_eq!(address(false, "localhost", 8180, &None), None);
+		assert_eq!(address(true, "localhost", 8180, &None), Some("localhost:8180".into()));
+		assert_eq!(address(true, "localhost", 8180, &Some(vec!["host:443".into()])), Some("host:443".into()));
+		assert_eq!(address(true, "localhost", 8180, &Some(vec!["host".into()])), Some("host".into()));
+	}
+}

parity/rpc_apis.rs

@@ -37,7 +37,7 @@ use node_health::NodeHealth;
 use parity_reactor;
 use parity_rpc::dispatch::{FullDispatcher, LightDispatcher};
 use parity_rpc::informant::{ActivityNotifier, ClientNotifier};
-use parity_rpc::{Metadata, NetworkSettings};
+use parity_rpc::{Metadata, NetworkSettings, Host};
 use updater::Updater;
 use parking_lot::{Mutex, RwLock};
 
@@ -222,8 +222,8 @@ pub struct FullDependencies {
 	pub health: NodeHealth,
 	pub geth_compatibility: bool,
 	pub dapps_service: Option<Arc<DappsService>>,
-	pub dapps_address: Option<(String, u16)>,
+	pub dapps_address: Option<Host>,
-	pub ws_address: Option<(String, u16)>,
+	pub ws_address: Option<Host>,
 	pub fetch: FetchClient,
 	pub remote: parity_reactor::Remote,
 	pub whisper_rpc: Option<::whisper::RpcFactory>,
@@ -412,8 +412,8 @@ pub struct LightDependencies<T> {
 	pub cache: Arc<Mutex<LightDataCache>>,
 	pub transaction_queue: Arc<RwLock<LightTransactionQueue>>,
 	pub dapps_service: Option<Arc<DappsService>>,
-	pub dapps_address: Option<(String, u16)>,
+	pub dapps_address: Option<Host>,
-	pub ws_address: Option<(String, u16)>,
+	pub ws_address: Option<Host>,
 	pub fetch: FetchClient,
 	pub geth_compatibility: bool,
 	pub remote: parity_reactor::Remote,

parity/run.rs

@@ -329,7 +329,7 @@ fn execute_light(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) ->
 			remote: event_loop.raw_remote(),
 			fetch: fetch.clone(),
 			signer: signer_service.clone(),
-			ui_address: cmd.ui_conf.address(),
+			ui_address: cmd.ui_conf.redirection_address(),
 		})
 	};
 
@@ -723,7 +723,7 @@ pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> R
 			remote: event_loop.raw_remote(),
 			fetch: fetch.clone(),
 			signer: signer_service.clone(),
-			ui_address: cmd.ui_conf.address(),
+			ui_address: cmd.ui_conf.redirection_address(),
 		})
 	};
 	let dapps_middleware = dapps::new(cmd.dapps_conf.clone(), dapps_deps.clone())?;

rpc/src/v1/helpers/mod.rs

@@ -51,6 +51,6 @@ pub use self::signer::SignerService;
 pub use self::subscribers::Subscribers;
 pub use self::subscription_manager::GenericPollManager;
 
-pub fn to_url(address: &Option<(String, u16)>) -> Option<String> {
+pub fn to_url(address: &Option<::Host>) -> Option<String> {
-	address.as_ref().map(|&(ref iface, ref port)| format!("{}:{}", iface, port))
+	address.as_ref().map(|host| (**host).to_owned())
 }

rpc/src/v1/impls/light/parity.rs

@@ -46,6 +46,7 @@ use v1::types::{
 	OperationsInfo, DappId, ChainStatus,
 	AccountInfo, HwAccountInfo, Header, RichHeader,
 };
+use Host;
 
 /// Parity implementation for light client.
 pub struct ParityClient {
@@ -55,8 +56,8 @@ pub struct ParityClient {
 	settings: Arc<NetworkSettings>,
 	health: NodeHealth,
 	signer: Option<Arc<SignerService>>,
-	dapps_address: Option<(String, u16)>,
+	dapps_address: Option<Host>,
-	ws_address: Option<(String, u16)>,
+	ws_address: Option<Host>,
 	eip86_transition: u64,
 }
 
@@ -70,8 +71,8 @@ impl ParityClient {
 		settings: Arc<NetworkSettings>,
 		health: NodeHealth,
 		signer: Option<Arc<SignerService>>,
-		dapps_address: Option<(String, u16)>,
+		dapps_address: Option<Host>,
-		ws_address: Option<(String, u16)>,
+		ws_address: Option<Host>,
 	) -> Self {
 		ParityClient {
 			light_dispatch,

rpc/src/v1/impls/parity.rs

@@ -51,6 +51,7 @@ use v1::types::{
 	OperationsInfo, DappId, ChainStatus,
 	AccountInfo, HwAccountInfo, RichHeader
 };
+use Host;
 
 /// Parity implementation.
 pub struct ParityClient<C, M, U>  {
@@ -64,8 +65,8 @@ pub struct ParityClient<C, M, U>  {
 	logger: Arc<RotatingLogger>,
 	settings: Arc<NetworkSettings>,
 	signer: Option<Arc<SignerService>>,
-	dapps_address: Option<(String, u16)>,
+	dapps_address: Option<Host>,
-	ws_address: Option<(String, u16)>,
+	ws_address: Option<Host>,
 	eip86_transition: u64,
 }
 
@@ -84,8 +85,8 @@ impl<C, M, U> ParityClient<C, M, U> where
 		logger: Arc<RotatingLogger>,
 		settings: Arc<NetworkSettings>,
 		signer: Option<Arc<SignerService>>,
-		dapps_address: Option<(String, u16)>,
+		dapps_address: Option<Host>,
-		ws_address: Option<(String, u16)>,
+		ws_address: Option<Host>,
 	) -> Self {
 		let eip86_transition = client.eip86_transition();
 		ParityClient {

rpc/src/v1/tests/mocked/parity.rs

@@ -31,6 +31,7 @@ use v1::metadata::Metadata;
 use v1::helpers::{SignerService, NetworkSettings};
 use v1::tests::helpers::{TestSyncProvider, Config, TestMinerService, TestUpdater};
 use super::manage_network::TestManageNetwork;
+use Host;
 
 pub type TestParityClient = ParityClient<TestBlockChainClient, TestMinerService, TestUpdater>;
 
@@ -44,8 +45,8 @@ pub struct Dependencies {
 	pub settings: Arc<NetworkSettings>,
 	pub network: Arc<ManageNetwork>,
 	pub accounts: Arc<AccountProvider>,
-	pub dapps_address: Option<(String, u16)>,
+	pub dapps_address: Option<Host>,
-	pub ws_address: Option<(String, u16)>,
+	pub ws_address: Option<Host>,
 }
 
 impl Dependencies {
@@ -74,8 +75,8 @@ impl Dependencies {
 			}),
 			network: Arc::new(TestManageNetwork),
 			accounts: Arc::new(AccountProvider::transient_provider()),
-			dapps_address: Some(("127.0.0.1".into(), 18080)),
+			dapps_address: Some("127.0.0.1:18080".into()),
-			ws_address: Some(("127.0.0.1".into(), 18546)),
+			ws_address: Some("127.0.0.1:18546".into()),
 		}
 	}