diff options
| author | Jae-Heon Ji <32578710+jaeheonji@users.noreply.github.com> | 2023-08-12 22:35:42 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-12 15:35:42 +0200 |
| commit | c8ddb23297e2f4fc900b8286d57e2808ae6a4fdb (patch) | |
| tree | c96d26c8bfc24172374aefe88624b78c6890663f /zellij-server/src/plugins/plugin_loader.rs | |
| parent | docs(changelog): protobuffers (diff) | |
| download | sl0ppij-c8ddb23297e2f4fc900b8286d57e2808ae6a4fdb.tar.gz sl0ppij-c8ddb23297e2f4fc900b8286d57e2808ae6a4fdb.tar.xz sl0ppij-c8ddb23297e2f4fc900b8286d57e2808ae6a4fdb.zip | |
feat: add plugin permission system (#2624)
* WIP: add exaple of permission ui
* feat: add request permission ui
* feat: add caching permission in memory
* feat: add permission check
* feat: add file caching
* fix: changes request
* feat(ui): new status bar mode (#2619)
* supermode prototype
* fix integration tests
* fix tests
* style(fmt): rustfmt
* docs(changelog): status-bar supermode
* fix(rendering): occasional glitches while resizing (#2621)
* docs(changelog): resize glitches fix
* chore(version): bump development version
* Fix colored pane frames in mirrored sessions (#2625)
* server/panes/tiled: Fix colored frames
in mirrored sessions. Colored frames were previously ignored because
they were treated like floating panes when rendering tiled panes.
* CHANGELOG: Add PR #2625
* server/tab/unit: Fix unit tests for server.
* fix(sessions): use custom lists of adjectives and nouns for generating session names (#2122)
* Create custom lists of adjectives and nouns for generating session names
* move word lists to const slices
* add logic to retry name generation
* refactor
- reuse the name generator
- iterator instead of for loop
---------
Co-authored-by: Thomas Linford <linford.t@gmail.com>
* docs(changelog): generate session names with custom words list
* feat(plugins): make plugins configurable (#2646)
* work
* make every plugin entry point configurable
* make integration tests pass
* make e2e tests pass
* add test for plugin configuration
* add test snapshot
* add plugin config parsing test
* cleanups
* style(fmt): rustfmt
* style(comment): remove commented code
* docs(changelog): configurable plugins
* style(fmt): rustfmt
* touch up ui
* fix: don't save permission data in memory
* feat: load cached permission
* test: add example test (WIP)
* fix: issue event are always denied
* test: update snapshot
* apply formatting
* refactor: update default cache function
* test: add more new test
* apply formatting
* Revert "apply formatting"
This reverts commit a4e93703fbfdb6865131daa1c8b90fc5c36ab25e.
* apply format
* fix: update cache path
* apply format
* fix: cache path
* fix: update log level
* test for github workflow
* Revert "test for github workflow"
This reverts commit 01eff3bc5d1627a4e60bc6dac8ebe5500bc5b56e.
* refactor: permission cache
* fix(test): permission grant/deny race condition
* style(fmt): rustfmt
* style(fmt): rustfmt
* configure permissions
* permission denied test
* snapshot
* add ui for small plugins
* style(fmt): rustfmt
* some cleanups
---------
Co-authored-by: Aram Drevekenin <aram@poor.dev>
Co-authored-by: har7an <99636919+har7an@users.noreply.github.com>
Co-authored-by: Kyle Sutherland-Cash <kyle.sutherlandcash@gmail.com>
Co-authored-by: Thomas Linford <linford.t@gmail.com>
Co-authored-by: Thomas Linford <tlinford@users.noreply.github.com>
Diffstat (limited to 'zellij-server/src/plugins/plugin_loader.rs')
| -rw-r--r-- | zellij-server/src/plugins/plugin_loader.rs | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/zellij-server/src/plugins/plugin_loader.rs b/zellij-server/src/plugins/plugin_loader.rs index 92a4c048..ea0c2b6a 100644 --- a/zellij-server/src/plugins/plugin_loader.rs +++ b/zellij-server/src/plugins/plugin_loader.rs @@ -188,6 +188,7 @@ impl<'a> PluginLoader<'a> { display_loading_stage!(end, loading_indication, senders, plugin_id); Ok(()) } + pub fn add_client( client_id: ClientId, plugin_dir: PathBuf, @@ -613,6 +614,19 @@ impl<'a> PluginLoader<'a> { } start_function.call(&[]).with_context(err_context)?; + plugin_map.lock().unwrap().insert( + self.plugin_id, + self.client_id, + Arc::new(Mutex::new(RunningPlugin::new( + main_user_instance, + main_user_env, + self.size.rows, + self.size.cols, + ))), + subscriptions.clone(), + workers, + ); + let protobuf_plugin_configuration: ProtobufPluginConfiguration = self .plugin .userspace_configuration @@ -640,18 +654,6 @@ impl<'a> PluginLoader<'a> { self.senders, self.plugin_id ); - plugin_map.lock().unwrap().insert( - self.plugin_id, - self.client_id, - Arc::new(Mutex::new(RunningPlugin::new( - main_user_instance, - main_user_env, - self.size.rows, - self.size.cols, - ))), - subscriptions.clone(), - workers, - ); display_loading_stage!( indicate_writing_plugin_to_cache_success, self.loading_indication, @@ -764,13 +766,13 @@ impl<'a> PluginLoader<'a> { }) .with_context(err_context)?; let wasi = wasi_env.import_object(&module).with_context(err_context)?; - let mut mut_plugin = self.plugin.clone(); mut_plugin.set_tab_index(self.tab_index); let plugin_env = PluginEnv { plugin_id: self.plugin_id, client_id: self.client_id, plugin: mut_plugin, + permissions: Arc::new(Mutex::new(None)), senders: self.senders.clone(), wasi_env, plugin_own_data_dir: self.plugin_own_data_dir.clone(), |
