pyarmor.cli 8.3.5__zip → 8.3.7__zip

{pyarmor.cli-8.3.5 → pyarmor.cli-8.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyarmor.cli
-Version: 8.3.5
+Version: 8.3.7
 Summary: A comand line tool to obfuscate python scripts
 Home-page: https://github.com/dashingsoft/pyarmor
 Author: Jondy Zhao

{pyarmor.cli-8.3.5 → pyarmor.cli-8.3.7}/pyarmor/cli/__init__.py

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

{pyarmor.cli-8.3.5 → pyarmor.cli-8.3.7}/pyarmor/cli/__main__.py

@@ -502,8 +502,8 @@ https://pyarmor.readthedocs.io/en/stable/reference/man.html#pyarmor-gen
         help='bind obfuscated scripts to device'
     )
     group.add_argument(
-        '--bind-data', metavar='FILE',
-        help=argparse.SUPPRESS
+        '--bind-data', metavar='STRING or @FILENAME',
+        help='store user data to runtime key'
     )
 
     cparser.add_argument(

{pyarmor.cli-8.3.5 → pyarmor.cli-8.3.7}/pyarmor/cli/context.py

@@ -664,3 +664,28 @@ class Context(object):
     @property
     def core_data_3(self):
         return self._core_data('core.data.3')
+
+    #
+    # Get http proxy of token server
+    #
+    @property
+    def token_http_proxy(self):
+        http_proxy = os.environb.get(b'http_proxy', b'')
+        if not http_proxy:
+            return b''
+        i = http_proxy.find(b'@')
+        if i > 0:
+            from base64 import b64encode
+            header = b'Authorization: Basic %s\r\n' % b64encode(http_proxy[:i])
+        else:
+            header = b''
+        i += 1
+        j = http_proxy.find(b':', i)
+        if j == -1:
+            host = http_proxy[i:]
+            port = b'80'
+        else:
+            host = http_proxy[i:j]
+            port = http_proxy[j+1:]
+        url = b'http://pyarmor.dashingsoft.com'
+        return b'\x00'.join([host, port, url, header, b'\x00'])

{pyarmor.cli-8.3.5 → pyarmor.cli-8.3.7}/pyarmor/cli/default.cfg

@@ -3,10 +3,10 @@
 ;; Pyarmor version
 major = 8
 minor = 3
-patch = 5
+patch = 7
 
 ;; Compatible core version
-cli.core = 4.3.2
+cli.core = 4.3.4
 
 ;; Deprecated since Pyarmor 8.2.5
 ; cli.runtime = 3.2.5
@@ -112,7 +112,7 @@ rft_dev_mode = 0
 ; support_nuitka = 0
 
 ;; Group device flag for machine id
-group_device_flag = 20
+group_device_flag = 18
 
 ;;
 ;; Part 2: global/local/module level options
@@ -296,7 +296,8 @@ no_matched_pyc = error
 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
 
-;; Exclude co_names
+;; Include and exclude function/method names
+; includes =
 ; excludes =
 
 ;; Use opcode CALL_FUNCTION_EX to patch call

{pyarmor.cli-8.3.5 → pyarmor.cli-8.3.7}/pyarmor/cli/docker.py

@@ -90,7 +90,8 @@ def main_entry():
     register_pyarmor(ctx, args.regfile[0])
     CONFIG['ctx'] = ctx
 
-    CONFIG['machid'] = [Pytransform3.get_hd_info(x) for x in (20, 16, 11, 10)]
+    mflags = 20, 18, 16, 11, 10
+    CONFIG['machid'] = [Pytransform3.get_hd_info(x) for x in mflags]
     logging.debug('machine id: %s', CONFIG['machid'])
 
     host, port = '0.0.0.0', args.port

{pyarmor.cli-8.3.5 → pyarmor.cli-8.3.7}/pyarmor/cli/register.py

@@ -155,7 +155,7 @@ class Register(object):
             if 'group.tokens' in namelist:
                 logger.debug('group license for machines: %s',
                              [x for x in namelist if x.startswith('tokens')])
-                for idver in (20, 16, 11):
+                for idver in (18, 20, 16, 11):
                     machid = self._get_machine_id(idver).decode('utf-8')
                     logger.debug('got machine id: %s', machid)
                     name = '/'.join(['tokens', machid])
@@ -195,7 +195,7 @@ class Register(object):
                 s.sendall(b'PADH' + b'x' * 60)
                 while True:
                     flag = s.recv(1)
-                    if flag in (b'a', b'b', b'g', b'k'):
+                    if flag in (b'a', b'b', b'i', b'g', b'k'):
                         data = s.recv(32)
                     machid = (flag + data).decode('utf-8')
                     logger.info('got docker host machine id: %s', machid)
@@ -217,7 +217,9 @@ class Register(object):
         logger.info('generating device file "%s"', path)
         os.makedirs(os.path.dirname(path), exist_ok=True)
         uinfo = uname()
-        devflag = self.ctx.cfg['builder'].getint('group_device_flag', 16)
+        devflag = self.ctx.cfg['builder'].getint('group_device_flag', 18)
+        machid = self._get_machine_id(devflag).decode('utf-8')
+        logger.debug('current machine id is "%s"', machid)
         tpl = Template('\n'.join([
             '# Generated by Pyarmor $rev, $timestamp',
             'host: $node',
@@ -229,7 +231,7 @@ class Register(object):
             host=uinfo.system,
             version=uinfo.version,
             timestamp=datetime.now().isoformat(),
-            machine=self._get_machine_id(devflag).decode('utf-8')
+            machine=machid,
         )
         with open(path, "wb") as f:
             f.write(tpl.encode('utf-8'))
@@ -498,8 +500,9 @@ class WebRegister(Register):
             licdata = f.read('license.lic')
             capsule = f.read('.pyarmor_capsule.zip')
 
+        # Ignore token cache
         tokencache = os.path.join(os.path.dirname(devfile), 'tokens', machid)
-        if os.path.exists(tokencache):
+        if False and os.path.exists(tokencache):
             logger.info('read cached "%s"', tokencache)
             with open(tokencache, 'rb') as f:
                 data = f.read()

{pyarmor.cli-8.3.5 → pyarmor.cli-8.3.7}/pyarmor/cli/resource.py

@@ -105,11 +105,30 @@ class FileResource(Resource):
     def is_pyc(self):
         return self.pyext.lower() == '.pyc'
 
+    def _get_encoding(self, encoding):
+        from codecs import BOM_UTF8
+        from re import search as research
+        with open(self.fullpath, 'rb') as f:
+            line = f.read(80)
+            if line and line[:3] == BOM_UTF8:
+                return 'utf-8'
+            if line and line[0] == 35:
+                n = line.find(b'\n')
+                m = research(r'coding[=:]\s*([-\w.]+)', line[:n].decode())
+                if m:
+                    return m.group(1)
+                if n > -1 and len(line) > (n+1) and line[n+1] == 35:
+                    k = n + 1
+                    n = line.find(b'\n', k)
+                    m = research(r'coding[=:]\s*([-\w.]+)', line[k:n].decode())
+                    return m and m.group(1)
+        return encoding
+
     def readlines(self, encoding=None):
         if not os.path.exists(self.fullpath):
             raise RuntimeError('file "%s" doesn\'t exists' % self.fullpath)
 
-        with open(self.fullpath, encoding=encoding) as f:
+        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()
 

{pyarmor.cli-8.3.5 → pyarmor.cli-8.3.7}/pyarmor.cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyarmor.cli
-Version: 8.3.5
+Version: 8.3.7
 Summary: A comand line tool to obfuscate python scripts
 Home-page: https://github.com/dashingsoft/pyarmor
 Author: Jondy Zhao

pyarmor.cli-8.3.7/pyarmor.cli.egg-info/requires.txt

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

{pyarmor.cli-8.3.5 → pyarmor.cli-8.3.7}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup
 
-__VERSION__ = ' 8.3.5'
+__VERSION__ = ' 8.3.7'
 
 with open('README.rst') as f:
     long_description = f.read()
@@ -50,7 +50,7 @@ setup(
     package_data={"pyarmor.cli": ["default.cfg", "public_capsule.zip", "core.data.*"]},
 
     install_requires=[
-        'pyarmor.cli.core~=4.3.2'
+        'pyarmor.cli.core~=4.3.4'
     ],
 
     entry_points={

pyarmor.cli-8.3.5/pyarmor.cli.egg-info/requires.txt

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