pyarmor 8.5.12__zip → 9.0.0__zip

{pyarmor-8.5.12 → pyarmor-9.0.0}/pyarmor/cli/register.py

@@ -21,7 +21,7 @@
 #
 import os
 
-from base64 import b64decode, urlsafe_b64encode
+from base64 import b64decode, b64encode, urlsafe_b64encode
 from json import loads as json_loads
 from string import Template
 
@@ -31,11 +31,51 @@ from . import logger, CliError
 # All supported machine flags for group license: [11, 26)
 MACHFLAGS = 22, 21, 18, 20, 16, 11
 
+# Upgrade notes for Pyarmor 9
+URL_UPGRADE_V9 = 'https://github.com/dashingsoft/pyarmor/issues/1958'
+
+# Template for license info
+LICENSE_INFO_TEMPLATE = '''$advanced
+
+$notes
+'''
+
 
 def parse_token(data):
     from struct import unpack
 
-    if not data or data.find(b' ') == -1:
+    if data and data.find(b' ') > 0:
+        try:
+            buf = b64decode(data.split()[0])
+
+            token, value = unpack('II', buf[:8])
+            rev, features = value & 0xff, value >> 8
+            licno = buf[16:34].decode('utf-8')
+
+            pstr = []
+            i = 64
+            for k in range(4):
+                n = buf[i]
+                i += 1
+                pstr.append(buf[i:i+n].decode('utf-8') if n
+                            else '')
+                i += n
+
+            product = ('non-profits(TBD)' if pstr[2] in ('', 'TBD')
+                       else pstr[2])
+            return {
+                'token': token,
+                'rev': rev,
+                'features': features,
+                'licno': licno,
+                'machine': pstr[0],
+                'regname': pstr[1],
+                'product': product,
+                'note': pstr[3],
+            }
+        except Exception as e:
+            logger.warning('bad token: %s', str(e))
+
         return {
             'token': 0,
             'rev': 0,
@@ -46,31 +86,50 @@ def parse_token(data):
             'note': 'This is trial license'
         }
 
-    buf = b64decode(data.split()[0])
-
-    token, value = unpack('II', buf[:8])
-    rev, features = value & 0xff, value >> 8
-    licno = buf[16:34].decode('utf-8')
-
-    pstr = []
-    i = 64
-    for k in range(4):
-        n = buf[i]
-        i += 1
-        pstr.append(buf[i:i+n].decode('utf-8') if n else '')
-        i += n
-
-    product = 'non-profits(TBD)' if pstr[2] in ('', 'TBD') else pstr[2]
-    return {
-        'token': token,
-        'rev': rev,
-        'features': features,
-        'licno': licno,
-        'machine': pstr[0],
-        'regname': pstr[1],
-        'product': product,
-        'note': pstr[3],
-    }
+
+def show_help_page(prompt, url):
+    choice = input('\n'.join(prompt)).lower()[:1]
+    if choice == 'h':
+        import webbrowser
+        webbrowser.open(url)
+    return choice
+
+
+def check_license_version(ctx, silent=False):
+    licinfo = ctx.license_info
+    rev = licinfo.get('rev', 0)
+    token = licinfo.get('token', 0)
+    features = licinfo.get('features', 0)
+    if rev == 1 and features > 0 and token > 0:
+        logger.warning('this license is not ready for Pyarmor 9')
+        if silent:
+            return False
+
+        # Group License
+        if features == 15:
+            prompt = (
+                '',
+                'Pyarmor 9 has some changes on license policy',
+                'This group license is still available',
+                'But it need request new device regfile as before',
+                'Press "h" to check Pyarmor 9 Upgrade Notes',
+                '',
+                'Help (h), Quit (q): '
+            )
+            show_help_page(prompt, URL_UPGRADE_V9)
+            raise SystemExit('Quit')
+
+        prompt = (
+            '',
+            'Pyarmor 9 has big change on CI/CD pipeline',
+            'If not using Pyarmor License in CI/CD pipeline',
+            'Press "c" to continue',
+            'Otherwise press "h" to check Pyarmor 9.0 Upgrade Notes',
+            '',
+            'Continue (c), Help (h), Quit (q): '
+        )
+        if not show_help_page(prompt, URL_UPGRADE_V9) == 'c':
+            raise SystemExit('Quit')
 
 
 class Register(object):
