pyarmor 8.4.4__zip → 8.4.5__zip

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

@@ -1,36 +1,30 @@
 Metadata-Version: 1.1
 Name: pyarmor
-Version: 8.4.4
+Version: 8.4.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
 Author-email: pyarmor@163.com
-License: UNKNOWN
+License: Free To Use But Restricted
 Description: Protect Python Scripts By Pyarmor
         =================================
         
-        Pyarmor is a command line tool used to obfuscate python scripts, bind
-        obfuscated scripts to fixed machine or expire obfuscated scripts.
+        Pyarmor is a command line tool used to obfuscate python scripts, bind obfuscated scripts to fixed machine or expire obfuscated scripts.
         
         Key Features
         ------------
         
-        * The obfuscated scritpt is still a normal `.py` script, in most of
-          cases the original python scripts can be replaced with obfuscated
-          scripts seamlessly.
-        * Provide many ways to obfuscate the scripts to balance security and
-          performance
-        * Rename functions/methods/classes/variables/arguments, irreversible
-          obfuscation
-        * Convert part of Python functions to C function, compile to binary by
-          high optimize option, irreversible obfuscation
+        * The obfuscated scritpt is still a normal `.py` script, in most of cases the original python scripts can be replaced with obfuscated scripts seamlessly.
+        * Provide many ways to obfuscate the scripts to balance security and performance
+        * Rename functions/methods/classes/variables/arguments, irreversible obfuscation
+        * Convert part of Python functions to C function, compile to binary by high optimize option, irreversible obfuscation
         * Bind obfuscated scripts to fixed machine or expire obfuscted scripts
         * Protect obfuscated scripts by Themida (Only for Windows)
         
         Support Platforms
         -----------------
         
-        * Python 3.7~3.11
+        * Python 3.7~3.12
         * Windows
         * Many linuxs, include embedded systems
         * Apple Intel and Apple Silicon

{pyarmor-8.4.4 → pyarmor-8.4.5}/pyarmor/README.rst

@@ -1,28 +1,22 @@
 Protect Python Scripts By Pyarmor
 =================================
 
-Pyarmor is a command line tool used to obfuscate python scripts, bind
-obfuscated scripts to fixed machine or expire obfuscated scripts.
+Pyarmor is a command line tool used to obfuscate python scripts, bind obfuscated scripts to fixed machine or expire obfuscated scripts.
 
 Key Features
 ------------
 
-* The obfuscated scritpt is still a normal `.py` script, in most of
-  cases the original python scripts can be replaced with obfuscated
-  scripts seamlessly.
-* Provide many ways to obfuscate the scripts to balance security and
-  performance
-* Rename functions/methods/classes/variables/arguments, irreversible
-  obfuscation
-* Convert part of Python functions to C function, compile to binary by
-  high optimize option, irreversible obfuscation
+* The obfuscated scritpt is still a normal `.py` script, in most of cases the original python scripts can be replaced with obfuscated scripts seamlessly.
+* Provide many ways to obfuscate the scripts to balance security and performance
+* Rename functions/methods/classes/variables/arguments, irreversible obfuscation
+* Convert part of Python functions to C function, compile to binary by high optimize option, irreversible obfuscation
 * Bind obfuscated scripts to fixed machine or expire obfuscted scripts
 * Protect obfuscated scripts by Themida (Only for Windows)
 
 Support Platforms
 -----------------
 
-* Python 3.7~3.11
+* Python 3.7~3.12
 * Windows
 * Many linuxs, include embedded systems
 * Apple Intel and Apple Silicon

{pyarmor-8.4.4 → pyarmor-8.4.5}/pyarmor/cli/__init__.py

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

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

@@ -100,6 +100,7 @@ def format_platform(plat, arch):
         ('windows', ('windows', 'cygwin*')),
         ('darwin', ('darwin',)),
         ('linux', ('linux*',)),
