Skip to content

Commit

Permalink
Merge #2893
Browse files Browse the repository at this point in the history
2893: bugfix for gpg execution with roundcube r=mergify[bot] a=helmuthb

## What type of PR?

bug-fix

## What does this PR do?

It adds another `allow`-rule for `snuffleupagus` when `gpg` is called via absolute path (`/usr/bin/gpg`).
I consider it a minor change so no update to changelog is proposed but if you feel different please let me know.

### Related issue(s)
- Auto close an issue like: closes #2892

## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [x] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.


Co-authored-by: Helmuth Breitenfellner <[email protected]>
Co-authored-by: Florent Daigniere <[email protected]>
  • Loading branch information
3 people committed Aug 9, 2023
2 parents 1e457bb + 5d8b194 commit 32d1c7d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions towncrier/newsfragments/2892.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix GPG operations from Roundcube - calling gpg with full path was blocked
2 changes: 1 addition & 1 deletion webmails/snuffleupagus.rules
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ sp.disable_function.function("system").param("command").value_r("[$|;&`\\n\\(\\)
sp.disable_function.function("shell_exec").param("command").value_r("[$|;&`\\n\\(\\)\\\\]").drop();
sp.disable_function.function("exec").param("command").value_r("[$|;&`\\n\\(\\)\\\\]").drop();
# This is **very** broad but doing better is non-straightforward
sp.disable_function.function("proc_open").param("command").value_r("^gpg ").allow();
sp.disable_function.function("proc_open").param("command").value_r("^(/usr/bin/)?gpg ").allow();
sp.disable_function.function("proc_open").param("command").value_r("[$|;&`\\n\\(\\)\\\\]").drop();

# Prevent runtime modification of interesting things
Expand Down

0 comments on commit 32d1c7d

Please sign in to comment.