@@ -124,6 +183,7 @@ class Register(object):
         return 'basic' if info['features'] == 1 else \
             'pro' if info['features'] == 7 else \
             'group' if info['features'] == 15 else \
+            'ci' if info['features'] == 23 else \
             'trial' if info['token'] == 0 else 'unknown'
 
     def _license_to(self, info):
@@ -148,13 +208,89 @@ class Register(object):
 
         raise CliError('no registration code found in %s' % filename)
 
+    def _register_offline_license(self, fzip, namelist):
+        logger.info('machine id in group license: %s', ', '.join(
+            [x[7:] for x in namelist if x.startswith('tokens')]))
+        for idver in MACHFLAGS:
+            machid = self._get_machine_id(idver).decode('utf-8')
+            logger.debug('got machine id: %s', machid)
+            name = '/'.join(['tokens', machid])
+            if name in namelist:
+                logger.info('this machine id matchs group license')
+                break
+        else:
+            logger.info('no machine id matchs this group license')
+            logger.info('take this machine as docker container, and '
+                        'connect to docker host for authentication...')
+            mlist = self._get_docker_hostname()
+            if not mlist:
+                logger.info(
+                    'could not get docker host machine id\n%s',
+                    '\n'.join([
+                        '',
+                        'if this machine is docker container, please '
+                        'run command `pyarmor-auth` in docker host, '
+                        'and try it again', '',
+                        'otherwise please generate new group '
+                        'device license for this machine', '',
+                        'more information please check section '
+                        '"using group license" in documentation '
+                        '"how-to register" guide', ''
+                    ]))
+                raise CliError('this group device license is not for '
+                               'this machine')
+            for machid in mlist:
+                hostname = '/'.join(['tokens', machid])
+                if hostname in namelist:
+                    name = hostname
+                    break
+            else:
+                logger.debug('docker host machine ids: %s', mlist)
+                raise CliError('this group device license is not for '
+                               'this docker host')
+
+        logger.debug('extracting %s', name)
+        self.ctx.save_group_token(fzip.read(name))
+
+    def _init_token(self, reginfo):
+        from struct import pack
+        rev, licno, lictp, regname, product = (
+            reginfo['rev'], reginfo['rcode'], reginfo['type'],
+            reginfo['name'], reginfo['product']
+        )
+
+        token = 0
+        old_license = self.license_info
+        if old_license['licno'] == licno:
+            token = old_license['token']
+
+        features = (1 if lictp == 'J' else 7 if lictp == 'Z' else
+                    15 if lictp == 'G' else 23 if lictp == 'C' else
+                    0)
+        notes = (
+            '* Do not use this file in CI/CD pipeline directly\n'
+            '* Only use it to request CI regfile '
+            '"pyarmor-ci-%s.zip"' % licno[:6].lstrip('0')
+            if lictp == 'C' else ''
+        )
+
+        regname = regname.encode('utf-8')
+        product = product.encode('utf-8')
+        notes = notes.encode('utf-8')
+        data = pack('<II8x20s28xBB2sB2sB2s', token,
+                    rev | features << 8,
+                    licno.encode('utf-8'),
+                    0,
+                    len(regname), b'%s',
+                    len(product), b'%s',
+                    len(notes), b'%s') % (regname, product, notes)
+        return b64encode(data) + b' *=='
+
     def register_regfile(self, regfile, clean=True):
         from zipfile import ZipFile
 
-        for x in (self.ctx.license_group_token, self.ctx.license_token):
-            if os.path.exists(x):
-                logger.info('remove old token "%s"', x)
-                os.remove(x)
+        if os.path.exists(self.ctx.license_group_token):
+            os.remove(self.ctx.license_group_token)
 
         path = self.ctx.reg_path
         with ZipFile(regfile, 'r') as f:
@@ -163,56 +299,36 @@ class Register(object):
                 f.extract(item, path=path)
             namelist = f.namelist()
             if 'group.tokens' in namelist:
