BiztProtoBois/server
3
0
Fork 0
Code Pull Requests Releases Activity

os.path.sep
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
DESKTOP-DPA61F8\Benedek
2021-04-18 22:52:14 +02:00
parent 23925d4b39
commit 094c1bcf35
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
server/authentication.py
View File

@@ -13,9 +13,10 @@ auth_logger.root.setLevel(logging.INFO)
class Authetication: class Authetication:
ABSOLUTE_PATH = os.path.abspath(os.path.dirname(sys.argv[0])) ABSOLUTE_PATH = os.path.abspath(os.path.dirname(sys.argv[0]))
HOME_DIRECTORY_LOCATION = ABSOLUTE_PATH + "\\home" HOME_DIRECTORY_LOCATION = ABSOLUTE_PATH + os.path.sep +"home"
CONFIG_DIRECTORY_LOCATION = ABSOLUTE_PATH + "\\config" CONFIG_DIRECTORY_LOCATION = ABSOLUTE_PATH + os.path.sep + "config"
PRIVATE_KEY_DIRECTORY_LOCATION = CONFIG_DIRECTORY_LOCATION + "\\private_keys" CONFIG_FILE_LOCATION = ABSOLUTE_PATH + os.path.sep + "config" + os.path.sep + "config.txt"
PRIVATE_KEY_DIRECTORY_LOCATION = CONFIG_DIRECTORY_LOCATION + os.path.sep + "private_keys"
USER_INDEX = 0 USER_INDEX = 0
def __init__(self): def __init__(self):
@@ -28,14 +29,14 @@ class Authetication:
if not os.path.isdir(self.PRIVATE_KEY_DIRECTORY_LOCATION): if not os.path.isdir(self.PRIVATE_KEY_DIRECTORY_LOCATION):
os.mkdir(self.PRIVATE_KEY_DIRECTORY_LOCATION) os.mkdir(self.PRIVATE_KEY_DIRECTORY_LOCATION)
if not os.path.isfile(self.CONFIG_DIRECTORY_LOCATION + "\\config.txt") or os.stat( if not os.path.isfile(self.CONFIG_FILE_LOCATION) or os.stat(
self.CONFIG_DIRECTORY_LOCATION + "\\config.txt").st_size == 0: self.CONFIG_FILE_LOCATION).st_size == 0:
data = {'index': 0, 'user': []} data = {'index': 0, 'user': []}
with open(self.CONFIG_DIRECTORY_LOCATION + "\\config.txt", 'w+') as outfile: with open(self.CONFIG_FILE_LOCATION, 'w+') as outfile:
json.dump(data, outfile) json.dump(data, outfile)
def login(self, username: str, password: str) -> str: def login(self, username: str, password: str) -> str:
with open(self.CONFIG_DIRECTORY_LOCATION + '\\config.txt') as json_file: with open(self.CONFIG_FILE_LOCATION) as json_file:
data = json.load(json_file) data = json.load(json_file)
for user in data['user']: for user in data['user']:
@@ -51,7 +52,7 @@ class Authetication:
return user['homeDir'] return user['homeDir']
def checkUserExists(self, username: str) -> bool: def checkUserExists(self, username: str) -> bool:
with open(self.CONFIG_DIRECTORY_LOCATION + '\\config.txt') as json_file: with open(self.CONFIG_FILE_LOCATION) as json_file:
data = json.load(json_file) data = json.load(json_file)
for user in data['user']: for user in data['user']:
@@ -61,7 +62,7 @@ class Authetication:
def initConfig(self): def initConfig(self):
data = {'index': 0, 'user': []} data = {'index': 0, 'user': []}
with open(self.CONFIG_DIRECTORY_LOCATION + "\\config.txt", 'w+') as outfile: with open(self.CONFIG_FILE_LOCATION, 'w+') as outfile:
json.dump(data, outfile) json.dump(data, outfile)
shutil.rmtree(self.HOME_DIRECTORY_LOCATION) shutil.rmtree(self.HOME_DIRECTORY_LOCATION)
@@ -72,7 +73,7 @@ class Authetication:
def generatePrivateKeyForUser(self, username:str, user_passphrase:str, public_server_key='') -> bool: def generatePrivateKeyForUser(self, username:str, user_passphrase:str, public_server_key='') -> bool:
if self.checkUserExists(username): if self.checkUserExists(username):
with open(self.CONFIG_DIRECTORY_LOCATION + '\\config.txt') as json_file: with open(self.CONFIG_FILE_LOCATION) as json_file:
data = json.load(json_file) data = json.load(json_file)
private_key = RSA.generate(2048) private_key = RSA.generate(2048)
@@ -89,7 +90,7 @@ class Authetication:
for user in data['user']: for user in data['user']:
if username == user['username']: if username == user['username']:
user['publicKey'] = public_key_value user['publicKey'] = public_key_value
with open(self.CONFIG_DIRECTORY_LOCATION + '\\config.txt', 'w') as outfile: with open(self.CONFIG_FILE_LOCATION, 'w') as outfile:
json.dump(data, outfile) json.dump(data, outfile)
break break
return True return True
@@ -102,7 +103,7 @@ class Authetication:
b64pwd = b64encode(SHA256.new(bytePass).digest()) b64pwd = b64encode(SHA256.new(bytePass).digest())
bcrypt_hash = bcrypt(b64pwd, 12) bcrypt_hash = bcrypt(b64pwd, 12)
with open(self.CONFIG_DIRECTORY_LOCATION + '\\config.txt') as json_file: with open(self.CONFIG_FILE_LOCATION) as json_file:
data = json.load(json_file) data = json.load(json_file)
if self.checkUserExists(username): if self.checkUserExists(username):
@@ -123,7 +124,7 @@ class Authetication:
##Save user data ##Save user data
data['user'].append(user) data['user'].append(user)
with open(self.CONFIG_DIRECTORY_LOCATION + '\\config.txt', 'w') as outfile: with open(self.CONFIG_FILE_LOCATION, 'w') as outfile:
json.dump(data, outfile) json.dump(data, outfile)
auth_logger.debug("User saved!") auth_logger.debug("User saved!")