pyarmor 8.5.8__zip → 8.5.10__zip

{pyarmor-8.5.8 → pyarmor-8.5.10}/PKG-INFO

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

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

{pyarmor-8.5.8 → pyarmor-8.5.10}/pyarmor/cli/bug.py

@@ -36,7 +36,7 @@ $tracelog
 $tb
 ''')
 
-ENABLE_DEBUG_HINTS = '''something is wrong
+UNUSED_ENABLE_DEBUG_HINTS = '''something is wrong
 *=============================================================*
 *  Please enable debug option `-d` to run it again            *
 *    pyarmor -d gen options ...                               *
@@ -45,11 +45,10 @@ ENABLE_DEBUG_HINTS = '''something is wrong
 *                                                             *
 *  Please also check                                          *
 *    https://pyarmor.readthedocs.io/en/latest/questions.html  *
-*  or run `pyarmor man` to find solutions quickly             *
 *=============================================================*
 '''
 
-SOLUTION_HINTS = Template('''something is wrong
+UNUSED_SOLUTION_HINTS = Template('''something is wrong
 *=============================================================*
 *  Please check                                               *
 *    https://pyarmor.readthedocs.io/en/latest/questions.html  *
@@ -61,6 +60,17 @@ SOLUTION_HINTS = Template('''something is wrong
 *=============================================================*
 ''')
 
+ENABLE_DEBUG_HINTS = 'please enable debug option `-d` to run it again'
+
+SOLUTION_HINTS = Template('''something is wrong
+*=============================================================*
+*  Please check console log to find out what's wrong          *
+*                                                             *
+*  If still not solved, please find solutions by              *
+*    https://pyarmor.readthedocs.io/en/latest/questions.html  *
+*=============================================================*
+''')
+
 
 def generate_bug_report(e, logfile=LOG_FILE, output=BUG_FILE):
     'Generate file `pyarmor.report.bug` in current path'
@@ -111,6 +121,7 @@ def find_solutions(e):
         logger.error(ENABLE_DEBUG_HINTS)
         return
 
+    logger.info('generate bug file "%s"', BUG_FILE)
     generate_bug_report(e)
     logger.error(SOLUTION_HINTS.substitute(bugfile=BUG_FILE))
 

{pyarmor-8.5.8 → pyarmor-8.5.10}/pyarmor/cli/context.py

@@ -64,7 +64,11 @@ def __pyarmor__():
             ('armv6', ('armv6l',)),
             ('armv7', ('armv7l',)),
             ('aarch32', ('aarch32',)),
-            ('aarch64', ('aarch64', 'arm64'))
+            ('aarch64', ('aarch64', 'arm64')),
+            ('ppc64le', ('ppc64le',)),
+            ('mips32el', ('mipsel', 'mips32el')),
+            ('mips64el', ('mips64el',)),
+            ('riscv64', ('riscv64',)),
         )
         for alias, archlist in arch_table:
             if mach in archlist:
@@ -92,12 +96,21 @@ __pyarmor__ = ExtensionFileLoader(
 '''
 
 
-def format_platform(plat, arch):
+def format_platform(plat=None, arch=None):
     from struct import calcsize
     from fnmatch import fnmatchcase
 
+    # Fix pyarmor.cli.core 6.5.2 issue, may be removed in 6.5.3
+    if plat is None and arch is None:
+        if os.getenv('PYARMOR_PLATFORM'):
+            plat, arch = os.getenv('PYARMOR_PLATFORM').split('.')
+        else:
+            from platform import system, machine
+            plat, arch = system().lower(), machine().lower()
+
     plat_table = (
-        ('windows', ('windows', 'cygwin*')),
+        ('windows', ('windows',)),
+        ('cygwin', ('cygwin*',)),
         ('darwin', ('darwin',)),
         ('linux', ('linux*',)),
         ('freebsd', ('freebsd*', 'openbsd*', 'isilon onefs')),
@@ -110,7 +123,11 @@ def format_platform(plat, arch):
         ('armv6', ('armv6l',)),
         ('armv7', ('armv7l',)),
         ('aarch32', ('aarch32',)),
-        ('aarch64', ('aarch64', 'arm64'))
+        ('aarch64', ('aarch64', 'arm64')),
+        ('ppc64le', ('ppc64le',)),
+        ('mips32el', ('mipsel', 'mips32el')),
+        ('mips64el', ('mips64el',)),
+        ('riscv64', ('riscv64',)),
     )
 
     for alias, platlist in plat_table:
@@ -197,9 +214,10 @@ class Context(object):
         return self._read_config(flist, encoding=encoding)
 
     def read_token(self):
-        if os.path.exists(self.license_token):
-            with open(self.license_token, 'rb') as f:
-                return f.read()
+        for filename in (self.license_token, self.license_group_token):
+            if os.path.exists(filename):
+                with open(filename, 'rb') as f:
+                    return f.read()
 
     def save_token(self, data):
         with open(self.license_token, 'wb') as f:
@@ -207,6 +225,12 @@ class Context(object):
                 raise RuntimeError('got invalid token %r' % data)
             f.write(data)
 
+    def save_group_token(self, data):
+        with open(self.license_group_token, 'wb') as f:
+            if not data.endswith(b'=='):
+                raise RuntimeError('got invalid token %r' % data)
+            f.write(data)
+
     def clear_token(self):
         if os.path.exists(self.license_token):
             with open(self.license_token, 'wb') as f:
@@ -330,6 +354,10 @@ class Context(object):
     def license_token(self):
         return os.path.join(self.reg_path, '.license.token')
 
+    @property
+    def license_group_token(self):
+        return os.path.join(self.reg_path, '.license.group.token')
+
     @property
     def license_info(self):
         from .register import parse_token

{pyarmor-8.5.8 → pyarmor-8.5.10}/pyarmor/cli/default.cfg

@@ -3,10 +3,10 @@
 ;; Pyarmor version
 major = 8
 minor = 5
-patch = 8
+patch = 10
 
 ;; Compatible core version
-cli.core = 6.5.1
+cli.core = 6.5.3
 
 ;; Deprecated since Pyarmor 8.2.5
 ; cli.runtime = 3.2.5
@@ -93,6 +93,7 @@ rft_enables = builtin import function class method global local
 rft_auto_exclude = 1
 
 ;; Export all the names in module attribute __all__
+;; It means leave all the names in the __all__ as they're
 rft_auto_export = 1
 
 ;; Enable dev mode for rft
@@ -192,6 +193,9 @@ clear_frame_locals = 0
 ;; Whether encrypt name in statement import
 rft_mix_import_name = 0
 
+;; Strip leading name package
+strip_package_name = 1
+
 ;;
 ;; Compatiable options
 ;;
@@ -255,18 +259,14 @@ on_error = 0
 ;;   3600s
 ;;   60m
 ;;   1h
-;;   1
+;;   1 = 1h
 ; period = 1
 
-;; Expired runtime key. Check local time if there is leading '.',
-;; otherwise check ntp time
+;; Expired runtime key, support 2 forms:
 ;;
-;;     30
+;;     30: expired in 30 days
 ;;     2025-12-31
 ;;
-;;     .30
-;;     .2025-12-30
-;;
 ; expired =
 
 ;; Check network time by those servers

{pyarmor-8.5.8 → pyarmor-8.5.10}/pyarmor/cli/docker.py

@@ -32,6 +32,7 @@ from .register import Register, MACHFLAGS
 
 
 CONFIG = {
+    'host': '0.0.0.0',
     'port': 29092,
     'home': os.path.expanduser(os.path.join('~', '.pyarmor', 'docker')),
     'machid': None,
@@ -110,6 +111,7 @@ def main_entry():
     parser = argparse.ArgumentParser()
     parser.add_argument('-d', '--debug', action='store_true',
                         help='Enable debug mode')
+    parser.add_argument('--host', type=str, default=CONFIG['host'])
     parser.add_argument('-p', '--port', type=int, default=CONFIG['port'],
                         help=argparse.SUPPRESS)
     parser.add_argument('-s', '--sock', default='/var/run/docker.sock',
@@ -135,9 +137,9 @@ def main_entry():
     CONFIG['machid'] = [Pytransform3.get_hd_info(x) for x in MACHFLAGS]
     logging.debug('machine id: %s', CONFIG['machid'])
 
-    host, port = '0.0.0.0', args.port
+    host, port = args.host, args.port
     with socketserver.TCPServer((host, port), DockerAuthHandler) as server:
-        logging.info('listen container auth request on %s:%s', host, args.port)
+        logging.info('listen container auth request on %s:%s', host, port)
         server.serve_forever()
 
 

{pyarmor-8.5.8 → pyarmor-8.5.10}/pyarmor/cli/generate.py

@@ -99,6 +99,21 @@ class Builder(object):
             self.ctx.runtime_key = self.generate_runtime_key()
         Pytransform3.generate_runtime_package(self.ctx, output)
 
+    def _generate_obfuscated_script(self, res):
+        try:
+            return Pytransform3.generate_obfuscated_script(self.ctx, res)
+        except RuntimeError as e:
+            if str(e) != 'out of license':
+                raise
+
+    def _copy_script(self, path, res):
+        logger.warning('%s is not obfuscated because out of license', res)
+        fullpath = os.path.join(path, res.output_filename)
+        output = os.path.dirname(fullpath)
+        os.makedirs(output, exist_ok=True)
+        logger.info('write %s (not obfuscated)', fullpath)
+        shutil.copy2(res.fullpath, output)
+
     def _obfuscate_scripts(self):
         rev = self.ctx.version_info()
         template = self.ctx.bootstrap_template

{pyarmor-8.5.8 → pyarmor-8.5.10}/pyarmor/cli/hdinfo.py

@@ -36,6 +36,22 @@ def get_hd_info(hdtype, name=None):
         return str(e)
 
 
+def get_all_ifmac():
+    try:
+        buf = Pytransform3.get_hd_info(HT_IFMAC, name='*')
+        i = 0
+        n = len(buf)
+        rlist = []
+        while i < n and buf[i]:
+            j = i + 1 + buf[i]
+            rlist.append(':'.join(['%02x' % x for x in buf[i+1:j]]))
+            i = j
+    except Exception as e:
+        return str(e)
+
+    return '<%s>' % ','.join(set(rlist))
+
+
 def main(argv):
     parser = argparse.ArgumentParser()
     parser.add_argument('devname', nargs='*', help=(
@@ -49,7 +65,7 @@ def main(argv):
         print('Default Harddisk Serial Number: %s' % get_hd_info(HT_HARDDISK))
         print('Default Mac address: %s' % get_hd_info(HT_IFMAC))
         print('Default IPv4 address: %s' % get_hd_info(HT_IPV4))
-        print('Multiple Mac addresses: %s' % get_hd_info(HT_IFMAC, name='*'))
+        print('Multiple Mac addresses: %s' % get_all_ifmac())
         print('Domain: %s' % get_hd_info(HT_DOMAIN))
 
     for name in args.devname:

{pyarmor-8.5.8 → pyarmor-8.5.10}/pyarmor/cli/plugin.py

@@ -236,10 +236,11 @@ def find_runtime_package(ctx, output):
         return os.path.join(output, rtname)
     if isinstance(prefix, str):
         return os.path.join(output, prefix.replace('.', os.path.sep), rtname)
-    for entry in os.scandir(output):
-        if entry.is_dir():
-            if rtname in os.listdir(entry.path):
-                return os.path.join(entry.path, rtname)
+    with os.scandir(output) as iterator:
+        for entry in iterator:
+            if entry.is_dir():
+                if rtname in os.listdir(entry.path):
+                    return os.path.join(entry.path, rtname)
 
 
 class DarwinUniversalPlugin:

{pyarmor-8.5.8 → pyarmor-8.5.10}/pyarmor/cli/register.py

@@ -199,7 +199,7 @@ class Register(object):
                         raise CliError('this group device license is not for '
                                        'this docker host')
                 logger.debug('extracting %s', name)
-                self.ctx.save_token(f.read(name))
+                self.ctx.save_group_token(f.read(name))
                 return
             if 'group.info' in namelist:
                 logger.info('refer to http://pyarmor.readthedocs.io/en/stable/how-to/register.html'
@@ -217,6 +217,8 @@ class Register(object):
             rlist = []
             with socket(AF_INET, SOCK_STREAM) as s:
                 s.connect((host, port))
+                logger.info('socket addr: %s', str(s.getsockname()))
+                logger.info('remote addr: %s', str(s.getpeername()))
                 s.sendall(b'PADH' + b'x' * 60)
                 while True:
                     flag = s.recv(1)

{pyarmor-8.5.8 → pyarmor-8.5.10}/pyarmor/cli/repack.py

@@ -2,14 +2,14 @@ import logging
 import marshal
 import os
 import shutil
-import struct
 import sys
-import tempfile
 
 from fnmatch import fnmatch
 from subprocess import check_call, DEVNULL
 
 # Only used by BundleRepacker, they could be removed with deprecated routines
+import struct
+import tempfile
 from importlib._bootstrap_external import _code_to_timestamp_pyc
 from PyInstaller.archive.writers import ZlibArchiveWriter, CArchiveWriter
 from PyInstaller.archive.readers import CArchiveReader
@@ -41,7 +41,7 @@ def autoclean_output(output, autoclean=True):
         shutil.rmtree(output)
 
 
-# This patch is used to modify the specfile generate by PyInstaller
+# This patch is used to modify the specfile generated by PyInstaller
 #
 # It mainly does:
 #
@@ -554,7 +554,7 @@ def repack_pyzarchive(pyzpath, pyztoc, obfpath, rtname, cipher=None):
             fullpath = fullpath + 'c'
         if os.path.exists(fullpath):
             logger.info('replace item "%s"', name)
-            with open(fullpath, 'r') as f:
+            with open(fullpath, 'r', encoding='utf-8') as f:
                 co = compile(f.read(), '<frozen %s>' % name, 'exec')
                 code_dict[name] = co
         else:
@@ -711,7 +711,8 @@ class BundleRepacker:
         logger.debug('one file mode is %s', bool(self.one_file_mode))
 
     def build(self):
-        self.repack(self.output, self.ctx.runtime_package_name)
+        obfpath = os.path.normpath(self.ctx.pack_obfpath)
+        self.repack(obfpath, self.ctx.runtime_package_name)
 
     def repack(self, obfpath, rtname, entry=None):
         buildpath = self.buildpath

{pyarmor-8.5.8 → pyarmor-8.5.10}/pyarmor/cli/resource.py

@@ -200,7 +200,7 @@ class PycResource(FileResource):
 class PathResource(Resource):
 
     def __init__(self, path, name=None, parent=None):
-        super().__init__(path, name=name, parent=parent)
+        super().__init__(path, name=os.path.basename(path), parent=parent)
         self.respaths = []
         self.resfiles = []
 

{pyarmor-8.5.8 → pyarmor-8.5.10}/pyarmor/config.py

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

{pyarmor-8.5.8 → pyarmor-8.5.10}/pyarmor/packer.py

@@ -294,6 +294,8 @@ def _patch_specfile(obfdist, src, specfile, hookpath=None, encoding=None,
     end_lines = ("# Patch end.", "", "",)
 
     main_lines = (
+        "from PyInstaller.config import CONF",
+        "_code_cache = getattr(a.pure, '_code_cache', CONF['code_cache'].get(id(a.pure)))",
         "_src = %s" % repr(os.path.abspath(src)),
         "_obf = 0",
         "for i in range(len(a.scripts)):",
@@ -308,9 +310,9 @@ def _patch_specfile(obfdist, src, specfile, hookpath=None, encoding=None,
         "    if a.pure[i][1].startswith(_src):",
         "        x = a.pure[i][1].replace(_src, r'%s')" % p,
         "        if os.path.exists(x):",
-        "            if hasattr(a.pure, '_code_cache'):",
+        "            if _code_cache:",
         "                with open(x) as f:",
-        "                    a.pure._code_cache[a.pure[i][0]] = compile(f.read(), a.pure[i][1], 'exec')",
+        "                    _code_cache[a.pure[i][0]] = compile(f.read(), a.pure[i][1], 'exec')",
         "            a.pure[i] = a.pure[i][0], x, a.pure[i][2]",
     )
 

{pyarmor-8.5.8 → pyarmor-8.5.10}/pyarmor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyarmor
-Version: 8.5.8
+Version: 8.5.10
 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.10/pyarmor.egg-info/requires.txt

@@ -0,0 +1 @@
+pyarmor.cli.core~=6.5.3

{pyarmor-8.5.8 → pyarmor-8.5.10}/setup.py

@@ -113,7 +113,7 @@ setup(
     },
 
     install_requires=[
-        'pyarmor.cli.core~=6.5.1'
+        'pyarmor.cli.core~=6.5.3'
     ],
 
     entry_points={

pyarmor-8.5.8/pyarmor.egg-info/requires.txt

@@ -1 +0,0 @@
-pyarmor.cli.core~=6.5.1