upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-03-16 23:52:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

use allow/deny list wording

Browse source
This commit is contained in:
Thomas Waldmann 2020-07-07 23:01:55 +02:00
parent 62fa50c41e
commit d1b9ca138b
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/borg/archiver.py
View file

@ -4389,27 +4389,27 @@ class Archiver:
# make sure we only process like normal if the client is executing
# the same command as specified in the forced command, otherwise
# just skip this block and return the forced command (== result).
# client is allowed to specify the whitelisted options,
# client is allowed to specify the allowlisted options,
# everything else comes from the forced "borg serve" command (or the defaults).
# stuff from blacklist must never be used from the client.
blacklist = {
# stuff from denylist must never be used from the client.
denylist = {
'restrict_to_paths',
'restrict_to_repositories',
'append_only',
'storage_quota',
}
whitelist = {
allowlist = {
'debug_topics',
'lock_wait',
'log_level',
'umask',
}
not_present = object()
for attr_name in whitelist:
assert attr_name not in blacklist, 'whitelist has blacklisted attribute name %s' % attr_name
for attr_name in allowlist:
assert attr_name not in denylist, 'allowlist has denylisted attribute name %s' % attr_name
value = getattr(client_result, attr_name, not_present)
if value is not not_present:
# note: it is not possible to specify a whitelisted option via a forced command,
# note: it is not possible to specify a allowlisted option via a forced command,
# it always gets overridden by the value specified (or defaulted to) by the client commmand.
setattr(result, attr_name, value)

2
src/borg/remote.py
View file

@ -109,7 +109,7 @@ class UnexpectedRPCDataFormatFromServer(Error):
# For the client the return of the negotiate method is either 2 if the server is in the version range [0.29.0, 1.0.x]
# inclusive, or it is a dict which includes the server version.
#
# All method calls on the remote repository object must be whitelisted in RepositoryServer.rpc_methods and have api
# All method calls on the remote repository object must be allowlisted in RepositoryServer.rpc_methods and have api
# stubs in RemoteRepository. The @api decorator on these stubs is used to set server version requirements.
#
# Method parameters are identified only by name and never by position. Unknown parameters are ignored by the server side.