+        ('freebsd', ('freebsd*', 'openbsd*', 'isilon onefs')),
     )
 
     arch_table = (
@@ -124,6 +125,9 @@ def format_platform(plat, arch):
     else:
         raise RuntimeError('unsupported arch "%s"' % arch)
 
+    if plat == 'linux' and hasattr(sys, 'getandroidapilevel'):
+        plat = 'android'
+
     if plat == 'windows' and mach == 'x86_64':
         bitness = calcsize('P'.encode()) * 8
         if bitness == 32:
@@ -199,7 +203,12 @@ class Context(object):
 
     def save_token(self, data):
         with open(self.license_token, 'wb') as f:
-            f.write(data)
+            if data.endswith(b'=='):
+                f.write(data)
+            else:
+                n = data.rfind(b'==')
+                assert n > 0
+                f.write(data[:n+2])
 
     def clear_token(self):
         if os.path.exists(self.license_token):

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

@@ -3,10 +3,10 @@
 ;; Pyarmor version
 major = 8
 minor = 4
-patch = 4
+patch = 5
 
 ;; Compatible core version
-cli.core = 5.4.2
+cli.core = 5.4.3
 
 ;; Deprecated since Pyarmor 8.2.5
 ; cli.runtime = 3.2.5

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

@@ -35,27 +35,46 @@ class DockerAuthHandler(socketserver.BaseRequestHandler):
             self.request.send(struct.pack('!HH', 1, len(msg)) + msg)
 
     def process(self, packet):
-        if packet[:4] == b'PADH':
+        cmd = packet[:4]
+        if cmd == b'PADH':
             response = b'\n'.join(CONFIG['machid']) + b'\x00'
             self.request.send(response)
-        else:
-            userdata = self.parse_packet(packet)
-            keydata = self.generate_runtime_key(userdata.decode('utf-8'))
-            response = struct.pack('!HH', 0, len(keydata)) + keydata
+        elif cmd == b'PADI':
+            userdata = packet[4:].decode('utf-8')
+            rtkey = self.generate_outer_key(userdata, outer=False)
+            magic = b'DockerRuntimeKey'
+            response = magic + struct.pack('!HH', 0, len(rtkey)) + rtkey
+            self.request.send(response)
+        elif cmd == b'PADK':
+            userdata = self.parse_packet(packet).decode('utf-8')
+            rtkey = self.generate_runtime_key(userdata)
+            response = struct.pack('!HH', 0, len(rtkey)) + rtkey
             self.request.send(response)
+        else:
+            raise RuntimeError('unknown packet %r' % packet)
         return response
 
     def parse_packet(self, packet):
         if len(packet) == 32 and packet[:4] == b'PADK':
             return packet[12:]
-        raise RuntimeError('invalid auth request')
+        raise RuntimeError('invalid auth request: %r' % packet)
 
     def generate_runtime_key(self, userdata):
         ctx = CONFIG['ctx']
         ctx.cmd_options['user_data'] = userdata
+        ctx.cmd_options['expired'] = '.3'
+        ctx.cmd_options['outer'] = 0
         Pytransform3._pytransform3.init_ctx(ctx)
         return Pytransform3.generate_runtime_key(ctx)
 
+    def generate_outer_key(self, userdata, outer=True):
+        ctx = CONFIG['ctx']
+        ctx.cmd_options['user_data'] = userdata
+        ctx.cmd_options['expired'] = '.3'
+        ctx.cmd_options['outer'] = 1
+        Pytransform3._pytransform3.init_ctx(ctx)
+        return Pytransform3.generate_runtime_key(ctx, outer=outer)
+
 
 def register_pyarmor(ctx, regfile):
     reg = Register(ctx)

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

@@ -111,9 +111,10 @@ class Register(object):
 
     def update_token(self):
         from .core import Pytransform3
+        assert Pytransform3._pytransform3 is None
         with open(self.ctx.license_token, 'wb') as f:
             f.close()
-        Pytransform3._update_token(self.ctx)
+        Pytransform3.init(self.ctx)
 
     @property
     def license_info(self):
@@ -318,7 +319,8 @@ $notes
         if lictype == 'trial':
             self.notes.append('* Can\'t obfuscate big script and mix str')
         elif lictype in ('bacic', 'pro'):
-            self.notes.append('* Each obfuscation need verify license online')
+            self.notes.append('* Need verify license online '
+                              'when obfuscating scripts')
         elif lictype == 'group':
             self.notes.append('* Offline obfuscation')
 
@@ -369,10 +371,16 @@ class WebRegister(Register):
             logger.debug('remove old token')
             os.remove(self.ctx.license_token)
 
+    def _check_product_name(self, name):
+        if len(name) == 1 or name.count(name[0]) == len(name):
+            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)
+
         rcode = self._get_old_rcode() if upgrade else None
         if upgrade and not rcode and keyfile.endswith('regcode-to-pro.txt'):
             logger.error('please use `pyarmor-7 -v` to check old license')
