fix: Make outside users able to read tmp files

shiny/ui/_include_helpers.py

@@ -19,6 +19,7 @@
 # as the app, the app's source will be included. Should we just not copy .py/.r files?
 
 
+# TODO: This does throw js errors if you're loading in other stuff depending on your config
 @add_example()
 def include_js(
     path: Path | str,
@@ -214,37 +215,62 @@ def create_include_dependency(
 
 def maybe_copy_files(path: Path | str, include_files: bool) -> tuple[str, str]:
     hash = get_hash(path, include_files)
+    print("path: ", path, "Hash: ", hash)
 
     # To avoid unnecessary work when the same file is included multiple times,
     # use a directory scoped by a hash of the file.
     tmpdir = os.path.join(tempfile.gettempdir(), "shiny_include_files", hash)
     path_dest = os.path.join(tmpdir, os.path.basename(path))
+    print("path_dest:", path_dest)
 
     # Since the hash/tmpdir should represent all the files in the path's directory,
-    # we can simply return here
+    # we can check if it exists to determine if we have a cache hit
     if os.path.exists(path_dest):
+        print("Already exists", path_dest)
         return path_dest, hash
 
+    permissions = (
+        0o755  # Store permissions var set to -rwxr-xr-x (owner rwx, others rx)
+    )
+
     # Otherwise, make sure we have a clean slate
     if os.path.exists(tmpdir):
+        print("folder exists, not contents:", os.stat(tmpdir))
         shutil.rmtree(tmpdir)
 
+    # Looks like this is copying twice? puts stuff in diff folders?
     if include_files:
         shutil.copytree(os.path.dirname(path), tmpdir)
-    else:
-        os.makedirs(tmpdir, exist_ok=True)
-        shutil.copy(path, path_dest)
+        print("new folder, perms: ", oct(os.stat(tmpdir).st_mode))
+        for root, dirs, files in os.walk(tmpdir):
+            # set perms on sub-directories
+            for dir in dirs:
+                os.chmod(os.path.join(root, dir), permissions)
+                print("Dir: ", dir)
+                print("dir perms: ", oct(os.stat(os.path.join(root, dir)).st_mode))
+
+            # set perms on files
+            for file in files:
+                print("File: ", file)
+                os.chmod(os.path.join(root, file), permissions)
+                print("file perms: ", oct(os.stat(os.path.join(root, file)).st_mode))
 
+        shutil.copy(path, path_dest)
+    print("PATH_DEST: ", path_dest)
     return path_dest, hash
 
 
 def get_hash(path: Path | str, include_files: bool) -> str:
     if include_files:
-        key = get_file_key(path)
-    else:
+        print("get_hash, include_files is true")
         dir = os.path.dirname(path)
         files = glob.iglob(os.path.join(dir, "**"), recursive=True)
         key = "\n".join([get_file_key(x) for x in files])
+        print("KEY: ", key)
+    else:
+        key = get_file_key(path)
+        print("not include key: ", key)
+
     return hash_deterministic(key)
 
 

tests/playwright/shiny/bugs/2061-css-js-inclusion/app-lite/app.py

@@ -0,0 +1,24 @@
+from shiny import App, ui
+
+# Define the UI
+app_ui = ui.page_fluid(
+    ui.include_css(
+        "./www/style.css", method="link_files"
+    ),  # Reference the external CSS file
+    ui.include_js("./www/customjs.js"),
+    ui.h1("Simple Shiny App with External CSS"),
+    ui.div(
+        ui.p("This is a simple Shiny app that demonstrates ui.include_css()"),
+        ui.p("The styling comes from an external CSS file!"),
+        class_="content",
+    ),
+)
+
+
+# Define the server
+def server(input, output, session):
+    pass
+
+
+# Create and run the app
+app = App(app_ui, server)

tests/playwright/shiny/bugs/2061-css-js-inclusion/app-lite/www/customjs.js

@@ -0,0 +1 @@
+console.log("heyo")

tests/playwright/shiny/bugs/2061-css-js-inclusion/app-lite/www/style.css

@@ -0,0 +1,19 @@
+
+body {
+  background-color: #f0f8ff;
+  font-family: Arial, sans-serif;
+}
+
+h1 {
+  color: #4682b4;
+  border-bottom: 2px solid #4682b4;
+  padding-bottom: 10px;
+}
+
+.content {
+  margin: 20px;
+  padding: 15px;
+  background-color: white;
+  border-radius: 5px;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+}

tests/playwright/shiny/bugs/2061-css-js-inclusion/app-multi/app.py

@@ -0,0 +1,22 @@
+from shiny import App, ui
+
+# Define the UI
+app_ui = ui.page_fluid(
+    ui.include_css("./css/style.css", method="link_files"),
+    ui.include_js("./js/customjs.js", method="link_files"),
+    ui.h1("Simple Shiny App with External CSS"),
+    ui.div(
+        ui.p("This is a simple Shiny app that demonstrates ui.include_css()"),
+        ui.p("The styling comes from an external CSS file!"),
+        class_="content",
+    ),
+)
+
+
+# Define the server
+def server(input, output, session):
+    pass
+
+
+# Create and run the app
+app = App(app_ui, server)

tests/playwright/shiny/bugs/2061-css-js-inclusion/app-multi/css/more.css

@@ -0,0 +1,3 @@
+body {
+  background-color: #506577;
+}

tests/playwright/shiny/bugs/2061-css-js-inclusion/app-multi/css/style.css

@@ -0,0 +1,19 @@
+@import url("more.css");
+
+body {
+  font-family: Arial, sans-serif;
+}
+
+h1 {
+  color: #4682b4;
+  border-bottom: 2px solid #4682b4;
+  padding-bottom: 10px;
+}
+
+.content {
+  margin: 20px;
+  padding: 15px;
+  background-color: white;
+  border-radius: 5px;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+}

tests/playwright/shiny/bugs/2061-css-js-inclusion/app-multi/js/customjs.js

@@ -0,0 +1,4 @@
+const heyo = require('./more.js');
+
+
+console.log(heyo())

tests/playwright/shiny/bugs/2061-css-js-inclusion/app-multi/js/more.js

@@ -0,0 +1,3 @@
+export function heyo() {
+    console.log(heyo)
+}