pyarmor 8.2.7__zip → 8.2.8__zip

{pyarmor-8.2.7 → pyarmor-8.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyarmor
-Version: 8.2.7
+Version: 8.2.8
 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.2.7 → pyarmor-8.2.8}/pyarmor.egg-info/PKG-INFO

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

@@ -36,6 +36,7 @@ src/cli/bootstrap.py
 src/cli/config.py
 src/cli/context.py
 src/cli/default.cfg
+src/cli/docker.py
 src/cli/generate.py
 src/cli/merge.py
 src/cli/mixer.py

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

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

{pyarmor-8.2.7 → pyarmor-8.2.8}/setup.py

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

{pyarmor-8.2.7 → pyarmor-8.2.8}/src/cli/__init__.py

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

{pyarmor-8.2.7 → pyarmor-8.2.8}/src/cli/bootstrap.py

@@ -35,7 +35,7 @@ def check_prebuilt_runtime_library(platnames, extra=None, rtver=''):
                            'install it'.format('pyarmor.cli.core'))
 
     instcmd = [sys.executable, '-m', 'pip', 'install',
-              '--disable-pip-version-check']
+               '--disable-pip-version-check']
 
     # Before Pyarmor 8.3, prefer to "pyarmor.cli.runtime"
     # It could be disabled by

{pyarmor-8.2.7 → pyarmor-8.2.8}/src/cli/default.cfg

@@ -3,10 +3,10 @@
 ;; Pyarmor version
 major = 8
 minor = 2
-patch = 7
+patch = 8
 
 ;; Core version
-cli.core = 3.2.6
+cli.core = 3.2.8
 
 ;; Deprecated since Pyarmor 8.2.5
 ; cli.runtime = 3.2.5

pyarmor-8.2.8/src/cli/docker.py

@@ -0,0 +1,153 @@
+import argparse
+import logging
+import os
+import socketserver
+import struct
+import sys
+
+import docker
+
+from .context import Context
+from .generate import Builder, Pytransform3
+from .register import Register
+
+PORT = 29092
+
+
+def get_docker_gateway(client):
+    filters = {
+        'driver': 'bridge',
+        'type': 'builtin'
+    }
+    networks = client.networks.list(filters=filters)
+    return networks[0].attrs['IPAM']['Config'][0]['Gateway']
+
+
+class DockerAuthHandler(socketserver.BaseRequestHandler):
+
+    WORKPATH = os.path.expanduser(os.path.join('~', '.pyarmor', 'docker'))
+    CTX = None
+    CLIENT = 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 copy_file_into_docker(self, containerid, filename):
+        from subprocess import check_call
+        check_call(['docker', 'cp', filename, '%s:/' % containerid])
+
+    def get_container_info(self, client, shortid):
+        try:
+            container = client.container.get(shortid)
+            return container.attrs
+        except docker.errors.NotFound:
+            pass
+        except docker.errors.APIError:
+            pass
+
+    def process(self, packet):
+        if packet[:4] == b'PADH':
+            self.request.send(self.MACHID)
+            return
+
+        container = self.get_container(self.client_address[0])
+        state = container.attrs['State']
+        if state.get('Status') == 'running' and state.get('Running'):
+            # 2023-06-15T23:51:03.287483366Z
+            # state.get('StartedAt')
+            # bridge = container.attrs['NetworkSettings']['Networks']['bridge']
+            # bridge['MacAddress']
+            # bridge['Gateway'] and bridge['IPAddress']
+            # bridge['IPv6Gateway'] and bridge['GlobalIPv6Address']
+            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 get_container(self, ipaddr):
+        filters = {
+            'driver': 'bridge',
+            'type': 'builtin'
+        }
+        networks = self.CLIENT.networks.list(filters=filters, greedy=True)
+        containers = networks[0].attrs.get('Containers')
+        if containers:
+            marker = ipaddr + '/'
+            for dockid, netattr in containers.items():
+                if netattr.get('IPv4Address').startswith(marker):
+                    return self.CLIENT.containers.get(dockid)
+        raise RuntimeError('no found countainer with IPv4 %s' % ipaddr)
+
+
+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
+
+    client = docker.from_env()
+    host, port = get_docker_gateway(client), args.port
+    DockerAuthHandler.CLIENT = client
+
+    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()

{pyarmor-8.2.7 → pyarmor-8.2.8}/src/cli/register.py

@@ -153,11 +153,15 @@ class Register(object):
                 f.extract(item, path=path)
             namelist = f.namelist()
             if 'group.tokens' in namelist:
-                machid = self._get_machine_id()
-                name = '/'.join(['tokens', machid.decode('utf-8')])
+                machid = self._get_machine_id().decode('utf-8')
+                name = '/'.join(['tokens', machid])
                 if name not in namelist:
-                    logger.debug('no found "%s" in offline regfile', name)
-                    raise CliError('this regfile is not for this device')
+                    machid = self._get_docker_hostname()
+                    hostname = '/'.join(['tokens', machid])
+                    if hostname not in namelist:
+                        logger.debug('no found "%s" in offline regfile', name)
+                        raise CliError('this regfile is not for this device')
+                    name = hostname
                 logger.debug('extracting %s', name)
                 self.ctx.save_token(f.read(name))
                 return
@@ -168,9 +172,26 @@ class Register(object):
         logger.info('update license token')
         self.update_token()
 
+    def _get_docker_hostname(self):
+        try:
+            from socket import socket, AF_INET, SOCK_STREAM
+            host = 'host.docker.internal'
+            port = 29092
+            with socket(AF_INET, SOCK_STREAM) as s:
+                s.connect((host, port))
+                s.sendall(b'PADH' + b'x' * 60)
+                flag = s.recv(1)
+                if flag in (b'a', b'b'):
+                    data = s.recv(32)
+                machid = (flag + data).decode('utf-8')
+                logger.info('got docker host machine id: %s', machid)
+                return machid
+        except Exception:
+            pass
+
     def _get_machine_id(self):
         from .core import Pytransform3
-        return Pytransform3.get_hd_info(10)
+        return Pytransform3.get_hd_info(11)
 
     def generate_group_device(self, devid):
         path = self.ctx.group_device_file(devid)

{pyarmor-8.2.7 → pyarmor-8.2.8}/src/cli/repack.py

@@ -134,7 +134,8 @@ class CArchiveWriter2(CArchiveWriter):
             return
 
         with tempfile.TemporaryDirectory() as tmpdir:
-            pathname = os.path.join(tmpdir, name)
+            pathname = os.path.join(tmpdir,
+                                    name.replace('/', '_').replace('\\', '_'))
             with open(pathname, 'wb') as f:
                 f.write(rawdata)
             if typecode in (PKG_ITEM_PYSOURCE, PKG_ITEM_PYMODULE,

{pyarmor-8.2.7 → pyarmor-8.2.8}/src/config.py

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

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

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