@@ -395,7 +403,7 @@ class WebRegister(Register):
         if pname in ('', 'TBD'):
             info['product'] = product
         elif pname != product:
-            logger.warning('this license is bind to product "%s"', pname)
+            logger.warning('this license has bound to product "%s"', pname)
             logger.warning('it can not be changed to "%s"', product)
 
         lines = []
@@ -427,7 +435,7 @@ class WebRegister(Register):
         ])
         if info['product'] == 'non-profits':
             lines.append('This license is about to be used for non-profits')
-        elif info['product'] in ('', 'TBD'):
+        if info['product'] in ('', 'TBD'):
             lines.append('This license is bind to non-profits(TBD) '
                          'for the time being')
             lines.append('If not change "TBD" to product name in 6 months, '
@@ -435,6 +443,10 @@ class WebRegister(Register):
         else:
             lines.append('This license is about to be used for product "%s"'
                          % info['product'])
+        if info['product'] not in ('', 'TBD'):
+            lines.append('')
+            lines.append('IMPORTANT: PRODUCT NAME CAN NOT BE CHANGED '
+                         'AFTER INITIAL REGISTRATION')
 
         lines.extend(['', ''])
         return info, '\n'.join(lines)

{pyarmor-8.4.4 → pyarmor-8.4.5}/pyarmor/cli/resource.py

@@ -78,6 +78,8 @@ class FileResource(Resource):
         self.mtree = None
         self.mco = None
 
+        self.shebang = ''
+
         # Do not touch these nodes in final protector
         self.exclude_nodes = set()
         # Do not touch these code objects in final patcher
@@ -131,7 +133,10 @@ class FileResource(Resource):
 
         with open(self.fullpath, encoding=self._get_encoding(encoding)) as f:
             # file.read() can't read the whole data of big files
-            return f.readlines()
+            lines = f.readlines()
+            if lines and lines[0].startswith('#!'):
+                self.shebang = lines[0]
+            return lines
 
     def reparse(self, lines=None, encoding=None):
         if lines is None:
@@ -149,7 +154,7 @@ class FileResource(Resource):
 
         if mtree is None:
             mtree = self.mtree
-        assert mtree is not None
+        assert (mtree is not None)
         self.mco = compile(mtree, self.frozenname, 'exec', optimize=optimize)
 
     def clean(self):
@@ -168,19 +173,20 @@ class FileResource(Resource):
         elif relative == 1:
             prefix = '.' * self.fullname.count('.')
         else:
-            assert(isinstance(relative, str))
+            assert (isinstance(relative, str))
             prefix = relative + '.'
             if self.fullname.startswith(prefix):
                 prefix = '.' * self.fullname.count('.')
             elif prefix.startswith(self.pkgname + '.'):
                 prefix = prefix[len(self.pkgname):]
 
-        return Template(tpl).safe_substitute(
+        source = Template(tpl).safe_substitute(
             timestamp=datetime.now().isoformat(),
             package=prefix + pkgname,
             path=bootpath,
             code=repr(code),
             rev=rev)
+        return (self.shebang + source) if self.shebang else source
 
 
 class PycResource(FileResource):

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

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

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

@@ -1,36 +1,30 @@
 Metadata-Version: 1.1
 Name: pyarmor
-Version: 8.4.4
+Version: 8.4.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
 Author-email: pyarmor@163.com
-License: UNKNOWN
+License: Free To Use But Restricted
 Description: Protect Python Scripts By Pyarmor
         =================================
         
-        Pyarmor is a command line tool used to obfuscate python scripts, bind
-        obfuscated scripts to fixed machine or expire obfuscated scripts.
+        Pyarmor is a command line tool used to obfuscate python scripts, bind obfuscated scripts to fixed machine or expire obfuscated scripts.
         
         Key Features
         ------------
         
-        * The obfuscated scritpt is still a normal `.py` script, in most of
-          cases the original python scripts can be replaced with obfuscated
-          scripts seamlessly.
-        * Provide many ways to obfuscate the scripts to balance security and
-          performance
-        * Rename functions/methods/classes/variables/arguments, irreversible
-          obfuscation
-        * Convert part of Python functions to C function, compile to binary by
-          high optimize option, irreversible obfuscation
+        * The obfuscated scritpt is still a normal `.py` script, in most of cases the original python scripts can be replaced with obfuscated scripts seamlessly.
+        * Provide many ways to obfuscate the scripts to balance security and performance
+        * Rename functions/methods/classes/variables/arguments, irreversible obfuscation
+        * Convert part of Python functions to C function, compile to binary by high optimize option, irreversible obfuscation
         * Bind obfuscated scripts to fixed machine or expire obfuscted scripts
         * Protect obfuscated scripts by Themida (Only for Windows)
         
         Support Platforms
         -----------------
         
-        * Python 3.7~3.11
+        * Python 3.7~3.12
         * Windows
         * Many linuxs, include embedded systems
         * Apple Intel and Apple Silicon

{pyarmor-8.4.4 → pyarmor-8.4.5}/pyarmor.egg-info/SOURCES.txt

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

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

@@ -63,6 +63,8 @@ setup(
                 ' scripts to fixed machine or expire obfuscated scripts.',
     long_description=long_description,
 
+    license='Free To Use But Restricted',
+
     url='https://github.com/dashingsoft/pyarmor',
     author='Jondy Zhao',
     author_email='pyarmor@163.com',

pyarmor-8.4.4/pyarmor/cli/group.py

@@ -1,101 +0,0 @@
-import argparse
-import logging
-import os
-import socketserver
-import struct
-import sys
-
-from .context import Context
-from .generate import Builder, Pytransform3
-from .register import Register
-
-PORT = 29092
-
-
-class DockerAuthHandler(socketserver.BaseRequestHandler):
-
-    WORKPATH = os.path.expanduser(os.path.join('~', '.pyarmor', 'docker'))
-    CTX = None
-
-    def handle(self):
-        data = self.request.recv(64)
-        logging.info('receive request from %s', self.client_address)
-        try:
-            logging.debug('data (%d): %s', len(data), data)
-            self.process(data)
-            logging.info('send auth result to %s', self.client_address)
-        except Exception as e:
-            logging.error('%s', str(e))
-            msg = 'failed to verify docker, please check host console'.encode()
-            msg += b'\00'
-            self.request.send(struct.pack('!HH', 1, len(msg)) + msg)
-
-    def process(self, packet):
-        if packet[:4] == b'PADH':
-            self.request.send(self.MACHID)
-        else:
-            userdata = self.parse_packet(packet)
-            keydata = self.generate_runtime_key(userdata.decode('utf-8'))
-            self.request.send(struct.pack('!HH', 0, len(keydata)) + keydata)
-
-    def parse_packet(self, packet):
-        if len(packet) == 32 and packet[:4] == b'PADK':
-            return packet[12:]
-        raise RuntimeError('invalid auth request')
-
-    def generate_runtime_key(self, userdata):
-        ctx = self.CTX
-        ctx.cmd_options['user_data'] = userdata
-        return Builder(ctx).generate_runtime_key()
-
-
-def register_pyarmor(ctx, regfile):
-    reg = Register(ctx)
-    logging.info('register "%s"', regfile)
-    reg.register_regfile(regfile)
-    if reg.license_info['features'] < 15:
-        raise RuntimeError('this feature is only for group license')
-
-    machid = reg._get_machine_id()
-    logging.debug('machine id: %s', machid)
-    DockerAuthHandler.MACHID = machid
-
-    Pytransform3._update_token(ctx)
-
-
-def main_entry():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('-p', '--port', type=int, default=PORT)
-    parser.add_argument('-s', '--sock', default='/var/run/docker.sock',
-                        help=argparse.SUPPRESS)
-    parser.add_argument('--home', help=argparse.SUPPRESS)
-    parser.add_argument('regfile', nargs=1,
-                        help='group device registration file for this machine')
-    args = parser.parse_args(sys.argv[1:])
-
-    home = DockerAuthHandler.WORKPATH
-    if args.home:
-        DockerAuthHandler.WORKPATH = args.home
-        home = args.home
-    logging.info('work path: %s', home)
-
-    ctx = Context(home=os.path.expanduser(home))
-    register_pyarmor(ctx, args.regfile[0])
-    DockerAuthHandler.CTX = ctx
-
-    host, port = '0.0.0.0', args.port
-    with socketserver.TCPServer((host, port), DockerAuthHandler) as server:
-        logging.info('listen docker auth request on %s:%s', host, args.port)
-        server.serve_forever()
-
-
-def main():
-    logging.basicConfig(
-        level=logging.INFO,
-        format='%(asctime)s: %(message)s',
-    )
-    main_entry()
-
-
-if __name__ == '__main__':
-    main()