pyarmor 8.5.4__zip → 8.5.5__zip

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

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyarmor
-Version: 8.5.4
+Version: 8.5.5
 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.4 → pyarmor-8.5.5}/pyarmor/cli/__init__.py

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

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

@@ -135,7 +135,7 @@ def format_gen_args(ctx, args):
         options['user_data'] = args.bind_data
 
     if args.pack:
-        dist_path = os.path.join(ctx.repack_path, 'dist')
+        dist_path = ctx.pack_obfpath
         logger.info('implicitly save obfuscated scripts to "%s"', dist_path)
         options['output'] = dist_path
 
@@ -209,7 +209,7 @@ def check_gen_context(ctx, args):
         raise CliError('--outer conflicts with any -e, --period, -b')
 
     if args.pack:
-        choices = 'auto', 'onefile', 'onedir'
+        choices = 'auto', 'onefile', 'onedir', 'F', 'D', 'FC', 'DC'
         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"')
@@ -232,15 +232,16 @@ 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'):
+    elif args.pack in ('auto', 'onefile', 'onedir', 'F', 'D', 'FC', 'DC'):
         from .repack import Repacker6
         packer = Repacker6(ctx, args.pack, options['inputs'], args.output)
+        packer.check()
         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)
-        packer = Repacker(args.pack, ctx.repack_path, codesign=codesign)
+        packer = Repacker(args.pack, ctx.pack_basepath, codesign=codesign)
         packer.check()
         builder.process(options, packer=packer)
         Plugin.post_build(ctx, pack=args.pack)
@@ -419,8 +420,8 @@ https://pyarmor.readthedocs.io/en/stable/reference/man.html#pyarmor-gen
         'action arguments'
     ).add_mutually_exclusive_group()
     group.add_argument(
-        '--pack', metavar='BUNDLE',
-        help='repack bundle with obfuscated scripts'
+        '--pack', metavar='MODE',
+        help='specify pack mode, onefile or onedir'
     )
     group.add_argument(
         '--no-runtime', action='store_true', help=argparse.SUPPRESS

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

@@ -366,10 +366,6 @@ class Context(object):
         return self._check_logpath(
             self.cfg['logging'].get('trace_logfile', 'pyarmor.trace.log'))
 
-    @property
-    def repack_path(self):
-        return os.path.join(self.local_path, 'pack')
-
     def _optb(self, section, name):
         return self.cfg.getboolean(section, name, vars=self.cmd_options)
 
@@ -608,6 +604,10 @@ class Context(object):
     def runtime_obf_key_mode(self):
         return self._opti('runtime', 'obf_key_mode')
 
+    @property
+    def runtime_patch_extension(self):
+        return self._opti('runtime', 'patch_extension')
+
     #
     # RFT settings
     #
@@ -736,3 +736,11 @@ class Context(object):
             elif line:
                 pyi_opts.append(line)
         return pyi_opts
+
+    @property
+    def pack_basepath(self):
+        return os.path.join(self.local_path, 'pack')
+
+    @property
+    def pack_obfpath(self):
+        return os.path.join(self.pack_basepath, 'dist')

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

@@ -3,7 +3,7 @@
 ;; Pyarmor version
 major = 8
 minor = 5
-patch = 4
+patch = 5
 
 ;; Compatible core version
 cli.core = 6.5.1
@@ -223,6 +223,19 @@ package_name_format = pyarmor_runtime_{suffix}
 ;;     pyarmor_runtime.so
 simple_extension_name = 1
 
+;; Whether patching extension to embedded runtime key
+;;
+;;   0: do not patch extension, but store runtime key to one file
+;;   1: runtime key is embedded into extension
+;;
+;; The purpose is to solve code sign issue for Darwin platform
+;; Do not patch extension will keep code sign, so need not re-sign
+;; But it need an extra file.
+;;
+;; Note: it's different from outer runtime key.
+;;
+patch_extension = 1
+
 ;; Obfuscate runtime key
 ;;   0: no obfuscation
 ;;   1: simple obfuscation
@@ -342,6 +355,20 @@ strip = 0
 ;;    append, append it to archive
 no_matched_pyc = error
 
+;; Extra options to call PyInstaller when packing the obfuscated scripts
+;; One option one line, name and value separted by one whitespace
+;; For example
+;;
+;;   pyi_options = -w
+;;                 --add-data default.cfg:.
+;;                 --icon myapp.ico
+;;
+;; The following options could not be used here:
+;;
+;;   --distpath, --workpath, --specpath
+;;
+; pyi_options =
+
 [bcc]
 unsupported_functions = exec eval super locals __assert_armored__
 unsupported_nodes = AsyncFunctionDef AsyncFor AsyncWith Await Yield YieldFrom GeneratorExp NamedExpr MatchValue MatchSingleton MatchSequence MatchMapping MatchClass MatchStar MatchAs MatchOr

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

@@ -498,11 +498,12 @@ class Repacker6:
         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.obfpath = os.path.normpath(self.ctx.pack_obfpath)
+        self.packpath = os.path.normpath(self.ctx.pack_basepath)
         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)
