Avii/webserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove preventing of messing with global, as system modules mess with global

Browse Source
This commit is contained in:
Avii
2025-10-04 23:27:46 +02:00
parent 17c47560cc
commit 3d8a7021fe
5 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Cargo.lock generated
View File

@@ -1392,9 +1392,9 @@ dependencies = [
[[package]] [[package]]
name = "mlua" name = "mlua"
version = "0.10.2" version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ea43c3ffac2d0798bd7128815212dd78c98316b299b7a902dabef13dc7b6b8d" checksum = "9be1c2bfc684b8a228fbaebf954af7a47a98ec27721986654a4cc2c40a20cc7e"
dependencies = [ dependencies = [
"bstr", "bstr",
"either", "either",
@@ -1404,15 +1404,16 @@ dependencies = [
"num-traits", "num-traits",
"parking_lot", "parking_lot",
"rustc-hash", "rustc-hash",
"rustversion",
"serde", "serde",
"serde-value", "serde-value",
] ]
[[package]] [[package]]
name = "mlua-sys" name = "mlua-sys"
version = "0.6.6" version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "63a11d485edf0f3f04a508615d36c7d50d299cf61a7ee6d3e2530651e0a31771" checksum = "3d4dc9cfc5a7698899802e97480617d9726f7da78c910db989d4d0fd4991d900"
dependencies = [ dependencies = [
"cc", "cc",
"cfg-if 1.0.0", "cfg-if 1.0.0",

2
Cargo.toml
View File

@@ -25,7 +25,7 @@ exe = "0.5"
image = { version = "0.25", features = ["ico"] } image = { version = "0.25", features = ["ico"] }
urlencoding = "2.1" urlencoding = "2.1"
markdown = "1.0.0-alpha.16" markdown = "1.0.0-alpha.16"
mlua = { version = "0.10", features = ["lua54", "serialize", "async", "send"] } mlua = { version = "0.11", features = ["lua54", "serialize", "async", "send"] }
reqwest = { version = "0.10", default-features = false, features = [ reqwest = { version = "0.10", default-features = false, features = [
"json", "json",
"rustls-tls", "rustls-tls",

4
Dockerfile
View File

@@ -2,8 +2,8 @@
FROM nickblah/lua:5.4-luarocks-alpine AS build FROM nickblah/lua:5.4-luarocks-alpine AS build
RUN apk add --no-cache build-base rust cargo lua5.4-dev pkgconfig openssl-dev m4 bsd-compat-headers RUN apk add --no-cache build-base rust cargo lua5.4-dev pkgconfig openssl-dev m4 bsd-compat-headers
# Install lua modules here. # Install lua modules here.
RUN luarocks install luasec
RUN luarocks install luasocket RUN luarocks install luasocket
RUN luarocks install luasec
RUN luarocks install lua-cjson RUN luarocks install lua-cjson
RUN luarocks install base64 RUN luarocks install base64
RUN luarocks install inspect RUN luarocks install inspect
@@ -17,7 +17,7 @@ RUN cargo build --release
# Deploy stage # Deploy stage
FROM alpine FROM alpine
WORKDIR /app WORKDIR /app
RUN apk update && apk add --no-cache ca-certificates openssl libgcc lua5.4-libs RUN apk update && apk add --no-cache ca-certificates openssl libgcc lua5.4-libs readline
COPY --from=build /usr/local/bin/lua /usr/local/bin/lua COPY --from=build /usr/local/bin/lua /usr/local/bin/lua
COPY --from=build /usr/local/bin/luarocks /usr/local/bin/luarocks COPY --from=build /usr/local/bin/luarocks /usr/local/bin/luarocks

0
build.nu Normal file → Executable file
View File

34
src/main.rs
View File

@@ -278,23 +278,23 @@ async fn file_handler(request: Request) -> impl IntoResponse {
std::env::set_current_dir(full_base_path).unwrap(); std::env::set_current_dir(full_base_path).unwrap();
// Before executing user-code, make sure they can't screw with `global` // Before executing user-code, make sure they can't screw with `global`
lua.load( // lua.load(
r#" // r#"
setmetatable(_G, { // setmetatable(_G, {
__newindex = function (_, n) // __newindex = function (_, n)
error("attempt to write to undeclared variable "..n, 2) // error("attempt to write to undeclared variable "..n, 2)
end, // end,
__index = function (_, n) // __index = function (_, n)
error("attempt to read undeclared variable "..n, 2) // error("attempt to read undeclared variable "..n, 2)
end, // end,
})"#, // })"#,
) // )
.exec() // .exec()
.map_err(|e| { // .map_err(|e| {
std::env::set_current_dir(&*CWD).unwrap(); // std::env::set_current_dir(&*CWD).unwrap();
eprintln!("Lua Error: {e:?}"); // eprintln!("Lua Error: {e:?}");
render_lua_error(e) // render_lua_error(e)
})?; // })?;
let script = lua.load(script).eval::<LuaValue>().map_err(|e| { let script = lua.load(script).eval::<LuaValue>().map_err(|e| {
std::env::set_current_dir(&*CWD).unwrap(); std::env::set_current_dir(&*CWD).unwrap();