pyarmor 8.4.5__zip → 8.4.7__zip

{pyarmor-8.4.5 → pyarmor-8.4.7}/PKG-INFO

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

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

{pyarmor-8.4.5 → pyarmor-8.4.7}/pyarmor/cli/__main__.py

@@ -326,6 +326,10 @@ def cmd_reg(ctx, args):
             regsvr.register(regfile, args.product, group=group)
 
 
+def cmd_man(ctx, args):
+    pass
+
+
 def main_parser():
     parser = argparse.ArgumentParser(
         prog='pyarmor',
@@ -619,6 +623,19 @@ https://pyarmor.readthedocs.io/en/stable/reference/man.html#pyarmor-reg
     cparser.set_defaults(func=cmd_reg)
 
 
+def man_parser(subparsers):
+    '''Open Pyarmor.Man in web-browser'''
+    cparser = subparsers.add_parser(
+        'man',
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        description=man_parser.__doc__,
+        help='register Pyarmor or upgrade old Pyarmor license'
+    )
+
+    cparser.set_defaults(func=cmd_man)
+    return cparser
+
+
 def log_settings(ctx, args):
     if args.debug:
         root = logging.getLogger()

{pyarmor-8.4.5 → pyarmor-8.4.7}/pyarmor/cli/context.py

@@ -203,12 +203,9 @@ class Context(object):
 
     def save_token(self, data):
         with open(self.license_token, 'wb') as f:
-            if data.endswith(b'=='):
-                f.write(data)
-            else:
-                n = data.rfind(b'==')
-                assert n > 0
-                f.write(data[:n+2])
+            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):
@@ -469,7 +466,7 @@ class Context(object):
 
     @property
     def exclude_restrict_modules(self):
-        return self._opts('builder', 'exclude_restrict_modules')
+        return self._opts('builder', 'exclude_restrict_modules').split()
 
     @property
     def co_threshold(self):
@@ -607,6 +604,10 @@ class Context(object):
         return runtime_package_template if len(platforms) < 2 else \
             multi_runtime_package_template
 
+    @property
+    def runtime_obf_key_mode(self):
+        return self._opti('runtime', 'obf_key_mode')
+
     #
     # RFT settings
     #

{pyarmor-8.4.5 → pyarmor-8.4.7}/pyarmor/cli/default.cfg

@@ -3,7 +3,7 @@
 ;; Pyarmor version
 major = 8
 minor = 4
-patch = 5
+patch = 7
 
 ;; Compatible core version
 cli.core = 5.4.3
@@ -206,6 +206,12 @@ package_name_format = pyarmor_runtime_{suffix}
 ;;     pyarmor_runtime.so
 simple_extension_name = 1
 
+;; Obfuscate runtime key
+;;   0: no obfuscation
+;;   1: simple obfuscation
+;;
+obf_key_mode = 0
+
 ;; Enable outer runtime key
 outer = 0
 

{pyarmor-8.4.5 → pyarmor-8.4.7}/pyarmor/cli/docker.py

@@ -1,3 +1,24 @@
+#! /usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+#############################################################
+#                                                           #
+#      Copyright @ 2023 -  Dashingsoft corp.                #
+#      All rights reserved.                                 #
+#                                                           #
+#      Pyarmor                                              #
+#                                                           #
+#      Version: 8.3.0 -                                     #
+#                                                           #
+#############################################################
+#
+#
+#  @File: cli/docker.py
+#
+#  @Author: Jondy Zhao (pyarmor@163.com)
+#
+#  @Create Date: Tue Aug 1 09:18:12 CST 2023
+#
 import argparse
 import logging
 import os

{pyarmor-8.4.5 → pyarmor-8.4.7}/pyarmor/cli/generate.py

@@ -100,6 +100,8 @@ class Builder(object):
         bootpath = self.ctx.cfg.get('builder', 'bootstrap_file')
         encoding = self.ctx.cfg.get('builder', 'encoding')
 
+        plugins = [x for x in self.ctx.plugins if hasattr(x, 'post_script')]
+
         namelist = []
         for res in self.ctx.resources + self.ctx.extra_resources:
             logger.info('process resource "%s"', res.fullname)
