Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2391e50e authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Browser: Update domain_substitution to 123.0.6312.58

parent f410de52

domain_substitution/_common.py

+1 −2
Original line number Diff line number Diff line
@@ -36,9 +36,8 @@ class ExtractorEnum: #pylint: disable=too-few-public-methods 


class SetLogLevel(argparse.Action): #pylint: disable=too-few-public-methods

    """Sets logging level based on command line arguments it receives"""



    def __init__(self, option_strings, dest, nargs=None, **kwargs):

        super(SetLogLevel, self).__init__(option_strings, dest, nargs=nargs, **kwargs)

        super().__init__(option_strings, dest, nargs=nargs, **kwargs)



    def __call__(self, parser, namespace, value, option_string=None):

        if option_string in ('--verbose', '-v'):

domain_substitution/_extraction.py

+22 −37
Original line number Diff line number Diff line
@@ -23,24 +23,18 @@ DEFAULT_EXTRACTORS = { 
}





class ExtractionError(BaseException):

    """Exceptions thrown in this module's methods"""





def _find_7z_by_registry():

    """

    Return a string to 7-zip's 7z.exe from the Windows Registry.



    Raises ExtractionError if it fails.

    """

    import winreg #pylint: disable=import-error

    import winreg #pylint: disable=import-error, import-outside-toplevel

    sub_key_7zfm = 'SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\7zFM.exe'

    try:

        with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, sub_key_7zfm) as key_handle:

            sevenzipfm_dir = winreg.QueryValueEx(key_handle, 'Path')[0]

    except OSError:

        get_logger().exception('Unable to locate 7-zip from the Windows Registry')

        raise ExtractionError()

        raise

    sevenzip_path = Path(sevenzipfm_dir, '7z.exe')

    if not sevenzip_path.is_file():

        get_logger().error('7z.exe not found at path from registry: %s', sevenzip_path)
@@ -50,17 +44,15 @@ def _find_7z_by_registry(): 
def _find_winrar_by_registry():

    """

    Return a string to WinRAR's WinRAR.exe from the Windows Registry.



    Raises ExtractionError if it fails.

    """

    import winreg #pylint: disable=import-error

    import winreg #pylint: disable=import-error, import-outside-toplevel

    sub_key_winrar = 'SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\WinRAR.exe'

    try:

        with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, sub_key_winrar) as key_handle:

            winrar_dir = winreg.QueryValueEx(key_handle, 'Path')[0]

    except OSError:

        get_logger().exception('Unable to locale WinRAR from the Windows Registry')

        raise ExtractionError()

        raise

    winrar_path = Path(winrar_dir, 'WinRAR.exe')

    if not winrar_path.is_file():

        get_logger().error('WinRAR.exe not found at path from registry: %s', winrar_path)
@@ -89,7 +81,7 @@ def _process_relative_to(unpack_root, relative_to): 
    if not relative_root.is_dir():

        get_logger().error('Could not find relative_to directory in extracted files: %s',

                           relative_to)

        raise ExtractionError()

        raise Exception()

    for src_path in relative_root.iterdir():

        dest_path = unpack_root / src_path.name

        src_path.rename(dest_path)
