Resolving URLs from contract (#1964)

* Fetching dapp from github. * Unpacking dapp * Removing hardcodes * Proper Host validation * Randomizing paths * Splitting into files * Serving donwloaded apps from different path * Extracting URLHint to separate module * Whitespace and docs * Resolving from URLHint contract * Fixing test * Resolving githubhint url from registrar * Proper redirections * Fixing test * fixing ethstore [ci skip] * Correct version of registrar * Removing superfluous Box
openethereum · Aug 23, 2016 · 124a5da · 124a5da
1 parent dda57d9
commit 124a5da
Show file tree

Hide file tree

Showing 17 changed files with 434 additions and 101 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dapps/Cargo.toml b/dapps/Cargo.toml
@@ -21,6 +21,7 @@ serde = "0.7.0"
 serde_json = "0.7.0"
 serde_macros = { version = "0.7.0", optional = true }
 zip = { version = "0.1", default-features = false }
+ethabi = "0.2.1"
 ethcore-rpc = { path = "../rpc" }
 ethcore-util = { path = "../util" }
 parity-dapps = { git = "https://github.com/ethcore/parity-ui.git", version = "1.4" }

diff --git a/dapps/src/apps/fetcher.rs b/dapps/src/apps/fetcher.rs
@@ -24,6 +24,7 @@ use std::io::{self, Read, Write};
 use std::path::PathBuf;
 use std::sync::Arc;
 use std::collections::HashMap;
+use rustc_serialize::hex::FromHex;
 
 use hyper::Control;
 use hyper::status::StatusCode;
@@ -54,12 +55,6 @@ impl<R: URLHint> Drop for AppFetcher<R> {
 	}
 }
 