+        self.autoclean = mode in ('FC', 'DC')
 
     def init_opts(self, mode):
         opts = []
@@ -510,7 +511,7 @@ class Repacker6:
         if mode == 'auto':
             exopts += ('--onefile', '-F', '--onefolder', '-D')
         else:
-            opts.append('-F' if mode == 'onefile' else '-D')
+            opts.append('-F' if mode in ('onefile', 'F', 'FC') else '-D')
         opts.extend(self.ctx.pyi_options)
 
         exvalues = '--distpath', '--specpath', '--workpath'
@@ -540,7 +541,9 @@ class Repacker6:
         ]
         cmdspec.extend(self.filter_opts(self.pyiopts, ('--name', '-N')))
         cmdspec.append(self.script)
-        check_call(cmdspec)
+        logger.debug('%s', ' '.join(cmdspec))
+        logger.info('call PyInstaller to generate specfile')
+        check_call(cmdspec, stdout=DEVNULL, stderr=DEVNULL)
 
         name = os.path.splitext(os.path.basename(self.script))[0]
         rtname = self.ctx.runtime_package_name
@@ -552,7 +555,10 @@ class Repacker6:
         cmdlist = self.pyicmd + ['--clean', '--workpath', self.workpath]
         cmdlist.extend(self.pyiopts)
         cmdlist.append(specfile)
-        check_call(cmdlist)
+        logger.debug('%s', ' '.join(cmdlist))
+        logger.info('call PyInstaller to analysis, '
+                    'it may take several minutes ...')
+        check_call(cmdlist, stdout=DEVNULL, stderr=DEVNULL)
 
         with open(resfile, 'rb') as f:
             return marshal.load(f)
@@ -569,7 +575,13 @@ class Repacker6:
         ]
         cmdlist.extend(self.pyiopts)
         cmdlist.append(script)
+
+        logger.debug('%s', ' '.join(cmdlist))
+        logger.info('call PyInstaller to generate final bundle ...\n')
         check_call(cmdlist)
+        logger.info('')
+        logger.info('the final bundle "%s" has been generate successfully',
+                    self.output)
 
     def repack(self, *unused):
         """Only for compatible with Repacker"""
@@ -591,3 +603,14 @@ class Repacker6:
 
         with open(specfile, 'w') as f:
             f.write(''.join(lines))
+
+    def check(self):
+        if os.path.exists(self.output) and self.autoclean:
+            n = len(os.path.abspath(self.output).split(os.sep))
+            if n < 3:
+                prompt = 'Are you sure to remove path "%s" (y/n)? '
+                choice = input(prompt % self.output).lower()[:1]
+                if not choice == 'y':
+                    return
+            logger.info('clean output path "%s"', self.output)
+            shutil.rmtree(self.output)

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

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyarmor
-Version: 8.5.4
+Version: 8.5.5
 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