nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-08-26 12:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

*: Use allow/denylist instead white/blacklist in comments

Browse Source 
Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: Joseph Nuthalapati <njoseph@riseup.net>
This commit is contained in:
Sunil Mohan Adapa 2021-09-23 19:55:25 -07:00 committed by Joseph Nuthalapati
parent 05565b1c60
commit b32d0f17f0
No known key found for this signature in database
GPG Key ID: 5398F00A2FA43C35
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plinth/actions.py
View File

@ -9,7 +9,7 @@ Actions run commands with this contract (version 1.1):
This guarantees that we can only select from the correct set of actions. This guarantees that we can only select from the correct set of actions.
3. (restriction) Only whitelisted actions can run. 3. (restriction) Only specifically allowed actions can run.
A. Scripts in a directory above the actions directory can't be run. A. Scripts in a directory above the actions directory can't be run.

8
plinth/setup.py
View File

@ -373,7 +373,7 @@ class ForceUpgrader():
- Package is complete. - Package is complete.
- File is available. - File is available.
- Package is trusted. - Package is trusted.
- Package is not blacklisted. - Package is not in denylist.
- Package extension is .deb. - Package extension is .deb.
- Get conffiles values from control data of .deb. - Get conffiles values from control data of .deb.
- Read from /var/lib/dpkg/status, Package and Conffiles section. - Read from /var/lib/dpkg/status, Package and Conffiles section.
@ -385,11 +385,11 @@ class ForceUpgrader():
Filtering of packages to upgrade is done as follows: Filtering of packages to upgrade is done as follows:
- Packages is upgradable. - Packages is upgradable.
- Remove packages from blacklist - Remove packages from denylist
- Remove packages unless in whitelist or whitelist is empty - Remove packages unless in allowlist or allowlist is empty
- Package in allowed origins - Package in allowed origins
- Don't consider packages that require restart (if configured). - Don't consider packages that require restart (if configured).
- Package dependencies satisfy origins, blacklist and whitelist. - Package dependencies satisfy origins, denylist and allowlist.
- Order packages alphabetically (order changes when upgrading in minimal - Order packages alphabetically (order changes when upgrading in minimal
steps). steps).