-impl Default for AppFetcher<URLHintContract> {
-	fn default() -> Self {
-		AppFetcher::new(URLHintContract)
-	}
-}
-
 impl<R: URLHint> AppFetcher<R> {
 
 	pub fn new(resolver: R) -> Self {
@@ -84,7 +79,10 @@ impl<R: URLHint> AppFetcher<R> {
 			// Check if we already have the app
 			Some(_) => true,
 			// fallback to resolver
-			None => self.resolver.resolve(app_id).is_some(),
+			None => match app_id.from_hex() {
+				Ok(app_id) => self.resolver.resolve(app_id).is_some(),
+				_ => false,
+			},
 		}
 	}
 
@@ -103,16 +101,22 @@ impl<R: URLHint> AppFetcher<R> {
 				Some(&AppStatus::Fetching) => {
 					(None, Box::new(ContentHandler::html(
 						StatusCode::ServiceUnavailable,
-						"<h1>This dapp is already being downloaded.</h1>".into()
+						format!(
+							"<html><head>{}</head><body>{}</body></html>",
+							"<meta http-equiv=\"refresh\" content=\"1\">",
+							"<h1>This dapp is already being downloaded.</h1><h2>Please wait...</h2>",
+						)
 					)) as Box<Handler>)
 				},
 				// We need to start fetching app
 				None => {
 					// TODO [todr] Keep only last N dapps available!
-					let app = self.resolver.resolve(&app_id).expect("to_handler is called only when `contains` returns true.");
+					let app_hex = app_id.from_hex().expect("to_handler is called only when `contains` returns true.");
+					let app = self.resolver.resolve(app_hex).expect("to_handler is called only when `contains` returns true.");
 					(Some(AppStatus::Fetching), Box::new(AppFetcherHandler::new(
 						app,
 						control,
+						path.using_dapps_domains,
 						DappInstaller {
 							dapp_id: app_id.clone(),
 							dapps_path: self.dapps_path.clone(),
@@ -265,10 +269,11 @@ mod tests {
 	use apps::urlhint::{GithubApp, URLHint};
 	use endpoint::EndpointInfo;
 	use page::LocalPageEndpoint;
+	use util::Bytes;
 
 	struct FakeResolver;
 	impl URLHint for FakeResolver {
-		fn resolve(&self, _app_id: &str) -> Option<GithubApp> {
+		fn resolve(&self, _app_id: Bytes) -> Option<GithubApp> {
 			None
 		}
 	}

diff --git a/dapps/src/apps/mod.rs b/dapps/src/apps/mod.rs
@@ -33,7 +33,14 @@ pub const API_PATH : &'static str =  "api";
 pub const UTILS_PATH : &'static str =  "parity-utils";
 
 pub fn main_page() -> &'static str {
-	"/home/"
+	"home"
+}
+pub fn redirection_address(using_dapps_domains: bool, app_id: &str) -> String {
+	if using_dapps_domains {
+		format!("http://{}{}/", app_id, DAPPS_DOMAIN)
+	} else {
+		format!("/{}/", app_id)
+	}
 }
 
 pub fn utils() -> Box<Endpoint> {

diff --git a/dapps/src/apps/registrar.json b/dapps/src/apps/registrar.json
@@ -0,0 +1,21 @@
+[
+	{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"type":"function"},
+	{"constant":false,"inputs":[{"name":"_name","type":"string"}],"name":"confirmReverse","outputs":[{"name":"success","type":"bool"}],"type":"function"},
+	{"constant":false,"inputs":[{"name":"_name","type":"bytes32"}],"name":"reserve","outputs":[{"name":"success","type":"bool"}],"type":"function"},
+	{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"bytes32"}],"name":"set","outputs":[{"name":"success","type":"bool"}],"type":"function"},
+	{"constant":false,"inputs":[{"name":"_name","type":"bytes32"}],"name":"drop","outputs":[{"name":"success","type":"bool"}],"type":"function"},
+	{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"getAddress","outputs":[{"name":"","type":"address"}],"type":"function"},
+	{"constant":false,"inputs":[{"name":"_amount","type":"uint256"}],"name":"setFee","outputs":[],"type":"function"},
+	{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_to","type":"address"}],"name":"transfer","outputs":[{"name":"success","type":"bool"}],"type":"function"},
+	{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"type":"function"},
+	{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"reserved","outputs":[{"name":"reserved","type":"bool"}],"type":"function"},
+	{"constant":false,"inputs":[],"name":"drain","outputs":[],"type":"function"},
+	{"constant":false,"inputs":[{"name":"_name","type":"string"},{"name":"_who","type":"address"}],"name":"proposeReverse","outputs":[{"name":"success","type":"bool"}],"type":"function"},
+	{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"getUint","outputs":[{"name":"","type":"uint256"}],"type":"function"},
+	{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"get","outputs":[{"name":"","type":"bytes32"}],"type":"function"},
+	{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint256"}],"type":"function"},
+	{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"reverse","outputs":[{"name":"","type":"string"}],"type":"function"},
+	{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"uint256"}],"name":"setUint","outputs":[{"name":"success","type":"bool"}],"type":"function"},
+	{"constant":false,"inputs":[],"name":"removeReverse","outputs":[],"type":"function"},
+	{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"address"}],"name":"setAddress","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"amount","type":"uint256"}],"name":"Drained","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"amount","type":"uint256"}],"name":"FeeChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"owner","type":"address"}],"name":"Reserved","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"oldOwner","type":"address"},{"indexed":true,"name":"newOwner","type":"address"}],"name":"Transferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"owner","type":"address"}],"name":"Dropped","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"key","type":"string"}],"name":"DataChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"string"},{"indexed":true,"name":"reverse","type":"address"}],"name":"ReverseProposed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"string"},{"indexed":true,"name":"reverse","type":"address"}],"name":"ReverseConfirmed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"string"},{"indexed":true,"name":"reverse","type":"address"}],"name":"ReverseRemoved","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}
+]
diff --git a/dapps/src/apps/urlhint.json b/dapps/src/apps/urlhint.json
@@ -0,0 +1,6 @@
+[
+	{"constant":false,"inputs":[{"name":"_content","type":"bytes32"},{"name":"_url","type":"string"}],"name":"hintURL","outputs":[],"type":"function"},
+	{"constant":false,"inputs":[{"name":"_content","type":"bytes32"},{"name":"_accountSlashRepo","type":"string"},{"name":"_commit","type":"bytes20"}],"name":"hint","outputs":[],"type":"function"},
+	{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"entries","outputs":[{"name":"accountSlashRepo","type":"string"},{"name":"commit","type":"bytes20"},{"name":"owner","type":"address"}],"type":"function"},
+	{"constant":false,"inputs":[{"name":"_content","type":"bytes32"}],"name":"unhint","outputs":[],"type":"function"}
+]