Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ReactPy ASGI Middleware and standalone ReactPy ASGI App #1113

Draft
wants to merge 24 commits into
base: main
Choose a base branch
from
+1,585 −20
Draft

ReactPy ASGI Middleware and standalone ReactPy ASGI App #1113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
252489e
everything besides component_dispatch_app
Archmonger Jul 18, 2023
2546cfa
Unfinished component dispatcher
Archmonger Jul 18, 2023
16ada33
threading for disk calls
Archmonger Jul 18, 2023
bde42aa
More robust route handling
Archmonger Jul 19, 2023
fa34c31
fix carrier
Archmonger Jul 19, 2023
a936c66
Plan ahead for new websocket URL pattern
Archmonger Jul 19, 2023
a936c86
better path stuff
Archmonger Jul 19, 2023
727f3f0
use etag instead of modified header
Archmonger Jul 19, 2023
750a821
Merge remote-tracking branch 'upstream/main' into asgi-middleware
Archmonger Jul 19, 2023
daaa235
prepare recv queue for potential threading
Archmonger Jul 19, 2023
3d97430
refactoring
Archmonger Jul 19, 2023
f16e413
add backhaul thread
Archmonger Jul 19, 2023
291b538
remove icon from default head
Archmonger Jul 19, 2023
0b5ba46
small bug fixes
Archmonger Jul 19, 2023
fc99a65
fix another typo
Archmonger Jul 19, 2023
139ba98
Update asgi.py
Archmonger Jul 19, 2023
b350590
Update asgi.py
Archmonger Jul 19, 2023
473cdfd
customizable block size
Archmonger Jul 20, 2023
32b367c
Merge branch 'asgi-middleware' of https://github.com/Archmonger/react…
Archmonger Jul 20, 2023
5707fba
refactor init
Archmonger Jul 20, 2023
93d7c03
format
Archmonger Jul 20, 2023
24fb817
use starlette for static files
Archmonger Jul 20, 2023
5df567e
local ws connection
Archmonger Jul 23, 2023
57d47da
more refactoring
Archmonger Jul 23, 2023
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
1 change: 0 additions & 1 deletion src/js/app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import { app } from "./src/index";
app(document.getElementById("app"));
</script>
<!-- we replace this with user-provided head elements -->
{__head__}
</head>
<body>
Expand Down
Binary file removed src/js/app/public/assets/reactpy-logo.ico
View file
Open in desktop
Binary file not shown.
24 changes: 8 additions & 16 deletions src/py/reactpy/reactpy/backend/_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,17 @@ async def _check_if_started(server: uvicorn.Server, started: asyncio.Event) -> N

def safe_client_build_dir_path(path: str) -> Path:
"""Prevent path traversal out of :data:`CLIENT_BUILD_DIR`"""
return traversal_safe_path(
return safe_join_path(
CLIENT_BUILD_DIR, *("index.html" if path in {"", "/"} else path).split("/")
)


def safe_web_modules_dir_path(path: str) -> Path:
"""Prevent path traversal out of :data:`reactpy.config.REACTPY_WEB_MODULES_DIR`"""
return traversal_safe_path(REACTPY_WEB_MODULES_DIR.current, *path.split("/"))
return safe_join_path(REACTPY_WEB_MODULES_DIR.current, *path.split("/"))


def traversal_safe_path(root: str | Path, *unsafe: str | Path) -> Path:
def safe_join_path(root: str | Path, *unsafe: str | Path) -> Path:
"""Raise a ``ValueError`` if the ``unsafe`` path resolves outside the root dir."""
root = os.path.abspath(root)

Expand All @@ -86,9 +86,10 @@ def traversal_safe_path(root: str | Path, *unsafe: str | Path) -> Path:
path = os.path.abspath(os.path.join(root, *unsafe))

if os.path.commonprefix([root, path]) != root:
# If the common prefix is not root directory we resolved outside the root dir
msg = "Unsafe path"
raise ValueError(msg)
# We resolved outside the root dir, potential directory traversal attack.
raise ValueError(
f"Unsafe path detected. Path '{path}' is outside root directory '{root}'"
)

return Path(path)

Expand Down Expand Up @@ -116,16 +117,7 @@ def vdom_head_elements_to_html(head: Sequence[VdomDict] | VdomDict | str) -> str
class CommonOptions:
"""Options for ReactPy's built-in backed server implementations"""

head: Sequence[VdomDict] | VdomDict | str = (
html.title("ReactPy"),
html.link(
{
"rel": "icon",
"href": "/_reactpy/assets/reactpy-logo.ico",
"type": "image/x-icon",
}
),
)
head: Sequence[VdomDict] | VdomDict | str = (html.title("ReactPy App"),)
"""Add elements to the ``<head>`` of the application.

For example, this can be used to customize the title of the page, link extra
Expand Down
Loading