@@ -101,7 +93,7 @@ def _extract_tar_with_7z(binary, archive_path, output_dir, relative_to, skip_unu 
    if not relative_to is None and (output_dir / relative_to).exists():

        get_logger().error('Temporary unpacking directory already exists: %s',

                           output_dir / relative_to)

        raise ExtractionError()

        raise Exception()

    cmd1 = (binary, 'x', str(archive_path), '-so')

    cmd2 = (binary, 'x', '-si', '-aoa', '-ttar', '-o{}'.format(str(output_dir)))

    if skip_unused:
@@ -117,7 +109,7 @@ def _extract_tar_with_7z(binary, archive_path, output_dir, relative_to, skip_unu 
        get_logger().error('7z commands returned non-zero status: %s', proc2.returncode)

        get_logger().debug('stdout: %s', stdout_data)

        get_logger().debug('stderr: %s', stderr_data)

        raise ExtractionError()

        raise Exception()



    _process_relative_to(output_dir, relative_to)
@@ -130,10 +122,10 @@ def _extract_tar_with_tar(binary, archive_path, output_dir, relative_to, skip_un 
        for cpath in CONTINGENT_PATHS:

            cmd += ('--exclude=%s/%s' % (str(relative_to), cpath[:-1]), )

    get_logger().debug('tar command line: %s', ' '.join(cmd))

    result = subprocess.run(cmd)

    result = subprocess.run(cmd, check=False)

    if result.returncode != 0:

        get_logger().error('tar command returned %s', result.returncode)

        raise ExtractionError()

        raise Exception()



    # for gnu tar, the --transform option could be used. but to keep compatibility with

    # bsdtar on macos, we just do this ourselves
@@ -146,12 +138,12 @@ def _extract_tar_with_winrar(binary, archive_path, output_dir, relative_to, skip 
    cmd = (binary, 'x', '-o+', str(archive_path), str(output_dir))

    if skip_unused:

        for cpath in CONTINGENT_PATHS:

            cmd += ('-x%s%s%s' % (str(relative_to), os.sep, cpath[:-1].replace('/'), os.sep), )

            cmd += ('-x%s%s%s' % (str(relative_to), os.sep, cpath[:-1].replace('/')), )

    get_logger().debug('WinRAR command line: %s', ' '.join(cmd))

    result = subprocess.run(cmd)

    result = subprocess.run(cmd, check=False)

    if result.returncode != 0:

        get_logger().error('WinRAR command returned %s', result.returncode)

        raise ExtractionError()

        raise Exception()



    _process_relative_to(output_dir, relative_to)
@@ -161,7 +153,6 @@ def _extract_tar_with_python(archive_path, output_dir, relative_to, skip_unused) 


    class NoAppendList(list):

        """Hack to workaround memory issues with large tar files"""



        def append(self, obj):

            pass
@@ -178,7 +169,7 @@ def _extract_tar_with_python(archive_path, output_dir, relative_to, skip_unused) 
    except BaseException:

        # Unexpected exception

        get_logger().exception('Unexpected exception during symlink support check.')

        raise ExtractionError()

        raise



    with tarfile.open(str(archive_path), 'r|%s' % archive_path.suffix[1:]) as tar_file_obj:

        tar_file_obj.members = NoAppendList()
@@ -209,7 +200,7 @@ def _extract_tar_with_python(archive_path, output_dir, relative_to, skip_unused) 
                tar_file_obj._extract_member(tarinfo, str(destination)) # pylint: disable=protected-access

            except BaseException:

                get_logger().exception('Exception thrown for tar member: %s', tarinfo.name)

                raise ExtractionError()

                raise





def extract_tar_file(archive_path, output_dir, relative_to, skip_unused, extractors=None):
@@ -223,8 +214,6 @@ def extract_tar_file(archive_path, output_dir, relative_to, skip_unused, extract 
        root of the archive, or None if no path components should be stripped.

    extractors is a dictionary of PlatformEnum to a command or path to the

        extractor binary. Defaults to 'tar' for tar, and '_use_registry' for 7-Zip and WinRAR.



    Raises ExtractionError if unexpected issues arise during unpacking.

    """

    if extractors is None:

        extractors = DEFAULT_EXTRACTORS
@@ -280,8 +269,6 @@ def extract_with_7z( 
    root of the archive.

    extractors is a dictionary of PlatformEnum to a command or path to the

    extractor binary. Defaults to 'tar' for tar, and '_use_registry' for 7-Zip.



    Raises ExtractionError if unexpected issues arise during unpacking.

    """

    # TODO: It would be nice to extend this to support arbitrary standard IO chaining of 7z

    # instances, so _extract_tar_with_7z and other future formats could use this.
@@ -291,24 +278,24 @@ def extract_with_7z( 
    if sevenzip_cmd == USE_REGISTRY:

        if not get_running_platform() == PlatformEnum.WINDOWS:

            get_logger().error('"%s" for 7-zip is only available on Windows', sevenzip_cmd)

            raise ExtractionError()

            raise Exception()

        sevenzip_cmd = str(_find_7z_by_registry())

    sevenzip_bin = _find_extractor_by_cmd(sevenzip_cmd)



    if not relative_to is None and (output_dir / relative_to).exists():

        get_logger().error('Temporary unpacking directory already exists: %s',

                           output_dir / relative_to)

        raise ExtractionError()

        raise Exception()

    cmd = (sevenzip_bin, 'x', str(archive_path), '-aoa', '-o{}'.format(str(output_dir)))

    if skip_unused:

        for cpath in CONTINGENT_PATHS:

            cmd += ('-x!%s/%s' % (str(relative_to), cpath[:-1]), )

    get_logger().debug('7z command line: %s', ' '.join(cmd))



    result = subprocess.run(cmd)

    result = subprocess.run(cmd, check=False)

    if result.returncode != 0:

        get_logger().error('7z command returned %s', result.returncode)

        raise ExtractionError()

        raise Exception()



    _process_relative_to(output_dir, relative_to)
@@ -330,8 +317,6 @@ def extract_with_winrar( 
    root of the archive.

    extractors is a dictionary of PlatformEnum to a command or path to the

    extractor binary. Defaults to 'tar' for tar, and '_use_registry' for WinRAR.



    Raises ExtractionError if unexpected issues arise during unpacking.

    """

    if extractors is None:

        extractors = DEFAULT_EXTRACTORS
@@ -339,23 +324,23 @@ def extract_with_winrar( 
    if winrar_cmd == USE_REGISTRY:

        if not get_running_platform() == PlatformEnum.WINDOWS:

            get_logger().error('"%s" for WinRAR is only available on Windows', winrar_cmd)

            raise ExtractionError()

            raise Exception()

        winrar_cmd = str(_find_winrar_by_registry())

    winrar_bin = _find_extractor_by_cmd(winrar_cmd)



    if not relative_to is None and (output_dir / relative_to).exists():

        get_logger().error('Temporary unpacking directory already exists: %s',

                           output_dir / relative_to)

        raise ExtractionError()

        raise Exception()

    cmd = (winrar_bin, 'x', '-o+', str(archive_path), str(output_dir))

    if skip_unused:

        for cpath in CONTINGENT_PATHS:

            cmd += ('-x%s%s%s' % (str(relative_to), os.sep, cpath[:-1].replace('/', os.sep)), )

    get_logger().debug('WinRAR command line: %s', ' '.join(cmd))



    result = subprocess.run(cmd)

    result = subprocess.run(cmd, check=False)

    if result.returncode != 0:

        get_logger().error('WinRAR command returned %s', result.returncode)

        raise ExtractionError()

        raise Exception()



    _process_relative_to(output_dir, relative_to)

domain_substitution/domain_substitution.list

+411 −285

File changed.

Preview size limit exceeded, changes collapsed.

domain_substitution/domain_substitution.py

+27 −21
Original line number Diff line number Diff line
@@ -206,8 +206,7 @@ def apply_substitution(regex_path, files_path, source_tree, domainsub_cache): 
    resolved_tree = source_tree.resolve()

    regex_pairs = DomainRegexList(regex_path).regex_pairs

    fileindex_content = io.BytesIO()

    with tarfile.open(

            str(domainsub_cache), 'w:%s' % domainsub_cache.suffix[1:],

    with tarfile.open(str(domainsub_cache), 'w:%s' % domainsub_cache.suffix[1:],

                      compresslevel=1) if domainsub_cache else open(os.devnull, 'w') as cache_tar:

        for relative_path in filter(len, files_path.read_text().splitlines()):

            if _INDEX_HASH_DELIMITER in relative_path:
@@ -281,11 +280,11 @@ def revert_substitution(domainsub_cache, source_tree): 


    cache_index_files = set() # All files in the file index



    with tempfile.TemporaryDirectory(

            prefix='domsubcache_files', dir=str(resolved_tree)) as tmp_extract_name:

    with tempfile.TemporaryDirectory(prefix='domsubcache_files',

                                     dir=str(resolved_tree)) as tmp_extract_name:

        extract_path = Path(tmp_extract_name)

        get_logger().debug('Extracting domain substitution cache...')

        extract_tar_file(domainsub_cache, extract_path, None)

        extract_tar_file(domainsub_cache, extract_path, None, False)



        # Validate source tree file hashes match

        get_logger().debug('Validating substituted files in source tree...')
@@ -333,17 +332,24 @@ def main(): 
        'apply',

        help='Apply domain substitution',

        description='Applies domain substitution and creates the domain substitution cache.')

    apply_parser.add_argument(

        '-r', '--regex', type=Path, required=True, help='Path to domain_regex.list')

    apply_parser.add_argument(

        '-f', '--files', type=Path, required=True, help='Path to domain_substitution.list')

    apply_parser.add_argument('-r',

                              '--regex',

                              type=Path,

                              required=True,

                              help='Path to domain_regex.list')

    apply_parser.add_argument('-f',

                              '--files',

                              type=Path,

                              required=True,

                              help='Path to domain_substitution.list')

    apply_parser.add_argument(

        '-c',

        '--cache',

        type=Path,

        help='The path to the domain substitution cache. The path must not already exist.')

    apply_parser.add_argument(

        'directory', type=Path, help='The directory to apply domain substitution')

    apply_parser.add_argument('directory',

                              type=Path,

                              help='The directory to apply domain substitution')

    apply_parser.set_defaults(reverting=False)



    # revert
@@ -351,10 +357,10 @@ def main(): 
        'revert',

        help='Revert domain substitution',

        description='Reverts domain substitution based only on the domain substitution cache.')

    revert_parser.add_argument(

        'directory', type=Path, help='The directory to reverse domain substitution')

    revert_parser.add_argument(

        '-c',

    revert_parser.add_argument('directory',

                               type=Path,

                               help='The directory to reverse domain substitution')

    revert_parser.add_argument('-c',

                               '--cache',

                               type=Path,

                               required=True,

domain_substitution/prune_binaries.py

+7 −3
Original line number Diff line number Diff line
@@ -7,12 +7,12 @@ 
"""Prune binaries from the source tree"""



import argparse

from pathlib import Path



from _common import ENCODING, get_logger, add_common_params

import sys

import os

import stat

from pathlib import Path



from _common import ENCODING, get_logger, add_common_params



# List of paths to prune if they exist, excluded from domain_substitution and pruning lists

# These allow the lists to be compatible between cloned and tarball sources
@@ -31,9 +31,11 @@ CONTINGENT_PATHS = ( 
    'third_party/dawn/tools/golang/',

    'third_party/depot_tools/external_bin/',

    'third_party/devtools-frontend/src/third_party/esbuild/',

    'third_party/google-java-format/',

    'third_party/libei/',

    'third_party/llvm-build-tools/',

    'third_party/ninja/',

    'third_party/screen-ai/',

    'third_party/siso/',

    'third_party/updater/chrome_linux64/',

    'third_party/updater/chromium_linux64/',
@@ -94,7 +96,9 @@ def prune_dirs(unpack_root): 
    """

    for pycache in unpack_root.rglob('__pycache__'):

        _prune_path(pycache)

    get_logger().info('Removing Contingent Paths')

    for cpath in CONTINGENT_PATHS:

        get_logger().info('%s: %s', 'Exists' if Path(cpath).exists() else 'Absent', cpath)

        _prune_path(unpack_root / cpath)