pyarmor 8.5.3__zip → 8.5.4__zip

{pyarmor-8.5.3 → pyarmor-8.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyarmor
-Version: 8.5.3
+Version: 8.5.4
 Summary: A tool used to obfuscate python scripts, bind obfuscated scripts to fixed machine or expire obfuscated scripts.
 Home-page: https://github.com/dashingsoft/pyarmor
 Author: Jondy Zhao

{pyarmor-8.5.3 → pyarmor-8.5.4}/pyarmor/cli/__init__.py

@@ -1,6 +1,6 @@
 import logging
 
-__VERSION__ = '8.5.3'
+__VERSION__ = '8.5.4'
 
 logger = logging.getLogger('cli')
 

{pyarmor-8.5.3 → pyarmor-8.5.4}/pyarmor/cli/__main__.py

@@ -136,7 +136,7 @@ def format_gen_args(ctx, args):
 
     if args.pack:
         dist_path = os.path.join(ctx.repack_path, 'dist')
-        logger.info('implicitly set output to "%s"', dist_path)
+        logger.info('implicitly save obfuscated scripts to "%s"', dist_path)
         options['output'] = dist_path
 
     return options
@@ -209,8 +209,10 @@ def check_gen_context(ctx, args):
         raise CliError('--outer conflicts with any -e, --period, -b')
 
     if args.pack:
-        if not os.path.isfile(args.pack):
-            raise CliError('--pack must be an executable file')
+        choices = 'auto', 'onefile', 'onedir'
+        if args.pack not in choices and not os.path.isfile(args.pack):
+            raise CliError('--pack must be an executable file, '
+                           '"auto", "onefile" or "onedir"')
         if args.no_runtime:
             raise CliError('--pack conficts with --no-runtime, --use-runtime')
         if ctx.import_prefix:
@@ -230,6 +232,11 @@ def cmd_gen(ctx, args):
         return _cmd_gen_key(builder, options)
     elif args.inputs[0].lower() in ('runtime', 'run', 'r'):
         _cmd_gen_runtime(builder, options)
+    elif args.pack in ('auto', 'onefile', 'onedir'):
+        from .repack import Repacker6
+        packer = Repacker6(ctx, args.pack, options['inputs'], args.output)
+        builder.process(options, packer)
+        Plugin.post_build(ctx, pack=args.pack)
     elif args.pack:
         from .repack import Repacker
         codesign = ctx.cfg['pack'].get('codesign_identify', None)

{pyarmor-8.5.3 → pyarmor-8.5.4}/pyarmor/cli/context.py

@@ -717,3 +717,22 @@ class Context(object):
 
         with get_response('pyarmor.dashingsoft.com') as res:
             return res.read()
+
+    #
+    # Pack options for auto/onefile/onefolder mode
+    #
+    @property
+    def pyi_options(self):
+        from json import loads as json_loads
+        from shlex import split as split_opt
+        pyi_opts = []
+        jsmarker = 'json::'
+        for line in self.cfg['pack'].get('pyi_options', '').splitlines():
+            line = line.strip()
+            if line.startswith(jsmarker):
+                pyi_opts.extend(json_loads(line[len(jsmarker):]))
+            elif line.startswith('-'):
+                pyi_opts.extend(split_opt(line))
+            elif line:
+                pyi_opts.append(line)
+        return pyi_opts

{pyarmor-8.5.3 → pyarmor-8.5.4}/pyarmor/cli/default.cfg

@@ -3,7 +3,7 @@
 ;; Pyarmor version
 major = 8
 minor = 5
-patch = 3
+patch = 4
 
 ;; Compatible core version
 cli.core = 6.5.1

{pyarmor-8.5.3 → pyarmor-8.5.4}/pyarmor/cli/generate.py

@@ -62,6 +62,13 @@ class Finder(object):
                 self.ctx.obfuscated_modules.add(res.pkgname)
                 self.ctx.extra_resources.append(res)
 
+    def append(self, resources):
+        resnames = [x.pkgname for x in self.ctx.resources]
+        for res in self._build_resource(resources):
+            if res.pkgname not in resnames:
+                self.ctx.obfuscated_modules.add(res.pkgname)
+                self.ctx.extra_resources.append(res)
+
     def process(self):
         logger.info('search inputs ...')
         self.prepare(self.ctx.input_paths)
@@ -149,8 +156,13 @@ class Builder(object):
         finder = Finder(self.ctx)
         finder.process()
 
-        if packer and options.get('self_contained'):
-            finder.process_extra(packer.contents)
+        if packer:
+            if options.get('self_contained'):
+                finder.process_extra(packer.contents)
+            if hasattr(packer, 'analysis'):
+                auto_resources = packer.analysis()
+                logger.info('find extra resources: %s', auto_resources)
+                finder.append(auto_resources)
 
         Pytransform3.pre_build(self.ctx)
 

{pyarmor-8.5.3 → pyarmor-8.5.4}/pyarmor/cli/repack.py

@@ -3,6 +3,7 @@ import marshal
 import os
 import shutil
 import struct
+import sys
 import tempfile
 
 from importlib._bootstrap_external import _code_to_timestamp_pyc
@@ -435,3 +436,158 @@ class Repacker:
             check_call(cmdlist, stdout=DEVNULL, stderr=DEVNULL)
         except Exception as e:
             logger.warning('%s', e)
+
+
+# This patch is used to modify the specfile generate by PyInstaller
+#
+# It has 2 goals:
+#
+# 1. Find all the imported modules and packages
+#
+#    Save them to hook script
+#
+# 2. Search scripts and packages in the path of entry script
+#
+#    All of them will be obfuscated automatically
+#
+spec_patch_code = '''
+from PyInstaller.compat import base_prefix
+import marshal
+import os
+
+hiddenimports = set([])
+plist = set([])
+mlist = []
+src = {src}
+sn = len(src) + 1
+prefix = os.path.relpath(src)
+prefix = '' if prefix == '.' else prefix
+
+for name, path, kind in a.pure:
+    if name.startswith('pyi_rth'):
+        continue
+    if path.startswith(src) and not path.startswith(base_prefix):
+        hiddenimports.add(name)
+        if name.find('.') == -1 and os.path.basename(path) != '__init__.py':
+            mlist.append(os.path.join(prefix, path[sn:]))
+        else:
+            pkgname = os.path.dirname(path[sn:]).split(os.sep)[0]
+            plist.add(os.path.join(prefix, pkgname))
+    else:
+        hiddenimports.add(name.split('.')[0])
+
+with open({resfile}, 'wb') as f:
+    marshal.dump(mlist + list(plist), f)
+with open({hookscript}, 'w') as f:
+    f.write("hiddenimports=[%s]" % ", ".join([repr(x) for x in hiddenimports]))
+'''
+
+
+class Repacker6:
+    """New repacker to support PyInstaller 6.0+
+
+    Args:
+        ctx: build context
+        mode: onefile or onefolder
+        inputs: main script to pack
+    """
+
+    def __init__(self, ctx, mode, inputs, output):
+        self.ctx = ctx
+        self.inputs = inputs
+        self.output = 'dist' if output is None else os.path.normpath(output)
+
+        self.script = self.inputs[0]
+        self.packpath = os.path.normpath(self.ctx.repack_path)
+        self.workpath = os.path.join(self.packpath, 'build')
+        self.obfpath = os.path.join(self.packpath, 'dist')
+        self.pyicmd = [sys.executable, '-m', 'PyInstaller']
+        self.pyiopts = self.init_opts(mode)
+
+    def init_opts(self, mode):
+        opts = []
+        exopts = '--noconfirm', '-y'
+        if mode == 'auto':
+            exopts += ('--onefile', '-F', '--onefolder', '-D')
+        else:
+            opts.append('-F' if mode == 'onefile' else '-D')
+        opts.extend(self.ctx.pyi_options)
+
+        exvalues = '--distpath', '--specpath', '--workpath'
+        return self.filter_opts(opts, exvalues, exopts)
+
+    def filter_opts(self, opts, exvalues, exopts=None):
+        result = []
+        isvalue = False
+        for x in opts:
+            if isvalue:
+                isvalue = False
+            elif x in exvalues:
+                isvalue = True
+            elif exopts is None or x not in exopts:
+                result.append(x)
+        return result
+
+    def analysis(self):
+        """Got imported modules and packages by PyInstaller
+
+        Generate hook script
+        Return file/dir list need to be obfuscated
+        """
+        cmdspec = [
+            sys.executable, '-m', 'PyInstaller.utils.cliutils.makespec',
+            '--specpath', self.packpath
+        ]
+        cmdspec.extend(self.filter_opts(self.pyiopts, ('--name', '-N')))
+        cmdspec.append(self.script)
+        check_call(cmdspec)
+
+        name = os.path.splitext(os.path.basename(self.script))[0]
+        rtname = self.ctx.runtime_package_name
+        specfile = os.path.join(self.packpath, name + '.spec')
+        resfile = os.path.join(self.packpath, 'resources.list')
+        hookscript = os.path.join(self.packpath, 'hook-%s.py' % rtname)
+        self.patch_specfile(specfile, hookscript, resfile)
+
+        cmdlist = self.pyicmd + ['--clean', '--workpath', self.workpath]
+        cmdlist.extend(self.pyiopts)
+        cmdlist.append(specfile)
+        check_call(cmdlist)
+
+        with open(resfile, 'rb') as f:
+            return marshal.load(f)
+
+    def build(self):
+        """Generate final bundle to output"""
+        script = os.path.join(self.obfpath, os.path.basename(self.inputs[0]))
+        cmdlist = self.pyicmd + [
+            '--clean',
+            '--distpath', self.output,
+            '--workpath', self.workpath,
+            '--specpath', self.packpath,
+            '--additional-hooks-dir', self.packpath,
+        ]
+        cmdlist.extend(self.pyiopts)
+        cmdlist.append(script)
+        check_call(cmdlist)
+
+    def repack(self, *unused):
+        """Only for compatible with Repacker"""
+        self.build()
+
+    def patch_specfile(self, specfile, hookscript, resfile):
+        # TODO: non-ascii need specify encoding to open file
+        lines = []
+        with open(specfile, 'r') as f:
+            for line in f:
+                if line.startswith('pyz = PYZ'):
+                    break
+                lines.append(line)
+
+        lines.append(spec_patch_code.format(
+            src=repr(os.path.abspath(os.path.dirname(self.script))),
+            hookscript=repr(os.path.abspath(hookscript)),
+            resfile=repr(os.path.abspath(resfile))))
+
+        with open(specfile, 'w') as f:
+            f.write(''.join(lines))

{pyarmor-8.5.3 → pyarmor-8.5.4}/pyarmor/config.py

@@ -1,6 +1,6 @@
 from sys import platform
 
-version = '8.5.3'
+version = '8.5.4'
 
 # The corresponding version of pytransform.so
 core_version = 'r52.6'

{pyarmor-8.5.3 → pyarmor-8.5.4}/pyarmor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyarmor
-Version: 8.5.3
+Version: 8.5.4
 Summary: A tool used to obfuscate python scripts, bind obfuscated scripts to fixed machine or expire obfuscated scripts.
 Home-page: https://github.com/dashingsoft/pyarmor
 Author: Jondy Zhao