Merge pull request #11 from onekey-sec/landlock

Expose landlock API

Author: qkaiser

.github/workflows/CI.yml

@@ -86,7 +86,7 @@ jobs:
           key: pytest-${{ matrix.os }}
       - name: Install dependencies
         run: |
-          pdm sync -d
+          pdm sync -v -d
       - name: Run Tests
         run: |
           pdm pytest
@@ -109,7 +109,7 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
       - name: Install dependencies
         run: |
-          pdm sync -d
+          pdm sync -v -d
       - name: Type-Check
         run: |
           pdm pyright
@@ -156,7 +156,7 @@ jobs:
         with:
           target: ${{ matrix.target }}
           container: ${{ env.CONTAINER }}
-          args: --release --out dist
+          args: --verbose --release --out dist
           sccache: ${{ matrix.target == 'musllinux_1_1' }}
           manylinux: auto
           docker-options: -e CARGO_NET_GIT_FETCH_WITH_CLI=true
@@ -171,7 +171,7 @@ jobs:
             cd /usr/src
             curl -sSL https://raw.githubusercontent.com/pdm-project/pdm/main/install-pdm.py | python3.10 -
             export PATH=/root/.local/bin:$PATH
-            pdm sync -d --no-self -G test
+            pdm sync -v -d --no-self -G test
             pdm run python -m ensurepip
             pdm run python -m pip install dist/*.whl
             pdm pytest
@@ -196,7 +196,7 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.target }}
-          args: --release --out dist
+          args: --verbose --release --out dist
           sccache: "true"
       - name: Upload wheels
         uses: actions/upload-artifact@v3
@@ -208,7 +208,7 @@ jobs:
       - name: Test wheels
         if: ${{ matrix.target == 'x86_64' }}
         run: |
-          pdm sync -d --no-self -G test
+          pdm sync -v -d --no-self -G test
           pdm run python -m ensurepip
           pdm run python -m pip install dist/*.whl
           pdm pytest

Cargo.lock

@@ -12,7 +12,12 @@ crate-type = [
 ]
 
 [dependencies]
+log = "0.4.18"
 pyo3 = "0.18.3"
+pyo3-log = "0.8.1"
+
+[target.'cfg(target_os = "linux")'.dependencies]
+landlock = "0.2.0"
 
 [dev-dependencies]
 approx = "0.5.0"

Cargo.toml

@@ -19,7 +19,7 @@ fn shannon_entropy(c: &mut Criterion) {
             BenchmarkId::from_parameter(sample_size),
             &sample_size,
             |b, &size| {
-                b.iter(|| unblob_native::math::shannon_entropy(&sample[0..size]));
+                b.iter(|| unblob_native::math_tools::shannon_entropy(&sample[0..size]));
             },
         );
     }

benches/benches_main.rs

@@ -93,6 +93,7 @@ ignore = [
   "D203",    # one-blank-line-before-class:    D211 (no-blank-line-before-class) is used instead
   "D213",    # multi-line-summary-second-line: D212 (multi-line-summary-first-line) is used instead
   "E501",    # line-too-long:                  Let black handle line length violations
+  "UP007",   # non-pep604-annotation:          Python 3.8 support needs legacy annotations
 ]
 
 [tool.ruff.per-file-ignores]

pyproject.toml

@@ -0,0 +1,20 @@
+import os
+import typing
+
+import typing_extensions
+
+_Path: typing_extensions.TypeAlias = typing.Union[os.PathLike, str]
+
+class AccessFS:
+    @staticmethod
+    def read(access_dir: _Path) -> AccessFS: ...
+    @staticmethod
+    def read_write(access_dir: _Path) -> AccessFS: ...
+    @staticmethod
+    def make_reg(access_dir: _Path) -> AccessFS: ...
+    @staticmethod
+    def make_dir(access_dir: _Path) -> AccessFS: ...
+
+def restrict_access(*args: AccessFS) -> None: ...
+
+class SandboxError(Exception): ...

python/unblob_native/_native/__init__.pyi

@@ -1,19 +1,15 @@
-pub mod math;
+pub mod math_tools;
+pub mod sandbox;
 
 use pyo3::prelude::*;
 
-/// Calculates Shannon entropy of data
-#[pyfunction(text_signature = "(data)")]
-pub fn shannon_entropy(py: Python, data: &[u8]) -> PyResult<f64> {
-    py.allow_threads(|| Ok(math::shannon_entropy(data)))
-}
-
 /// Performance-critical functionality
 #[pymodule]
 fn _native(py: Python, m: &PyModule) -> PyResult<()> {
-    let math_module = PyModule::new(py, "math_tools")?;
-    math_module.add_function(wrap_pyfunction!(shannon_entropy, math_module)?)?;
+    math_tools::init_module(py, m)?;
+    sandbox::init_module(py, m)?;
+
+    pyo3_log::init();
 
-    m.add_submodule(math_module)?;
     Ok(())
 }

python/unblob_native/_native/math_tools.pyi renamed to python/unblob_native/math_tools.pyi

@@ -1,3 +1,5 @@
+use pyo3::prelude::*;
+
 pub fn shannon_entropy(data: &[u8]) -> f64 {
     let mut entropy = 0.0;
     let mut counts = [0; 256];
@@ -17,6 +19,24 @@ pub fn shannon_entropy(data: &[u8]) -> f64 {
 
     entropy
 }
+/// Calculates Shannon entropy of data
+#[pyfunction(name = "shannon_entropy")]
+pub fn py_shannon_entropy(py: Python, data: &[u8]) -> PyResult<f64> {
+    py.allow_threads(|| Ok(shannon_entropy(data)))
+}
+
+pub fn init_module(py: Python, root_module: &PyModule) -> PyResult<()> {
+    let module = PyModule::new(py, "math_tools")?;
+    module.add_function(wrap_pyfunction!(py_shannon_entropy, module)?)?;
+
+    root_module.add_submodule(module)?;
+
+    py.import("sys")?
+        .getattr("modules")?
+        .set_item("unblob_native.math", module)?;
+
+    Ok(())
+}
 
 #[cfg(test)]
 mod tests {