Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 24 additions & 26 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 13 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
resolver = "2"
members = [
"hyper_cgi",
"hyper-reverse-proxy",
"josh-reverse-proxy",
"josh-core",
"josh-cli",
"josh-filter",
Expand Down Expand Up @@ -31,7 +31,18 @@ gix-hash = "0.19.0"
gix-object = "0.50.2"
gix-config = "0.47.1"
gix-submodule = "0.21.0"
hyper-reverse-proxy = { path = "hyper-reverse-proxy", version = "0.0.1" }
hyper_cgi = { path = "hyper_cgi", version = "25.11.26" }
josh-cli = { path = "josh-cli", version = "25.11.26" }
josh-core = { path = "josh-core", version = "25.11.26" }
josh-filter = { path = "josh-filter", version = "25.11.26" }
josh-graphql = { path = "josh-graphql", version = "25.11.26" }
josh-proxy = { path = "josh-proxy", version = "25.11.26" }
josh-reverse-proxy = { path = "josh-reverse-proxy", version = "25.11.26" }
josh-rpc = { path = "josh-rpc", version = "25.11.26" }
josh-ssh-dev-server = { path = "josh-ssh-dev-server", version = "25.11.26" }
josh-ssh-shell = { path = "josh-ssh-shell", version = "25.11.26" }
josh-templates = { path = "josh-templates", version = "25.11.26" }
josh-ui = { path = "josh-ui", version = "25.11.26" }
libc = "0.2.177"
regex = "1.12.2"
rs_tracing = { version = "1.1.0", features = ["rs_tracing"] }
Expand Down
9 changes: 5 additions & 4 deletions hyper_cgi/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
[package]
name = "hyper_cgi"
version = "22.10.25"
authors = ["Christian Schilling <initcrash@gmail.com>", "Louis-Marie Givel <louis-marie.givel@esrlabs.com>"]
version = "25.11.26"
edition = "2024"

repository = "https://github.com/josh-project/josh"
authors = ["Christian Schilling <initcrash@gmail.com>", "Louis-Marie Givel <louis-marie.givel@esrlabs.com>"]
license-file = "LICENSE"
description = "Run CGI scripts with hyper"
repository = "https://github.com/josh-project/josh"
readme = "README.md"

[dependencies]
Expand All @@ -21,7 +22,7 @@ http-body-util = "0.1.0"
clap = { workspace = true, optional = true }
base64 = { workspace = true, optional = true }
rand = { version = "0.9.2", optional = true, features = ["std"] }
hyper-reverse-proxy = { workspace = true }
josh-reverse-proxy = { workspace = true }

[lib]
name = "hyper_cgi"
Expand Down
2 changes: 1 addition & 1 deletion hyper_cgi/src/bin/hyper-cgi-test-server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ async fn call(
let client_ip = std::net::IpAddr::from_str("127.0.0.1").unwrap();
*req.uri_mut() = ppath.parse().unwrap();
println!("proxy {:?}", req.uri().path());
return match hyper_reverse_proxy::call(client_ip, proxy_target, req).await {
return match josh_reverse_proxy::call(client_ip, proxy_target, req).await {
Ok(response) => response,
Err(error) => hyper::Response::builder()
.status(hyper::StatusCode::INTERNAL_SERVER_ERROR)
Expand Down
19 changes: 9 additions & 10 deletions josh-cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
[package]
authors = ["Christian Schilling <christian.schilling@esrlabs.com>"]
description = "Josh CLI"
name = "josh"
version = "25.11.26"
edition = "2024"
keywords = ["git", "monorepo", "workflow", "scm"]
license-file = "LICENSE"
name = "josh-cli"
readme = "../README.md"

repository = "https://github.com/josh-project/josh"
version = "22.4.15"
authors = ["Christian Schilling <christian.schilling@esrlabs.com>"]
license-file = "../LICENSE"
description = "CLI interface for josh"
readme = "../README.md"
keywords = ["git", "monorepo", "workflow", "scm"]

[dependencies]
josh-core = { path = "../josh-core" }
josh-graphql = { path = "../josh-graphql" }
josh-templates = { path = "../josh-templates" }
josh-core = { workspace = true }
anyhow = { workspace = true }
env_logger = { workspace = true }
log = { workspace = true }
Expand Down
11 changes: 6 additions & 5 deletions josh-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
[package]
name = "josh-core"
version = "22.4.15"
repository = "https://ithub.com/josh-project/josh"
version = "25.11.26"
edition = "2024"

repository = "https://github.com/josh-project/josh"
authors = ["Christian Schilling <initcrash@gmail.com>"]
license-file = "LICENSE"
description = "GIT virtualization proxy"
license-file = "../LICENSE"
description = "Filtering for git repositories"
keywords = ["git", "monorepo", "workflow", "scm"]
readme = "../README.md"
edition = "2024"

[dependencies]
backtrace = "0.3.76"
Expand Down
19 changes: 10 additions & 9 deletions josh-filter/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
[package]
authors = ["Christian Schilling <christian.schilling@esrlabs.com>"]
description = "GIT filter cli"
name = "josh-filter"
version = "25.11.24"
edition = "2024"

repository = "https://github.com/josh-project/josh"
authors = ["Christian Schilling <initcrash@gmail.com>"]
license-file = "../LICENSE"
description = "Low-level CLI interface for local Josh use"
keywords = ["git", "monorepo", "workflow", "scm"]
license-file = "LICENSE"
name = "josh-filter"
readme = "../README.md"
repository = "https://github.com/josh-project/josh"
version = "22.4.15"

[dependencies]
josh-core = { path = "../josh-core" }
josh-graphql = { path = "../josh-graphql" }
josh-templates = { path = "../josh-templates" }
josh-core = { workspace = true }
josh-graphql = { workspace = true }
josh-templates = { workspace = true }
env_logger = { workspace = true }
serde_json = { workspace = true }
defer = { workspace = true }
Expand Down
10 changes: 8 additions & 2 deletions josh-graphql/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
[package]
name = "josh-graphql"
version = "0.1.0"
version = "25.11.26"
edition = "2024"

repository = "https://github.com/josh-project/josh"
authors = ["Christian Schilling <initcrash@gmail.com>"]
license-file = "../LICENSE"
description = "GraphQL API for josh"
readme = "../README.md"

[dependencies]
josh-core = { path = "../josh-core" }
josh-core = { workspace = true }
juniper = { workspace = true }
git2 = { workspace = true }
rs_tracing = { workspace = true }
Expand Down
25 changes: 13 additions & 12 deletions josh-proxy/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
[package]
name = "josh-proxy"
version = "25.11.26"
edition = "2024"

repository = "https://github.com/josh-project/josh"
authors = ["Christian Schilling <christian.schilling@esrlabs.com>"]
license-file = "../LICENSE"
description = "GIT virtualization proxy"
edition = "2024"
keywords = ["git", "monorepo", "workflow", "scm"]
license-file = "LICENSE"
name = "josh-proxy"
readme = "../README.md"
repository = "https://github.com/josh-project/josh"
version = "22.4.15"
keywords = ["git", "monorepo", "workflow", "scm"]

[dependencies]
sha2 = "0.10.8"
Expand All @@ -18,16 +19,16 @@ bytes = "1.11.0"
clap = { workspace = true }
futures = { workspace = true }
hyper = { version = "1.8.1" }
hyper-reverse-proxy = { workspace = true }
josh-reverse-proxy = { workspace = true }
hyper-staticfile = "0.10.0"
hyper-tls = "0.6.0"
hyper_cgi = { path = "../hyper_cgi" }
hyper_cgi = { workspace = true }
hyper-util = { version = "0.1.18", features = ["client", "client-legacy", "http1", "tokio"] }
http-body-util = "0.1.0"
indoc = "2.0.7"
josh-core = {path = "../josh-core" }
josh-templates = { path = "../josh-templates" }
josh-graphql = { path = "../josh-graphql" }
josh-core = { workspace = true }
josh-templates = { workspace = true }
josh-graphql = { workspace = true }
percent-encoding = "2.3.1"
regex = { workspace = true }
reqwest = { workspace = true }
Expand All @@ -42,7 +43,7 @@ tracing-opentelemetry = "0.32.0"
tracing-subscriber = { workspace = true }
url = "2.5.4"
uuid = { version = "1.18.1", features = ["v4"] }
josh-rpc = { path = "../josh-rpc" }
josh-rpc = { workspace = true }
tokio-util = { workspace = true }
tempfile = { workspace = true }
gix = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion josh-proxy/src/bin/josh-proxy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ async fn handle_ui_request(
// Proxy: can be used for UI development or to serve a different UI
if let Some(proxy) = &ARGS.static_resource_proxy_target {
let client_ip = IpAddr::from_str("127.0.0.1").unwrap();
return match hyper_reverse_proxy::call(client_ip, proxy, req).await {
return match josh_reverse_proxy::call(client_ip, proxy, req).await {
Ok(response) => Ok(erase(response)),
Err(error) => Ok(Response::builder()
.status(StatusCode::INTERNAL_SERVER_ERROR)
Expand Down
11 changes: 7 additions & 4 deletions hyper-reverse-proxy/Cargo.toml → josh-reverse-proxy/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
[package]
name = "hyper-reverse-proxy"
version = "0.0.1"
name = "josh-reverse-proxy"
version = "25.11.26"
edition = "2024"
license = "MIT"
authors = ["Josh Project"]

repository = "https://github.com/josh-project/josh"
authors = ["Louis-Marie Givel <louis-marie@givel.fr."]
license-file = "../LICENSE"
description = "Minimal hyper reverse proxy compatibility layer for Josh"
readme = "../README.md"

[dependencies]
bytes = "1.11.0"
Expand Down
File renamed without changes.
Loading
Loading