pyarmor 8.2.8__zip → 8.2.9__zip

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

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyarmor
-Version: 8.2.8
+Version: 8.2.9
 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.8/src → pyarmor-8.2.9/pyarmor}/cli/__init__.py

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

{pyarmor-8.2.8/src → pyarmor-8.2.9/pyarmor}/cli/__main__.py

@@ -405,7 +405,7 @@ https://pyarmor.readthedocs.io/en/stable/reference/man.html#pyarmor-gen
     )
     group.add_argument(
         '--exclude', dest='excludes', metavar='PATTERN', action='append',
-        help=argparse.SUPPRESS
+        help='Exclude scripts and paths'
     )
 
     group.add_argument(
@@ -490,7 +490,7 @@ https://pyarmor.readthedocs.io/en/stable/reference/man.html#pyarmor-gen
         help='set expired date'
     )
     group.add_argument(
-        '--period', type=int, metavar='N', dest='period',
+        '--period', metavar='N', dest='period',
         help='check runtime key periodically'
     )
     group.add_argument(
@@ -503,8 +503,7 @@ https://pyarmor.readthedocs.io/en/stable/reference/man.html#pyarmor-gen
     )
 
     cparser.add_argument(
-        'inputs', metavar='ARG', nargs='+',
-        help='script, package or keyword "key", "runtime"'
+        'inputs', metavar='ARG', nargs='+', help='scripts or packages'
     )
 
     cparser.set_defaults(func=cmd_gen)

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

@@ -3,10 +3,10 @@
 ;; Pyarmor version
 major = 8
 minor = 2
-patch = 8
+patch = 9
 
 ;; Core version
-cli.core = 3.2.8
+cli.core = 3.2.9
 
 ;; Deprecated since Pyarmor 8.2.5
 ; cli.runtime = 3.2.5
@@ -27,7 +27,7 @@ trace_logfile = .pyarmor/pyarmor.trace.log
 [finder]
 recursive = 0
 ;; includes =
-excludes = *__pycache__
+excludes = */__pycache__
 pyexts = .py .pyw
 
 ;; Data files need to copy to output path

pyarmor-8.2.9/pyarmor/cli/docker.py

@@ -0,0 +1,148 @@
+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
+
+
+CONFIG = {
+    'port': 29092,
+    'home': os.path.expanduser(os.path.join('~', '.pyarmor', 'docker')),
+    'machid': None,
+    'ctx': None,
+}
+
+
+class DockerAuthHandler(socketserver.BaseRequestHandler):
+
+    def handle(self):
+        data = self.request.recv(64)
+        logging.info('receive request from %s', self.client_address)
+        try:
+            logging.debug('request data (%d): %s', len(data), data)
+            response = self.process(data)
+            logging.info('send auth result to %s', self.client_address)
+            logging.debug('response data (%d): %s', len(response), response)
+        except Exception as e:
+            logging.error('%s', str(e))
+            msg = 'verification failed, 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':
+            response = CONFIG['machid']
+            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
+            self.request.send(response)
+        return response
+
+    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 = CONFIG['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')
+    Pytransform3._update_token(ctx)
+
+
+def main_entry():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--debug', action='store_true',
+                        help='Enable debug mode')
+    parser.add_argument('-p', '--port', type=int, default=CONFIG['port'],
+                        help=argparse.SUPPRESS)
+    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:])
+
+    if args.debug:
+        logging.getLogger().setLevel(logging.DEBUG)
+
+    if args.home:
+        CONFIG['home'] = os.path.expandvars(os.path.expanduser(args.home))
+    home = CONFIG['home']
+    logging.info('work path: %s', home)
+
+    ctx = Context(home=home)
+    register_pyarmor(ctx, args.regfile[0])
+    CONFIG['ctx'] = ctx
+
+    CONFIG['machid'] = Pytransform3.get_hd_info(11)
+    logging.debug('machine id: %s', CONFIG['machid'])
+
+    host, port = '0.0.0.0', args.port
+    with socketserver.TCPServer((host, port), DockerAuthHandler) as server:
+        logging.info('listen container 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()
+
+
+#
+# Deprecrated functions
+#
+def get_docker_gateway(client):
+    filters = {
+        'driver': 'bridge',
+        'type': 'builtin'
+    }
+    networks = client.networks.list(filters=filters)
+    return networks[0].attrs['IPAM']['Config'][0]['Gateway']
+
+
+def get_container(client, ipaddr):
+    filters = {
+        'driver': 'bridge',
+        'type': 'builtin'
+    }
+    networks = 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 client.containers.get(dockid)
+    raise RuntimeError('no found countainer with IPv4 %s' % ipaddr)
+
+
+def copy_file_into_docker(containerid, filename):
+    from subprocess import check_call
+    check_call(['docker', 'cp', filename, '%s:/' % containerid])
+
+
+def get_container_info(client, shortid):
+    container = client.container.get(shortid)
+    return container.attrs
+
+
+if __name__ == '__main__':
+    main()

pyarmor-8.2.8/src/cli/docker.py → pyarmor-8.2.9/pyarmor/cli/group.py

@@ -5,8 +5,6 @@ import socketserver
 import struct
 import sys
 
-import docker
-
 from .context import Context
 from .generate import Builder, Pytransform3
 from .register import Register
@@ -14,20 +12,10 @@ 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)
@@ -42,33 +30,10 @@ class DockerAuthHandler(socketserver.BaseRequestHandler):
             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']
+        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)
@@ -83,20 +48,6 @@ class DockerAuthHandler(socketserver.BaseRequestHandler):
         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)
@@ -132,10 +83,7 @@ def main_entry():
     register_pyarmor(ctx, args.regfile[0])
     DockerAuthHandler.CTX = ctx
 
-    client = docker.from_env()
-    host, port = get_docker_gateway(client), args.port
-    DockerAuthHandler.CLIENT = client
-
+    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()

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

@@ -157,6 +157,8 @@ class Register(object):
                 name = '/'.join(['tokens', machid])
                 if name not in namelist:
                     machid = self._get_docker_hostname()
+                    if not machid:
+                        raise CliError('could not get docker host machine id')
                     hostname = '/'.join(['tokens', machid])
                     if hostname not in namelist:
                         logger.debug('no found "%s" in offline regfile', name)
@@ -187,7 +189,7 @@ class Register(object):
                 logger.info('got docker host machine id: %s', machid)
                 return machid
         except Exception:
-            pass
+            logger.exception('could not get docker host machine id')
 
     def _get_machine_id(self):
         from .core import Pytransform3

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

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