From e4b14f520d13cb9592dbe5d594145b2beafc7a04 Mon Sep 17 00:00:00 2001 From: "thomas.guiseppin" Date: Wed, 25 Oct 2017 20:45:56 +0200 Subject: [PATCH] Crypto decode user and password --- code/scripts/main/core/modules/mod_analyst.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/code/scripts/main/core/modules/mod_analyst.py b/code/scripts/main/core/modules/mod_analyst.py index ddba5de..2ae6fd3 100644 --- a/code/scripts/main/core/modules/mod_analyst.py +++ b/code/scripts/main/core/modules/mod_analyst.py @@ -14,7 +14,6 @@ from core.libs.hcrypt import * import time import operator import random -import bson import base64 def add_token(tokens_in_slots, slot_distributions): @@ -58,17 +57,15 @@ class Analyse: for cluster in self.clusters_conf: """ Decode data """ - user = pdecrypt(base64.b64decode(cluster["user"]), self.generalconf["keys"]["key_pvt"])["data"].decode('utf-8') - password = pdecrypt(base64.b64decode(cluster["password"]), self.generalconf["keys"]["key_pvt"])["data"].decode('utf-8') - + user = pdecrypt(base64.b64decode(cluster["user"]), + self.generalconf["keys"]["key_pvt"])["data"].decode('utf-8') + password = pdecrypt(base64.b64decode(cluster["password"]), + self.generalconf["keys"]["key_pvt"])["data"].decode('utf-8') """ AUTH """ proxmox = Proxmox("Analyse") - proxmox.get_ticket("{0}:{1}".format(cluster["url"], - int(cluster["port"])), - pdecrypt(user, self.generalconf["keys"]["key_pvt"]), - pdecrypt(password, self.generalconf["keys"]["key_pvt"])) + proxmox.get_ticket("{0}:{1}".format(cluster["url"], int(cluster["port"])), user, password) """ Get excluded nodes """ exclude_nodes = cluster["exclude_nodes"]