-                logger.info('machine id in group license: %s', ', '.join([
-                    x[7:] for x in namelist if x.startswith('tokens')
-                ]))
-                for idver in MACHFLAGS:
-                    machid = self._get_machine_id(idver).decode('utf-8')
-                    logger.info('got machine id: %s', machid)
-                    name = '/'.join(['tokens', machid])
-                    if name in namelist:
-                        logger.info('this machine id matchs group license')
-                        break
-                else:
-                    logger.info('no machine id matchs this group license')
-                    logger.info('take this machine as docker container, and '
-                                'connect to docker host for authentication...')
-                    mlist = self._get_docker_hostname()
-                    if not mlist:
-                        logger.info(
-                            'could not get docker host machine id\n%s',
-                            '\n'.join([
-                                '',
-                                'if this machine is docker container, please '
-                                'run command `pyarmor-auth` in docker host, '
-                                'and try it again', '',
-                                'otherwise please generate new group '
-                                'device license for this machine', '',
-                                'more information please check section '
-                                '"using group license" in documentation '
-                                '"how-to register" guide', ''
-                            ]))
-                        raise CliError('this group device license is not for '
-                                       'this machine')
-                    for machid in mlist:
-                        hostname = '/'.join(['tokens', machid])
-                        if hostname in namelist:
-                            name = hostname
-                            break
-                    else:
-                        logger.debug('docker host machine ids: %s', mlist)
-                        raise CliError('this group device license is not for '
-                                       'this docker host')
+                self._register_offline_license(f, namelist)
+            elif 'ci.token' in namelist:
+                name = 'ci.token'
                 logger.debug('extracting %s', name)
-                self.ctx.save_group_token(f.read(name))
-                return
-            if 'group.info' in namelist:
-                logger.info('refer to http://pyarmor.readthedocs.io/en/stable/how-to/register.html'
-                            '#using-group-license')
-                raise CliError('wrong usage for group license')
-
-        logger.info('update license token')
-        self.update_token()
+                self.ctx.save_token(f.read(name))
+            elif 'group.info' in namelist:
+                logger.info('this file is only used to '
+                            'request device regfile:\n\n'
+                            '\tpyarmor reg -g 1 %s\n', regfile)
+                raise CliError('wrong usage for Group License')
+            elif 'reg.info' in namelist:
+                data = f.read('reg.info')
+                info = json_loads(data, encoding='utf-8')
+                if info.get('type', '') == 'C':
+                    logger.info('this file is only used to '
+                                'request ci regfile:\n\n'
+                                '\tpyarmor reg -C %s\n', regfile)
+                    raise CliError('wrong usage for CI License')
+                self.ctx.save_token(self._init_token(info))
+            else:
+                logger.error('this license is not ready for Pyarmor 9')
+                prompt = (
+                    '',
+                    'Pyarmor 9 has big change on CI/CD pipeline',
+                    'Press "h" to check Pyarmor 9.0 Upgrade Notes',
+                    '',
+                    'Help (h), Quit (q): '
+                )
+                show_help_page(prompt, URL_UPGRADE_V9)
+                raise SystemExit()
 
     def _get_docker_hostname(self):
         try:
@@ -270,7 +386,7 @@ class Register(object):
         return path
 
     def check_group_license(self, silent=False):
-        licinfo = self.ctx.license_info
+        licinfo = self.license_info
         if licinfo['features'] & 8:
             licmach = licinfo.get('machine', '')
             if not licmach:
@@ -299,12 +415,6 @@ class Register(object):
                     'this group license is not for this machine')
 
     def __str__(self):
-        '''$advanced
-
-Notes
-$notes
-'''
-
         info = self.license_info
         lictype = self._license_type(info)
 
@@ -319,9 +429,11 @@ $notes
 
         bccmode = info['features'] & 2
         rftmode = info['features'] & 4
+        cidmode = info.get('machine', '').startswith('CITK')
         advanced = [
             fmt % ('BCC Mode', 'Yes' if bccmode else 'No'),
             fmt % ('RFT Mode', 'Yes' if rftmode else 'No'),
+            fmt % ('CI/CD Mode', 'Yes' if cidmode else 'No'),
         ]
         if lictype == 'trial':
             self.notes.append('* Can\'t obfuscate big script and mix str')
@@ -331,7 +443,13 @@ $notes
         elif lictype == 'group':
             self.notes.append('* Offline obfuscation')
 
