Add suffix for runtime package and builtin functions

jondy · jondy · commit fe432f290be2 · 2019-12-27T08:58:14.000+08:00
diff --git a/src/config.py b/src/config.py
@@ -1,9 +1,9 @@
 from sys import platform
 
-version = '5.8.6'
+version = '5.8.7'
 
 # The corresponding version of _pytransform.so
-core_version = 'r11.5'
+core_version = 'r12.6'
 
 version_info = '''
 PyArmor is a command line tool used to obfuscate python scripts, bind
@@ -25,7 +25,7 @@
     else '.dll' if platform in ('win32', 'cygwin') else '.so'
 
 
-entry_lines = 'from %spytransform import pyarmor_runtime\n', \
+entry_lines = 'from %spytransform%s import pyarmor_runtime\n', \
               'pyarmor_runtime(%s)\n'
 protect_code_template = 'protect_code.pt'
 
diff --git a/src/project.py b/src/project.py
@@ -32,6 +32,7 @@
 #    1.2.1: Add advanced_mode
 #    1.2.2: Remove disable_restrice_mode, add restrict_mode
 #    1.2.3: Add package_runtime
+#    1.2.4: Add enable_suffix
 #
 import os
 import time
@@ -75,6 +76,7 @@ class Project(dict):
         ('plugins', None), \
         ('platform', None), \
         ('package_runtime', 1), \
+        ('enable_suffix', 0), \
         ('build_time', 0.)
 
     def __init__(self, *args, **kwargs):
diff --git a/src/protect_code.pt b/src/protect_code.pt
@@ -13,8 +13,8 @@ def protect_pytransform():
 
     def check_obfuscated_script():
         CO_SIZES = 49, 46, 38, 36
-        CO_NAMES = set(['pytransform', 'pyarmor_runtime', '__pyarmor__',
-                        '__name__', '__file__'])
+        CO_NAMES = set(['pytransform{suffix}', 'pyarmor_runtime',
+                        '__pyarmor{suffix}__', '__name__', '__file__'])
         co = pytransform.sys._getframe(3).f_code
         if not ((set(co.co_names) <= CO_NAMES)
                 and (len(co.co_code) in CO_SIZES)):
@@ -36,9 +36,9 @@ def protect_pytransform():
 
     def check_lib_pytransform():
         platname = pytransform.sys.platform
-        libname = '_pytransform.dylib' if platname.startswith('darwin') else \
-                  '_pytransform.dll' if platname.startswith('win') else \
-                  '_pytransform.so'
+        libname = '_pytransform{suffix}.dylib' if platname.startswith('darwin') else \
+                  '_pytransform{suffix}.dll' if platname.startswith('win') else \
+                  '_pytransform{suffix}.so'
         if getattr(pytransform.sys, 'frozen', False):
             filename = pytransform.os.path.join(
                 pytransform.sys._MEIPASS, libname)
diff --git a/src/pyarmor.py b/src/pyarmor.py
@@ -50,7 +50,8 @@
                   pytransform_bootstrap, encrypt_script, search_plugins, \
                   get_product_key, register_keyfile, query_keyinfo, \
                   get_platform_list, download_pytransform, update_pytransform,\
-                  check_cross_platform, compatible_platform_names
+                  check_cross_platform, compatible_platform_names, \
+                  get_name_suffix
 
 import packer
 
@@ -181,6 +182,8 @@ def _build(args):
     capsule = build_path(project.capsule, pro_path)
     logging.info('Use capsule: %s', capsule)
 
+    suffix = get_name_suffix() if args.enable_suffix else ''
+
     output = build_path(project.output, pro_path) \
         if args.output is None else os.path.normpath(args.output)
     logging.info('Output path is: %s', output)
@@ -271,7 +274,7 @@ def v(t):
                            wrap_mode=wrap_mode, adv_mode=vmode,
                            rest_mode=restrict, protection=pcode,
                            platforms=platforms, plugins=plugins,
-                           rpath=project.runtime_path)
+                           rpath=project.runtime_path, suffix=suffix)
 
         logging.info('%d scripts has been obfuscated', len(files))
         project['build_time'] = time.time()
@@ -285,7 +288,8 @@ def v(t):
             relative = True if x == 3 else \
                 False if (x == 2 or args.no_runtime) else None
             make_entry(project.entry, project.src, soutput,
-                       rpath=project.runtime_path, relative=relative)
+                       rpath=project.runtime_path, relative=relative,
+                       suffix=suffix)
 
     if not args.no_runtime:
         routput = output if args.output is not None and args.only_runtime \
@@ -297,7 +301,8 @@ def v(t):
 
         package = project.get('package_runtime', 0) \
             if args.package_runtime is None else args.package_runtime
-        make_runtime(capsule, routput, platforms=platforms, package=package)
+        make_runtime(capsule, routput, platforms=platforms, package=package,
+                     suffix=suffix)
 
         if not restrict:
             licode = '*FLAGS:%c*CODE:PyArmor-Project' % chr(1)
@@ -465,6 +470,8 @@ def _obfuscate(args):
     if os.path.abspath(output) == path:
         raise RuntimeError('Output path can not be same as src')
 
+    suffix = get_name_suffix() if args.enable_suffix else ''
+
     if args.recursive:
         logging.info('Recursive mode is on')
         pats = ['global-include *.py']
@@ -531,25 +538,27 @@ def _obfuscate(args):
         vmode = advanced | (8 if is_entry else 0)
         encrypt_script(prokey, a, b, adv_mode=vmode, rest_mode=restrict,
                        protection=protection, platforms=platforms,
-                       plugins=plugins)
+                       plugins=plugins, suffix=suffix)
     logging.info('%d scripts have been obfuscated', len(files))
 
     if (not args.no_bootstrap) and entry and os.path.exists(entry):
         x = args.package_runtime
         relative = True if x == 3 else False if x == 2 else None
         entryname = entry if args.src else os.path.basename(entry)
         if os.path.exists(os.path.join(output, entryname)):
-            make_entry(entryname, path, output, relative=relative)
+            make_entry(entryname, path, output, relative=relative,
+                       suffix=suffix)
         else:
             logging.info('Use outer entry script "%s"', entry)
-            make_entry(entry, path, output, relative=relative)
+            make_entry(entry, path, output, relative=relative,
+                       suffix=suffix)
 
     if args.no_runtime:
         logging.info('Obfuscate %d scripts OK.', len(files))
         return
 
     make_runtime(capsule, output, platforms=platforms,
-                 package=args.package_runtime)
+                 package=args.package_runtime, suffix=suffix)
 
     logging.info('Obfuscate scripts with restrict mode %s',
                  'on' if args.restrict else 'off')
@@ -697,8 +706,9 @@ def _runtime(args):
     output = os.path.join(args.output, name) if args.inside else args.output
     package = not args.no_package
     platforms = compatible_platform_names(args.platforms)
+    suffix = get_name_suffix() if args.enable_suffix else ''
     make_runtime(capsule, output, licfile=args.with_license,
-                 platforms=platforms, package=package)
+                 platforms=platforms, package=package, suffix=suffix)
 
     filename = os.path.join(output, '__init__.py') if args.inside else \
         os.path.join(args.output, name + '.py')
@@ -805,6 +815,8 @@ def _parser():
                          'and how to make bootstrap code')
     cparser.add_argument('-n', '--no-runtime', action='store_true',
                          help='DO NOT generate runtime files')
+    cparser.add_argument('--enable-suffix', action='store_true',
+                         help='Generate runtime package with unique name')
     cparser.set_defaults(func=_obfuscate)
 
     #
@@ -932,6 +944,8 @@ def _parser():
     cparser.add_argument('--package-runtime', choices=(0, 1, 2, 3), type=int,
                          help='Where to save runtime files, '
                          'and how to make bootstrap code')
+    cparser.add_argument('--enable-suffix', type=int, choices=(0, 1),
+                         help='Generate runtime package with unique name')
     cparser.set_defaults(func=_config)
 
     #
@@ -1093,6 +1107,8 @@ def _parser():
                          action='append',
                          help='Generate runtime package for this platform, '
                          'use this option multiple times for more platforms')
+    cparser.add_argument('--enable-suffix', action='store_true',
+                         help='Generate runtime package with unique name')
     cparser.add_argument('pkgname', nargs='?', default='pytransform',
                          help=argparse.SUPPRESS)
     cparser.set_defaults(func=_runtime)
diff --git a/src/pytransform.py b/src/pytransform.py
@@ -84,7 +84,8 @@ def init_runtime():
 
 
 @dllmethod
-def encrypt_code_object(pubkey, co, flags):
+def encrypt_code_object(pubkey, co, flags, suffix=''):
+    _pytransform.set_option(6, suffix.encode())
     prototype = PYFUNCTYPE(py_object, py_object, py_object, c_int)
     dlfunc = prototype(('encrypt_code_object', _pytransform))
     return dlfunc(pubkey, co, flags)
@@ -220,19 +221,20 @@ def format_platform(platid=None):
 
 
 # Load _pytransform library
-def _load_library(path=None, is_runtime=0, platid=None):
+def _load_library(path=None, is_runtime=0, platid=None, suffix=''):
     path = os.path.dirname(__file__) if path is None \
         else os.path.normpath(path)
 
     plat = platform.system().lower()
+    name = '_pytransform' + suffix
     if plat == 'linux':
-        filename = os.path.abspath(os.path.join(path, '_pytransform.so'))
+        filename = os.path.abspath(os.path.join(path, name + '.so'))
     elif plat == 'darwin':
-        filename = os.path.join(path, '_pytransform.dylib')
+        filename = os.path.join(path, name + '.dylib')
     elif plat == 'windows':
-        filename = os.path.join(path, '_pytransform.dll')
+        filename = os.path.join(path, name + '.dll')
     elif plat == 'freebsd':
-        filename = os.path.join(path, '_pytransform.so')
+        filename = os.path.join(path, name + '.so')
     else:
         raise PytransformError('Platform %s not supported' % plat)
 
@@ -266,26 +268,35 @@ def _load_library(path=None, is_runtime=0, platid=None):
     # Disable advanced mode if required
     # m.set_option(5, c_char_p(1))
 
+    # Set suffix for private package
+    if suffix:
+        m.set_option(6, suffix.encode())
+
     return m
 
 
-def pyarmor_init(path=None, is_runtime=0, platid=None):
+def pyarmor_init(path=None, is_runtime=0, platid=None, suffix=''):
     global _pytransform
-    _pytransform = _load_library(path, is_runtime, platid)
+    _pytransform = _load_library(path, is_runtime, platid, suffix)
     return init_pytransform()
 
 
-def pyarmor_runtime(path=None):
+def pyarmor_runtime(path=None, suffix=''):
     try:
-        pyarmor_init(path, is_runtime=1)
+        pyarmor_init(path, is_runtime=1, suffix=suffix)
         init_runtime()
     except Exception as e:
         raise PytransformError(e)
 
+# ----------------------------------------------------------
+# End of pytransform
+# ----------------------------------------------------------
 
 #
 # Not available from v5.6
 #
+
+
 def generate_capsule(licfile):
     prikey, pubkey, prolic = _generate_project_capsule()
     capkey, newkey = _generate_pytransform_key(licfile, pubkey)
diff --git a/src/utils.py b/src/utils.py
