Make sure machine code on Windows is the same as in the .NET Client (#20)

* Update internal.py

* Update

* Update LICENSE.txt

* Minor update

* Update setup.py

Author: artemlos

LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Cryptolens AB
+Copyright (c) Cryptolens AB and Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

licensing/internal.py

@@ -104,13 +104,20 @@ def send_request(method, params):
                                       .encode("utf-8")).read().decode("utf-8")
 
     @staticmethod 
-    def start_process(command):
+    def start_process(command, v = 1):
 
         process = Popen(command, stdout=PIPE)
         (output, err) = process.communicate()
         exit_code = process.wait()
-        return output.decode("utf-8")
-
+        
+        if v == 1:
+            return output.decode('utf-8')
+        elif v == 2:
+            rawOutput = output.decode('utf-8')
+            return rawOutput[rawOutput.index("UUID")+4:].strip()
+        else:
+            raise ValueError("Version can be either 1 or 2.")
+        
     @staticmethod
     def get_dbus_machine_id():
         try:

licensing/methods.py

@@ -164,14 +164,15 @@ def deactivate(token, product_id, key, machine_code, floating = False):
 class Helpers:
 
     @staticmethod
-    def GetMachineCode():
+    def GetMachineCode(v=1):
 
         """
-        Get a unique identifier for this device.
+        Get a unique identifier for this device. If you want the machine code to be the same in .NET on Windows, you
+        can set v=2. More information is available here: https://help.cryptolens.io/faq/index#machine-code-generation
         """
 
         if "windows" in platform.platform().lower():
-            return HelperMethods.get_SHA256(HelperMethods.start_process(["cmd.exe", "/C", "wmic","csproduct", "get", "uuid"]))
+            return HelperMethods.get_SHA256(HelperMethods.start_process(["cmd.exe", "/C", "wmic","csproduct", "get", "uuid"],v))
         elif "mac" in platform.platform().lower() or "darwin" in platform.platform().lower():               
             res = HelperMethods.start_process(["system_profiler","SPHardwareDataType"])
             return HelperMethods.get_SHA256(res[res.index("UUID"):].strip())
@@ -181,13 +182,14 @@ def GetMachineCode():
             return HelperMethods.get_SHA256(HelperMethods.compute_machine_code())
 
     @staticmethod
-    def IsOnRightMachine(license_key, is_floating_license = False, allow_overdraft=False):
+    def IsOnRightMachine(license_key, is_floating_license = False, allow_overdraft=False, v = 1):
 
         """
         Check if the device is registered with the license key.
+        The version parameter is related to the one in GetMachineCode method.
         """
 
-        current_mid = Helpers.GetMachineCode()
+        current_mid = Helpers.GetMachineCode(v)
 
         if license_key.activated_machines == None:
             return False

setup.py

@@ -2,13 +2,13 @@
 setup(
   name = 'licensing',         # How you named your package folder (MyLib)
   packages = ['licensing'],   # Chose the same as "name"
-  version = '0.14',      # Start with a small number and increase it with every change you make
+  version = '0.15',      # Start with a small number and increase it with every change you make
   license='MIT',        # Chose a license from here: https://help.github.com/articles/licensing-a-repository
   description = 'Client library for Cryptolens licensing Web API.',   # Give a short description about your library
   author = 'Cryptolens AB',                   # Type in your name
   author_email = '[email protected]',      # Type in your E-Mail
   url = 'https://cryptolens.io',   # Provide either the link to your github or to your website
-  download_url = 'https://github.com/Cryptolens/cryptolens-python/archive/v_14.tar.gz',    # I explain this later on
+  download_url = 'https://github.com/Cryptolens/cryptolens-python/archive/v_15.tar.gz',    # I explain this later on
   keywords = ['software licensing', 'licensing library', 'cryptolens'],   # Keywords that define your package best
   classifiers=[
     #'Development Status :: 5 - Stable',      # Chose either "3 - Alpha", "4 - Beta" or "5 - Production/Stable" as the current state of your package