Added build step

SamTV1998 · SamTV1998 · commit 4eee208658f9 · 2025-04-05T17:05:30.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,11 @@
+on:
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Build app with cargo'
+        run: RUSTFLAGS="-Ctarget-feature=+crt-static" cargo build --release
+      - uses: actions/upload-artifact@v4
+        with:
+          name: 'etherpad-proxy'
+          path: './target/release/etherpad-proxy'
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,4 +19,5 @@ rand = "0.8.5"
 hyper-util = "0.1.10"
 tower = "0.5.2"
 hyper = "1.6.0"
-tokio-tungstenite = "0.26.2"
+tokio-tungstenite = "0.26.2"
+regex = "1.11.1"
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,24 @@
+FROM alpine AS cache
+RUN apk add -U --no-cache ca-certificates
+
+
+FROM lukemathwalker/cargo-chef:latest as chef
+WORKDIR /app
+
+FROM chef AS planner
+COPY ./Cargo.toml ./Cargo.lock ./
+COPY ./src ./src
+RUN cargo chef prepare
+
+FROM chef AS builder
+COPY --from=planner /app/recipe.json .
+RUN cargo chef cook --release
+COPY . .
+RUN RUSTFLAGS="-Ctarget-feature=+crt-static" cargo build --release
+RUN mv ./target/release/etherpad-proxy ./app
+
+FROM scratch AS runtime
+WORKDIR /app
+COPY --from=builder /app/app /usr/local/bin/
+COPY --from=cache /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+ENTRYPOINT ["/usr/local/bin/app"]
diff --git a/src/db.rs b/src/db.rs
@@ -4,9 +4,6 @@ pub struct DB {
     conn: Connection
 }
 
-
-
-
 impl DB {
     pub fn new(filename: &str) -> DB {
         let conn = Connection::open(filename).expect("Unable to open database");
diff --git a/src/reverse_proxy.rs b/src/reverse_proxy.rs
@@ -1,3 +1,4 @@
+use std::collections::HashMap;
 use crate::db::DB;
 use crate::runtime::AvailableBackends;
 use crate::settings::{BackendIdentifier, Setting};
@@ -12,6 +13,7 @@ use axum::extract::{Request, State};
 use axum::http::{StatusCode, Uri};
 use axum::response::{IntoResponse, Response};
 use crate::Client;
+use regex::Regex;
 
 fn debug_request(req: Request<Body>) -> Result<Response<Body>, Infallible> {
     let body_str = format!("{:?}", req);
@@ -97,6 +99,11 @@ pub struct StateOfReverseProxy {
     pub setting: Setting,
 }
 
+static RESOURCES: LazyLock<HashMap<String, String>> = LazyLock::new(HashMap::new);
+
+static PADINDEX_REGEX: LazyLock<Regex> = LazyLock::new(||Regex::new("^/padbootstrap-[a-zA-Z0-9]+.min.js$").unwrap());
+
+
 pub async fn handler(State(client): State<StateOfReverseProxy>, mut req: Request) ->
                                                                                   Result<Response,
     StatusCode> {
@@ -106,6 +113,8 @@ pub async fn handler(State(client): State<StateOfReverseProxy>, mut req: Request
         .path_and_query()
         .map(|v| v.as_str())
         .unwrap_or(path.path());
+
+
     let pad_id = get_pad_id(path);
     let chosen_backend = create_route(pad_id, client.available_backends.clone(), client.db);
     if let Some(backend_id) = chosen_backend {
@@ -117,12 +126,14 @@ pub async fn handler(State(client): State<StateOfReverseProxy>, mut req: Request
     }
 
 
-    Ok(client
+    let response = client
         .client
         .request(req)
         .await
         .map_err(|_| StatusCode::BAD_REQUEST)?
-        .into_response())
+        .into_response();
+
+    Ok(response)
 }
 
 pub fn get_pad_id(uri: &Uri) -> Option<String> {
@@ -148,3 +159,14 @@ pub fn get_pad_id(uri: &Uri) -> Option<String> {
     }
     pad_id
 }
+
+
+mod tests {
+    use crate::reverse_proxy::PADINDEX_REGEX;
+
+    #[test]
+    fn test_pad_index_regex() {
+        let path = "/padbootstrap-KK7I7qP9I3E.min.js";
+        assert!(PADINDEX_REGEX.is_match(path));
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,6 @@ pub struct DB {`
`4`	`4`	`conn: Connection`
`5`	`5`	`}`
`6`	`6`
`7`		`-`
`8`		`-`
`9`		`-`
`10`	`7`	`impl DB {`
`11`	`8`	`pub fn new(filename: &str) -> DB {`
`12`	`9`	`let conn = Connection::open(filename).expect("Unable to open database");`