-        lines.append(Template(self.__str__.__doc__).substitute(
+        if info['note']:
+            self.notes.extend(info['note'].splitlines())
+
+        if self.notes:
+            self.notes.insert(0, 'Notes')
+
+        lines.append(Template(LICENSE_INFO_TEMPLATE).substitute(
             advanced='\n'.join(advanced),
             notes='\n'.join(self.notes),
         ))
@@ -436,16 +554,13 @@ class WebRegister(Register):
         lines = []
         if upgrade:
             if rcode and not rcode.startswith('pyarmor-vax-'):
-                logger.error('please check Pyarmor 8 EULA')
                 raise CliError('old license "%s" can not be upgraded' % rcode)
             if info['upgrade']:
                 lines.append(upgrade_to_pro_info.substitute(rcode=rcode))
             else:
                 lines.append(upgrade_to_basic_info.substitute())
         else:
-            if info['lictype'] not in ('BASIC', 'PRO', 'GROUP'):
-                logger.error('this license does not work in Pyarmor 8')
-                logger.error('please check Pyarmor 8.0 EULA')
+            if info['lictype'] not in ('BASIC', 'PRO', 'GROUP', 'CI'):
                 raise CliError('unknown license type %s' % info['lictype'])
             lines.append('This license registration information will be')
 
@@ -510,6 +625,8 @@ class WebRegister(Register):
         reginfo = self.parse_keyfile(keyfile)
 
         url = self.regurl(reginfo[1], product=product)
+        # Request license file with extra info by rev 2
+        url += '&rev=2'
         if upgrade:
             url += '&upgrade_to_basic=1'
         logger.debug('url: %s', url)
@@ -518,23 +635,37 @@ class WebRegister(Register):
         res = self._send_request(url)
         regfile = self._handle_response(res)
 
+        logger.info('')
+        logger.info('the registration file "%s" has been generated', regfile)
+        logger.info('this license has been activated sucessfully')
+
         notes = [
-            '* Please backup regfile "%s" carefully, and '
-            'use this file for subsequent registration' % regfile,
-            '* Do not use "%s" again' % os.path.basename(keyfile),
+            '* Please backup "%s", but do not use it to '
+            'register Pyarmor' % os.path.basename(keyfile),
+            '* Please backup regfile "%s", and '
+            'use this file for next any registration' % regfile,
+            '* Do not use this file in docker and CI/CD pipeline',
         ]
 
         if group:
-            logger.info('This group license has been activated sucessfully')
             notes.append('* Please check `pyarmor reg` in Man page for '
                          'how to register Pyarmor on offline device')
-        else:
+            logger.info('\n\nImport Notes:\n%s\n', '\n'.join(notes))
+            return
+
+        notes.append('')
+        notes.append('Next register Pyarmor in build device by this command:')
+
+        notes.append('\tpyarmor reg %s' % regfile)
+        notes.append('')
+        logger.info('\n\nImport Notes:\n%s\n', '\n'.join(notes))
+
+        prompt = 'Do you want register Pyarmor in this machine? (Y/n) '
+        choice = input(prompt).lower()[:1]
+        if choice == 'y':
             logger.info('register "%s"', regfile)
             self.register_regfile(regfile)
-            logger.info('This license code has been %s successfully',
-                        'upgraded' if upgrade else 'activated')
-
-        logger.info('Import Notes:\n\n%s\n', '\n'.join(notes))
+            logger.info('This license registration information:\n\n%s', self)
 
     def _handle_response(self, res):
         if res and res.code == 200:
@@ -547,16 +678,39 @@ class WebRegister(Register):
                 with open(filename, 'wb') as f:
                     f.write(data[n:])
                 self._write_group_info(filename, data[:n])
+            elif data.startswith(b'REGINFO:'):
+                i = len(b'REGINFO:')
+                n = data[i] + (data[i+1] << 8)
+                i += 2
+                n += i
+                with open(filename, 'wb') as f:
+                    f.write(data[n:])
+                self._write_reg_info(filename, data[i:n])
             else:
+                # TBD: it should not happened
+                logger.warning('no REGINFO found')
                 with open(filename, 'wb') as f:
                     f.write(data)
             return filename
 
         elif res:
-            raise CliError(res.read().decode('utf-8'))
+            data = res.read()
+            logger.debug('server return(%d): %s', res.code, data)
+            try:
+                msg = data.decode('utf-8')
+            except Exception as e:
+                logger.debug('decode server data error "%s"', e)
+                msg = data
+            raise CliError(msg)
 
         raise CliError('no response from license server')
 
+    def _write_reg_info(self, filename, data):
+        from zipfile import ZipFile
+        logger.info('write reg information')
+        with ZipFile(filename, 'a') as f:
+            f.writestr('reg.info', data)
+
     def _write_group_info(self, filename, data):
         from zipfile import ZipFile
         logger.info('write group information')
@@ -625,3 +779,66 @@ class WebRegister(Register):
 
         logger.info('please copy deivce regfile to offline device and run')
         logger.info('    pyarmor reg %s', filename)
+
+    def _write_ci_info(self, filename, data):
+        from zipfile import ZipFile
+        logger.info('write ci information')
+        with ZipFile(filename, 'a') as f:
+            f.writestr('ci.token', data)
+
+    def request_ci_regfile(self, regfile, rev=2):
+        logger.info('request ci regfile by "%s"', regfile)
+        from zipfile import ZipFile
+
+        with ZipFile(regfile, 'r') as f:
+            if 'reg.info' not in f.namelist():
+                logger.error('missing reg.info in regfile')
+                raise CliError('can not request CI license')
+            reginfo = json_loads(f.read('reg.info'))
+
+        ucode = reginfo['ucode']
+        rcode = reginfo['rcode']
+        if len(ucode) != 192:
+            raise CliError('invalid registration file "%s"', regfile)
+
+        url = self.regurl('ci/%s' % ucode)
+        paras = (('rev', str(rev)),)
+        url += '&'.join(['='.join(x) for x in paras])
+        logger.debug('url: %s', url)
+
+        logger.info('send request to server')
+        res = self._send_request(url)
+
+        logger.info('handle response')
+        if res is None:
+            raise CliError('no response from license server')
+
+        elif res.code != 200:
+            raise CliError(res.read().decode('utf-8'))
+
+        data = res.read()
+        if not data.startswith(b'CITOKEN:'):
+            raise CliError('wrong server data: "%s"' % data)
+
+        i = len(b'CITOKEN:') + 2
+        n = data[i-2] + (data[i-1] << 8)
+        token = data[i:i+n]
+
+        rn = rcode[-6:].lstrip('0')
+        cifile = 'pyarmor-ci-%s.zip' % rn
+
+        with ZipFile(regfile, 'r') as src:
+            with ZipFile(cifile, 'w') as dst:
+                for x in src.namelist():
+                    dst.writestr(x, src.read(x))
+                dst.writestr('ci.token', token)
+
+        logger.info('generate CI regfile "%s" successfully', cifile)
+
+        ver = '.'.join([str(x) for x in self.ctx.version])
+        logger.info('\n\nCheck CI license in local machine by:\n'
+                    '\n\tpyarmor reg %s\n\n'
+                    'Register Pyarmor in CI/CD pipeline by:\n'
+                    '\n\tpip install pyarmor==%s\n'
+                    '\tpyarmor reg %s\n',
+                    cifile, ver, cifile)

{pyarmor-8.5.12 → pyarmor-9.0.0}/pyarmor/config.py

@@ -1,6 +1,6 @@
 from sys import platform
 
-version = '8.5.12'
+version = '9.0.0'
 
 # The corresponding version of pytransform.so
 core_version = 'r52.6'
@@ -43,7 +43,7 @@ platform_url = 'https://pyarmor.dashingsoft.com/files/{version}'
 
 key_url = 'https://api.dashingsoft.com/product/key/%s/query'
 reg_url = 'https://api.dashingsoft.com/product/key/activate/%s/'
-buy_url = 'https://order.shareit.com/cart/add?vendorid=200089125&PRODUCT[300871197]=1'
+buy_url = 'https://jondy.github.io/paypal/index.html'
 help_url = 'https://pyarmor.readthedocs.io/{lang}/v%s/{page}' % version
 
 sppmode_info = {

{pyarmor-8.5.12 → pyarmor-9.0.0}/pyarmor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyarmor
-Version: 8.5.12
+Version: 9.0.0
 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-9.0.0/pyarmor.egg-info/requires.txt

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

{pyarmor-8.5.12 → pyarmor-9.0.0}/setup.py

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

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

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