hatter/simple-rust-tests
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feat: use json verify json

Browse Source
This commit is contained in:
Hatter Jiang
2020-11-07 23:52:11 +08:00
parent 8bc89e80bb
commit cad9dfe606
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
__enclave/virt_enclave/Cargo.lock generated
View File

@@ -521,6 +521,12 @@ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
[[package]]
name = "json"
version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd"
[[package]] [[package]]
name = "kernel32-sys" name = "kernel32-sys"
version = "0.2.2" version = "0.2.2"
@@ -1421,6 +1427,7 @@ name = "virt_enclave"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"hex", "hex",
"json",
"lazy_static", "lazy_static",
"quick-js", "quick-js",
"ring", "ring",

1
__enclave/virt_enclave/Cargo.toml
View File

@@ -16,3 +16,4 @@ rust_util = "0.6"
lazy_static = "1.4" lazy_static = "1.4"
tokio = { version = "0.2", features = ["full"] } tokio = { version = "0.2", features = ["full"] }
warp = "0.2" warp = "0.2"
json = "0.12"

8
__enclave/virt_enclave/src/qjs.rs
View File

@@ -46,11 +46,9 @@ impl QuickJSContext {
'_' '_'
}).collect(); }).collect();
// TODO check JSON valid if let Err(e) = json::parse(params) {
// let v: Option<Vec<EmptyObject>> = serde_json::from_str(params).ok(); return Err(rust_util::new_box_error(&format!("Params is not valid JSON array: {}", e)));
// if v.is_none() { }
// return Err(rust_util::new_box_error("Params is not valid JSON array!"));
// }
self.context.eval(&format!("__PUBLIC_{}.apply(null, {})", f, params)).map_err(|e| e.into()) self.context.eval(&format!("__PUBLIC_{}.apply(null, {})", f, params)).map_err(|e| e.into())
} }
} }