@@ -126,6 +128,11 @@ class Builder(object):
                 fullpath = os.path.join(path, r.output_filename)
                 os.makedirs(os.path.dirname(fullpath), exist_ok=True)
 
+                for plugin in plugins:
+                    patched_source = plugin.post_script(self.ctx, r, source)
+                    if patched_source:
+                        source = patched_source
+
                 logger.info('write %s', fullpath)
                 with open(fullpath, 'w', encoding=encoding) as f:
                     f.write(source)

pyarmor-8.4.7/pyarmor/cli/hdinfo.py

@@ -0,0 +1,64 @@
+#! /usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+#############################################################
+#                                                           #
+#      Copyright @ 2023 -  Dashingsoft corp.                #
+#      All rights reserved.                                 #
+#                                                           #
+#      Pyarmor                                              #
+#                                                           #
+#      Version: 8.4.6 -                                     #
+#                                                           #
+#############################################################
+#
+#
+#  @File: cli/hdinfo.py
+#
+#  @Author: Jondy Zhao (pyarmor@163.com)
+#
+#  @Create Date: Fri Dec 15 09:27:30 CST 2023
+#
+import argparse
+import sys
+
+from pyarmor.cli.core import Pytransform3
+
+
+GROUP_LICENSE_MACHINE_FLAG = 22
+HT_HARDDISK, HT_IFMAC, HT_IPV4 = range(3)
+
+
+def get_hd_info(hdtype, name=None):
+    try:
+        return repr(Pytransform3.get_hd_info(hdtype, name))
+    except Exception as e:
+        return str(e)
+
+
+def main(argv):
+    parser = argparse.ArgumentParser()
+    parser.add_argument('devname', nargs='*', help=(
+        'In Linux get netcard name like "eth0" '
+        'or harddisk name like "/dev/sda"'))
+    args = parser.parse_args(argv)
+
+    print('Machine ID: %s' % get_hd_info(GROUP_LICENSE_MACHINE_FLAG)[1:])
+
+    if not args.devname:
+        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='*'))
+
+    for name in args.devname:
+        if name.startswith('/'):
+            print('Query Harddisk "%s" Serial Number: %s' %
+                  (name, get_hd_info(HT_HARDDISK, name=name)))
+        else:
+            print('Query Netcard "/dev/%s" Mac Address: %s' %
+                  (name, get_hd_info(HT_IFMAC, name=name)))
+
+
+if __name__ == '__main__':
+    main(sys.argv[1:])

{pyarmor-8.4.5 → pyarmor-8.4.7}/pyarmor/cli/register.py

@@ -372,14 +372,16 @@ class WebRegister(Register):
             os.remove(self.ctx.license_token)
 
     def _check_product_name(self, name):
-        if len(name) == 1 or name.count(name[0]) == len(name):
+        name = name.lower()
+        if name.count(name[0]) == len(name) or name.find('pyarmor') >= 0:
             raise RuntimeError('invalid product name "%s"' % name)
 
     def prepare(self, keyfile, product, upgrade=False):
         reginfo = self.parse_keyfile(keyfile)
         logger.info('prepare "%s"', keyfile)
 
-        self._check_product_name(product)
+        if product:
+            self._check_product_name(product)
 
         rcode = self._get_old_rcode() if upgrade else None
         if upgrade and not rcode and keyfile.endswith('regcode-to-pro.txt'):

{pyarmor-8.4.5 → pyarmor-8.4.7}/pyarmor/config.py

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

{pyarmor-8.4.5 → pyarmor-8.4.7}/pyarmor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyarmor
-Version: 8.4.5
+Version: 8.4.7
 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.4.5 → pyarmor-8.4.7}/pyarmor.egg-info/SOURCES.txt

@@ -43,6 +43,7 @@ pyarmor/cli/core.data.3
 pyarmor/cli/default.cfg
 pyarmor/cli/docker.py
 pyarmor/cli/generate.py
+pyarmor/cli/hdinfo.py
 pyarmor/cli/merge.py
 pyarmor/cli/mixer.py
 pyarmor/cli/plugin.py

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

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

{pyarmor-8.4.5 → pyarmor-8.4.7}/setup.py

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

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

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