mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-12-08 19:02:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

build_library: use proper vocabulary in generate_au_zip

Browse Source 
Replace black list with deny list, white list with allow list.
This commit is contained in:
Dongsu Park 2021-08-12 15:31:00 +02:00
parent baa09b07dc
commit a7f251da44
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
build_library/generate_au_zip.py
View File

@ -33,14 +33,14 @@ DYNAMIC_EXECUTABLES = ['/usr/bin/delta_generator',
'/usr/bin/bspatch'] '/usr/bin/bspatch']
# These files will be ignored when present in the dependancy list. # These files will be ignored when present in the dependancy list.
BLACK_LIST = [ DENY_LIST = [
# This library does not exist on disk, but is inserted into the # This library does not exist on disk, but is inserted into the
# executable's memory space when the executable is loaded by the kernel. # executable's memory space when the executable is loaded by the kernel.
'linux-vdso.so', 'linux-vdso.so',
] ]
# These files MUST be present in the dependancy list. # These files MUST be present in the dependancy list.
WHITE_LIST = [ ALLOW_LIST = [
# Update WrapExecutableFiles if this file changes names # Update WrapExecutableFiles if this file changes names
'ld-linux-x86-64.so.2', 'ld-linux-x86-64.so.2',
] ]
@ -97,7 +97,7 @@ def DepsToCopy(ldd_files):
"""Returns a list of deps for a given dynamic executables list. """Returns a list of deps for a given dynamic executables list.
Args: Args:
ldd_files: List of dynamic files that needs to have the deps evaluated ldd_files: List of dynamic files that needs to have the deps evaluated
black_list: List of files that we should ignore deny_list: List of files that we should ignore
Returns: Returns:
List of files that are dependencies List of files that are dependencies
""" """
@ -129,8 +129,8 @@ def DepsToCopy(ldd_files):
logging.error("ldd for %s failed: %s", file_name, ex) logging.error("ldd for %s failed: %s", file_name, ex)
sys.exit(1) sys.exit(1)
result = _ExcludeBlacklist(list(libs), BLACK_LIST) result = _ExcludeDenylist(list(libs), DENY_LIST)
_EnforceWhiteList(list(libs), WHITE_LIST) _EnforceAllowList(list(libs), ALLOW_LIST)
return result return result
@ -249,26 +249,26 @@ def GenerateZipFile(base_name, root_dir):
return True return True
def _ExcludeBlacklist(library_list, black_list=[]): def _ExcludeDenylist(library_list, deny_list=[]):
"""Deletes the set of files from black_list from the library_list """Deletes the set of files from deny_list from the library_list
Args: Args:
library_list: List of the library names to filter through black_list library_list: List of the library names to filter through deny_list
black_list: List of the black listed names to filter deny_list: List of the deny listed names to filter
Returns: Returns:
Filtered library_list Filtered library_list
""" """
if not black_list: if not deny_list:
return library_list return library_list
return_list = [] return_list = []
pattern = re.compile(r'|'.join(black_list)) pattern = re.compile(r'|'.join(deny_list))
logging.debug('PATTERN: %s=', pattern) logging.debug('PATTERN: %s=', pattern)
for library in library_list: for library in library_list:
if pattern.search(library): if pattern.search(library):
logging.debug('BLACK-LISTED = %s=', library) logging.debug('DENY-LISTED = %s=', library)
continue continue
return_list.append(library) return_list.append(library)
@ -277,17 +277,17 @@ def _ExcludeBlacklist(library_list, black_list=[]):
return return_list return return_list
def _EnforceWhiteList(library_list, white_list=[]): def _EnforceAllowList(library_list, allow_list=[]):
"""Deletes the set of files from black_list from the library_list """Deletes the set of files from deny_list from the library_list
Args: Args:
library_list: List of the library names to filter through black_list library_list: List of the library names to filter through deny_list
black_list: List of the black listed names to filter deny_list: List of the deny listed names to filter
Returns: Returns:
Filtered library_list Filtered library_list
""" """
for white_item in white_list: for allow_item in allow_list:
pattern = re.compile(white_item) pattern = re.compile(allow_item)
logging.debug('PATTERN: %s=', pattern) logging.debug('PATTERN: %s=', pattern)
@ -298,7 +298,7 @@ def _EnforceWhiteList(library_list, white_list=[]):
break break
if not found: if not found:
logging.error('Required WHITE_LIST items %s not found!!!' % white_item) logging.error('Required ALLOW_LIST items %s not found!!!' % allow_item)
exit(1) exit(1)