Move static to public

Because QR codes generate in the folder, it is not static. The name "public" is a rails convention for this folder that makes sense to me.
payjoin · Nov 11, 2022 · 9aa1361 · 9aa1361
1 parent 301183f
commit 9aa1361
Show file tree

Hide file tree

Showing 22 changed files with 9 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 /target
 tests/compose/nginx/ssl/localhost-key.pem
 tests/compose/nginx/ssl/localhost.pem
-static/qr_codes/*.png
+public/qr_codes/*.png
diff --git a/public/.DS_Store b/public/.DS_Store
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/static/favicons/android-chrome-192x192.png → public/favicons/android-chrome-192x192.png b/static/favicons/android-chrome-192x192.png → public/favicons/android-chrome-192x192.png
diff --git a/static/favicons/android-chrome-512x512.png → public/favicons/android-chrome-512x512.png b/static/favicons/android-chrome-512x512.png → public/favicons/android-chrome-512x512.png
diff --git a/static/favicons/apple-touch-icon.png → public/favicons/apple-touch-icon.png b/static/favicons/apple-touch-icon.png → public/favicons/apple-touch-icon.png
diff --git a/static/favicons/browserconfig.xml → public/favicons/browserconfig.xml b/static/favicons/browserconfig.xml → public/favicons/browserconfig.xml
diff --git a/static/favicons/favicon-16x16.png → public/favicons/favicon-16x16.png b/static/favicons/favicon-16x16.png → public/favicons/favicon-16x16.png
diff --git a/static/favicons/favicon-32x32.png → public/favicons/favicon-32x32.png b/static/favicons/favicon-32x32.png → public/favicons/favicon-32x32.png
diff --git a/static/favicons/mstile-144x144.png → public/favicons/mstile-144x144.png b/static/favicons/mstile-144x144.png → public/favicons/mstile-144x144.png
diff --git a/static/favicons/mstile-150x150.png → public/favicons/mstile-150x150.png b/static/favicons/mstile-150x150.png → public/favicons/mstile-150x150.png
diff --git a/static/favicons/mstile-310x150.png → public/favicons/mstile-310x150.png b/static/favicons/mstile-310x150.png → public/favicons/mstile-310x150.png
diff --git a/static/favicons/mstile-310x310.png → public/favicons/mstile-310x310.png b/static/favicons/mstile-310x310.png → public/favicons/mstile-310x310.png
diff --git a/static/favicons/mstile-70x70.png → public/favicons/mstile-70x70.png b/static/favicons/mstile-70x70.png → public/favicons/mstile-70x70.png
diff --git a/static/favicons/safari-pinned-tab.svg → public/favicons/safari-pinned-tab.svg b/static/favicons/safari-pinned-tab.svg → public/favicons/safari-pinned-tab.svg
diff --git a/static/favicons/site.webmanifest → public/favicons/site.webmanifest b/static/favicons/site.webmanifest → public/favicons/site.webmanifest
diff --git a/static/index.html → public/index.html b/static/index.html → public/index.html
diff --git a/static/qr_codes/.gitignore → public/qr_codes/.gitignore b/static/qr_codes/.gitignore → public/qr_codes/.gitignore
diff --git a/static/spookyloin.png → public/spookyloin.png b/static/spookyloin.png → public/spookyloin.png
diff --git a/static/spookyloin2.png → public/spookyloin2.png b/static/spookyloin2.png → public/spookyloin2.png
diff --git a/static/style.css → public/style.css b/static/style.css → public/style.css
diff --git a/src/http.rs b/src/http.rs
@@ -9,14 +9,14 @@ use qrcode_generator::QrCodeEcc;
 use crate::scheduler::{self, ScheduledPayJoin, Scheduler, SchedulerError};
 
 #[cfg(not(feature = "test_paths"))]
-const STATIC_DIR: &str = "/usr/share/nolooking/static";
+const PUBLIC_DIR: &str = "/usr/share/nolooking/public";
 
 #[cfg(feature = "test_paths")]
-const STATIC_DIR: &str = "static";
+const PUBLIC_DIR: &str = "public";
 
-/// Create QR code and save to `STATIC_DIR/qr_codes/<name>.png`
+/// Create QR code and save to `PUBLIC_DIR/qr_codes/<name>.png`
 fn create_qr_code(qr_string: &str, name: &str) {
-    let filename = format!("{}/qr_codes/{}.png", STATIC_DIR, name);
+    let filename = format!("{}/qr_codes/{}.png", PUBLIC_DIR, name);
     qrcode_generator::to_png_to_file(qr_string, QrCodeEcc::Low, 512, filename.clone())
         .expect(&format!("Saved QR code: {}", filename));
 }
@@ -50,7 +50,7 @@ async fn handle_web_req(
         (&Method::GET, "/") => handle_index().await,
         (&Method::POST, "/pj") => handle_pj(scheduler, req).await,
         (&Method::POST, "/schedule") => handle_schedule(scheduler, endpoint, req).await,
-        (&Method::GET, path) => handle_static(path).await,
+        (&Method::GET, path) => serve_public_file(path).await,
         _ => handle_404().await,
     };
 
@@ -67,15 +67,15 @@ async fn handle_404() -> Result<Response<Body>, HttpError> {
 }
 
 async fn handle_index() -> Result<Response<Body>, HttpError> {
-    let index = std::fs::read(Path::new(STATIC_DIR).join("index.html")).expect("can't open index");
+    let index = std::fs::read(Path::new(PUBLIC_DIR).join("index.html")).expect("can't open index");
     Ok(Response::new(Body::from(index)))
 }
 
-async fn handle_static(path: &str) -> Result<Response<Body>, HttpError> {
+async fn serve_public_file(path: &str) -> Result<Response<Body>, HttpError> {
     // A path argument to PathBuf::join(&self, path) with a leading slash
     // is treated as an absolute path, so we strip it in preparation.
     let directory_traversal_vulnerable_path = &path[("/".len())..];
-    match std::fs::read(Path::new(STATIC_DIR).join(directory_traversal_vulnerable_path)) {
+    match std::fs::read(Path::new(PUBLIC_DIR).join(directory_traversal_vulnerable_path)) {
         Ok(file) => Response::builder()
             .status(200)
             .header("Cache-Control", "max-age=604800")