pyarmor 8.5.9__zip → 8.5.11__zip

{pyarmor-8.5.9 → pyarmor-8.5.11}/PKG-INFO

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

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

{pyarmor-8.5.9 → pyarmor-8.5.11}/pyarmor/cli/__main__.py

@@ -335,19 +335,7 @@ def cmd_reg(ctx, args):
 
 
 def cmd_man(ctx, args):
-    pkgpath = os.path.join(os.path.dirname(__file__), '..', 'man')
-    if not os.path.exists(pkgpath):
-        from subprocess import check_output
-        check_output([
-            sys.executable, '-m', 'pip', 'install',
-            '--disable-pip-version-check', 'pyarmor.man'
-        ])
-
-    from pyarmor.man.cli import main_entry
-    try:
-        main_entry(args)
-    except KeyboardInterrupt:
-        logging.info('Quit from Pyarmor.Man, Bye-Bye')
+    logging.info('This feature is still developing ...')
 
 
 def main_parser():

{pyarmor-8.5.9 → pyarmor-8.5.11}/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.9 → pyarmor-8.5.11}/pyarmor/cli/context.py

@@ -40,7 +40,7 @@ def __pyarmor__():
 
     def format_system():
         plat = platform.system().lower()
-        plat = ('windows' if plat.startswith('cygwin') else
+        plat = ('cygwin' if plat.startswith('cygwin') else
                 'linux' if plat.startswith('linux') else
                 'freebsd' if plat.startswith(
                     ('freebsd', 'openbsd', 'isilon onefs')) else plat)
@@ -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')),
@@ -196,14 +209,23 @@ class Context(object):
         return cfg
 
     def _named_config(self, name, encoding=None):
-        flist = [os.path.join(x, name)
-                 for x in (self.global_path, self.local_path)]
+        nlist = []
+        if self.cfg.getboolean('builder', 'propagate_package_options'):
+            i = name.find('.')
+            while i > -1:
+                nlist.append(name[:i])
+                i = name.find('.', i+1)
+        nlist.append(name)
+        flist = [os.path.join(b, a)
+                 for a in nlist
+                 for b in (self.global_path, self.local_path)]
         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_group_token, self.license_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:
@@ -211,6 +233,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:
@@ -249,7 +277,8 @@ class Context(object):
         if self.cfg.has_section(extra_sect):
             options.update(self.cfg.items(extra_sect))
         if name:
-            cfg = self._named_config(name + '.ruler')
+            # If input path is '.', package name will start with '..'
+            cfg = self._named_config(name.strip('.') + '.ruler')
             if cfg.has_section(sect):
                 options.update(cfg.items(sect))
         return options
@@ -334,6 +363,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.9 → pyarmor-8.5.11}/pyarmor/cli/default.cfg

@@ -3,10 +3,10 @@
 ;; Pyarmor version
 major = 8
 minor = 5
-patch = 9
+patch = 11
 
 ;; Compatible core version
-cli.core = 6.5.2
+cli.core = 6.5.3
 
 ;; Deprecated since Pyarmor 8.2.5
 ; cli.runtime = 3.2.5
@@ -102,6 +102,11 @@ rft_dev_mode = 0
 ;; Export module and classes
 ; rft_export_names = pkg.mod pkg.mod.cls pkg.mod.attr
 
+;; How to reform import statement
+;;   0 Convert import statement to security form
+;;   1 Simple rename the imported name
+rft_simple_import = 0
+
 ;; Extra paths to find dependent package
 ; pypaths =
 
@@ -115,6 +120,13 @@ rft_dev_mode = 0
 ;; Group device flag for machine id
 group_device_flag = 22
 
+;; Whether propagate package private configuration to module
+;;
+;; If enable, "pkg.mod" will inherit "pkg" configuration
+;;
+;; Otherwise, "pkg.mod" doesn't merge "pkg" configuration
+propagate_package_options = 0
+
 ;;
 ;; Part 2: global/local/module level options
 ;;
@@ -193,6 +205,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
 ;;
@@ -395,7 +410,7 @@ enable_comprehension = 1
 
 [windows.x86_64.bcc]
 cc = clang.exe
-cflags = -O3 -Wno-unsequenced -fno-asynchronous-unwind-tables -fno-unwind-tables --target=x86_64-elf-windows -c
+cflags = -O3 -Wno-unsequenced -fno-asynchronous-unwind-tables -fno-unwind-tables --target=x86_64-elf-windows -c -DENABLE_BCC_MEMSET
 
 [windows.x86.bcc]
 cc = clang.exe
@@ -414,7 +429,7 @@ cflags = -O3 -Wno-unsequenced -fno-asynchronous-unwind-tables -fno-unwind-tables
 cflags = -O3 -Wno-unsequenced -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-stack-protector -shared -nostdlib -Tlinux.armv7.ldscript
 
 [darwin.x86_64.bcc]
-cflags = -O3 -Wno-unsequenced -fno-asynchronous-unwind-tables -fno-unwind-tables --target=x86_64-elf-gnu_linux -fPIC -c
+cflags = -O3 -Wno-unsequenced -fno-asynchronous-unwind-tables -fno-unwind-tables --target=x86_64-elf-gnu_linux -fPIC -c -DENABLE_BCC_MEMSET
 
 [darwin.aarch64.bcc]
 cflags = -O3 -Wno-unsequenced -fno-asynchronous-unwind-tables -fno-unwind-tables --target=arm64-macho-darwin -fPIC -fno-addrsig -fno-stack-protector -shared -nostdlib -lsystem

{pyarmor-8.5.9 → pyarmor-8.5.11}/pyarmor/cli/generate.py

@@ -141,10 +141,7 @@ class Builder(object):
                     continue
 
                 logger.info('obfuscating %s', r)
-                code = self._generate_obfuscated_script(r)
-                if code is None:
-                    self._copy_script(path, r)
-                    continue
+                code = Pytransform3.generate_obfuscated_script(self.ctx, r)
                 source = r.generate_output(
                     template, code, relative=relative, pkgname=pkgname,
                     bootpath=bootpath, rev=rev

{pyarmor-8.5.9 → pyarmor-8.5.11}/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.9 → pyarmor-8.5.11}/pyarmor/cli/register.py

@@ -151,6 +151,11 @@ class Register(object):
     def register_regfile(self, regfile, clean=True):
         from zipfile import ZipFile
 
+        for x in (self.ctx.license_group_token, self.ctx.license_token):
+            if os.path.exists(x):
+                logger.info('remove old token "%s"', x)
+                os.remove(x)
+
         path = self.ctx.reg_path
         with ZipFile(regfile, 'r') as f:
             for item in ('license.lic', '.pyarmor_capsule.zip'):
@@ -199,7 +204,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 +222,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.9 → pyarmor-8.5.11}/pyarmor/cli/repack.py

@@ -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:

{pyarmor-8.5.9 → pyarmor-8.5.11}/pyarmor/config.py

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

{pyarmor-8.5.9 → pyarmor-8.5.11}/pyarmor.egg-info/PKG-INFO

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

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

{pyarmor-8.5.9 → pyarmor-8.5.11}/setup.py

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

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

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