fluidB
/
fluidb
1
0
Fork 0
Code Pull Requests Activity

adapt server to new API; fix #13

Browse Source
main
Ziyang Hu 2 years ago
parent 2a93a2a3a6
commit f1136887c9
5 changed files with 164 additions and 30 deletions
Show Stats Download Patch File Download Diff File

7
Cargo.lock generated
Unescape Escape View File

@ -591,9 +591,16 @@ dependencies = [
name = "cozoserver"
version = "0.1.0"
dependencies = [
"chrono",
"clap",
"cozo",
"env_logger",
"log",
"rand 0.8.5",
"rouille",
"serde",
"serde_derive",
"serde_json",
]
[[package]]

4
cozo-core/Cargo.toml
Unescape Escape View File

@ -57,8 +57,8 @@ either = "1.7.0"
rand = "0.8.5"
miette = { version = "=5.3.0", features = ["fancy"] }
lazy_static = "1.4.0"
log = "0.4.16"
env_logger = "0.9.0"
log = "0.4.17"
env_logger = "0.9.3"
smallvec = { version = "1.8.1", features = ["serde", "write", "union", "const_generics", "const_new"] }
smartstring = { version = "1.0.1", features = ["serde"] }
serde_json = "1.0.81"

3
cozo-lib-nodejs/Cargo.toml
Unescape Escape View File

@ -7,9 +7,6 @@ license = "MIT/Apache-2.0/BSD-3-Clause"
edition = "2021"
exclude = ["index.node"]
[profile.release]
lto = true
[lib]
crate-type = ["cdylib"]

39
cozoserver/Cargo.toml
Unescape Escape View File

@ -6,7 +6,44 @@ license = "MPL-2.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[features]
#! # Features
## Enables the `minimal`, `requests` and `graph-algo` features
compact = ["minimal", "requests", "graph-algo", "rayon"]
## Enables the `storage-sqlite` and `graph-algo` features
mobile = ["storage-sqlite", "graph-algo", "rayon"]
## Enables the `minimal`, `requests` and `graph-algo` features in single threaded mode
compact-single-threaded = ["minimal", "requests", "graph-algo"]
## Enables the `storage-sqlite` feature
minimal = ["storage-sqlite"]
## Enables the [Sqlite](https://www.sqlite.org/index.html) backend, also allows backup and restore with Sqlite data files.
storage-sqlite = ["cozo/storage-sqlite"]
## Enables the [RocksDB](http://rocksdb.org/) backend
storage-rocksdb = ["cozo/storage-rocksdb"]
## Enables the graph algorithms
graph-algo = ["cozo/graph-algo"]
## Allows the utilities to make web requests to fetch data
requests = ["cozo/requests"]
## Uses jemalloc as the global allocator, can make a difference in performance
jemalloc = ["cozo/jemalloc"]
## Enables io-uring option for the RocksDB storage
io-uring = ["cozo/io-uring"]
## Allows threading and enables the use of the `rayon` library for parallelizing algorithms
rayon = ["cozo/rayon"]
## Disallows the use of threads
nothread = ["cozo/nothread"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
cozo = { version = "0.1.2", path = "../cozo-core" }
cozo = { version = "0.1.7", path = "../cozo-core", default-features = false }
clap = { version = "3.2.8", features = ["derive"] }
rouille = "3.5.0"
env_logger = "0.9.3"
log = "0.4.17"
rand = "0.8.5"
serde_derive = "1.0.137"
serde = { version = "1.0.137" }
chrono = "0.4.19"
serde_json = "1.0.81"

141
cozoserver/src/main.rs
Unescape Escape View File

@ -17,16 +17,26 @@ use env_logger::Env;
use log::{error, info};
use rand::Rng;
use rouille::{router, try_or_400, Request, Response};
use serde_json::json;
use cozo::new_cozo_rocksdb;
use cozo::*;
#[derive(Parser, Debug)]
#[clap(version, about, long_about = None)]
struct Args {
/// Database kind, can be `mem`, `sqlite`, `rocksdb` and others.
/// Some kinds may not be available if the executable did not set its build option.
#[clap(short, long, default_value_t = String::from("mem"))]
kind: String,
/// Path to the directory to store the database
#[clap(value_parser)]
#[clap(short, long, default_value_t = String::from(""))]
path: String,
/// Extra config in JSON format
#[clap(short, long, default_value_t = serde_json::Value::Null)]
config: serde_json::Value,
/// Address to bind the service to
#[clap(short, long, default_value_t = String::from("127.0.0.1"))]
bind: String,
@ -36,6 +46,19 @@ struct Args {
port: u16,
}
macro_rules! check_auth {
($request:expr, $auth_guard:expr) => {
match $request.header("x-cozo-auth") {
None => return Response::text("Unauthorized").with_status_code(401),
Some(code) => {
if $auth_guard != code {
return Response::text("Unauthorized").with_status_code(401);
}
}
}
};
}
fn main() {
env_logger::Builder::from_env(Env::default().default_filter_or("info")).init();
let args = Args::parse();
@ -43,7 +66,7 @@ fn main() {
eprintln!("{}", SECURITY_WARNING);
}
let db = new_cozo_rocksdb(args.path.as_str()).unwrap();
let db = DbInstance::new(args.kind.as_str(), args.path.as_str(), args.config.clone()).unwrap();
let mut path_buf = PathBuf::from(&args.path);
path_buf.push("auth.txt");
@ -84,14 +107,7 @@ fn main() {
router!(request,
(POST) (/text-query) => {
if !request.remote_addr().ip().is_loopback() {
match request.header("x-cozo-auth") {
None => return Response::text("Unauthorized").with_status_code(401),
Some(code) => {
if auth_guard != code {
return Response::text("Unauthorized").with_status_code(401);
}
}
}
check_auth!(request, auth_guard);
}
#[derive(serde_derive::Serialize, serde_derive::Deserialize)]
@ -108,19 +124,96 @@ fn main() {
} else {
response.with_status_code(400)
}
// {
//
// Ok(mut result) => {
// if let Some(obj) = result.as_object_mut() {
// obj.insert(
// "time_taken".to_string(),
// json!(start.elapsed().as_millis() as u64),
// );
// }
// Response::json(&result)
// }
// _ => Response::json(&result).with_status_code(400)
// }
},
(GET) (/export/{relations: String}) => {
check_auth!(request, auth_guard);
let relations = relations.split(",").filter_map(|t| {
if t.is_empty() {
None
} else {
Some(t)
}
});
let result = db.export_relations(relations);
match result {
Ok(s) => {
let ret = json!({"ok": true, "data": s});
Response::json(&ret)
}
Err(err) => {
let ret = json!({"ok": false, "message": err.to_string()});
Response::json(&ret).with_status_code(400)
}
}
},
(PUT) (/import/{relation: String}) => {
check_auth!(request, auth_guard);
#[derive(serde_derive::Serialize, serde_derive::Deserialize)]
struct ImportPayload {
data: Vec<serde_json::Value>,
}
let payload: ImportPayload = try_or_400!(rouille::input::json_input(request));
let result = db.import_relation(&relation, &payload.data);
match result {
Ok(()) => {
let ret = json!({"ok": true});
Response::json(&ret)
}
Err(err) => {
let ret = json!({"ok": false, "message": err.to_string()});
Response::json(&ret).with_status_code(400)
}
}
},
(POST) (/backup) => {
check_auth!(request, auth_guard);
#[derive(serde_derive::Serialize, serde_derive::Deserialize)]
struct BackupPayload {
path: String,
}
let payload: BackupPayload = try_or_400!(rouille::input::json_input(request));
let result = db.backup_db(payload.path.clone());
match result {
Ok(()) => {
let ret = json!({"ok": true});
Response::json(&ret)
}
Err(err) => {
let ret = json!({"ok": false, "message": err.to_string()});
Response::json(&ret).with_status_code(400)
}
}
},
(POST) (/restore) => {
check_auth!(request, auth_guard);
#[derive(serde_derive::Serialize, serde_derive::Deserialize)]
struct BackupPayload {
path: String,
}
let payload: BackupPayload = try_or_400!(rouille::input::json_input(request));
let result = db.restore_backup(payload.path.clone());
match result {
Ok(()) => {
let ret = json!({"ok": true});
Response::json(&ret)
}
Err(err) => {
let ret = json!({"ok": false, "message": err.to_string()});
Response::json(&ret).with_status_code(400)
}
}
},
(GET) (/) => {
Response::html(HTML_CONTENT)

Write Preview
Loading…
Cancel
Save