Removed optional (nonsense) custom encoder, because the encoder itself can be loaded by any python program and it's not a good protection

windowsActor/store/windows.py

@@ -8,29 +8,29 @@ import _winreg as wreg
 import win32security
 import cPickle
 
-try:
-    from udsactor_encoder import encoder, decoder
-except:
-    def encoder(data):
-        return data.encode('bz2')
+# Can be changed to whatever we want, but registry key is protected by permissions
+def encoder(data):
+    return data.encode('bz2')
 
-    def decoder(data):
-        return data.decode('bz2')
+def decoder(data):
+    return data.decode('bz2')
 
 DEBUG = True
 
-path = 'Software\\UDS Enterprise'
+path = 'Software\\UDSEnterpriseActor'
 baseKey = wreg.HKEY_CURRENT_USER if DEBUG is True else wreg.HKEY_LOCAL_MACHINE
 
 def checkPermissions():
     return True if DEBUG else shell.IsUserAnAdmin()
 
 def fixRegistryPermissions(handle):
+    if DEBUG:
+        return
     # Fix permissions so users can't read this key
     v = win32security.GetSecurityInfo(handle, win32security.SE_REGISTRY_KEY, win32security.DACL_SECURITY_INFORMATION)
     dacl = v.GetSecurityDescriptorDacl()
     n = 0
-    # Remove all normal users access permissions to the handle
+    # Remove all normal users access permissions to the registry key
     while n < dacl.GetAceCount():
         if unicode(dacl.GetAce(n)[2]) == u'PySID:S-1-5-32-545':  # Whell known Users SID
             dacl.DeleteAce(n)
@@ -54,9 +54,7 @@ def writeConfig(data):
         key = wreg.OpenKey(base, path, 0, wreg.KEY_ALL_ACCESS)
     except:
         key = wreg.CreateKeyEx(baseKey, path, 0, wreg.KEY_ALL_ACCESS)
-
-        if DEBUG is False:
-            fixRegistryPermissions(key.handle)
+        fixRegistryPermissions(key.handle)
 
     wreg.SetValueEx(key, "", 0, wreg.REG_BINARY, encoder(cPickle.dumps(data)))
     wreg.CloseKey(key)