Skip to content
Snippets Groups Projects
Commit 6cf48371 authored by ptangu01's avatar ptangu01
Browse files

format code style pep8 but not on func name yet

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/trunk@1361 b32b6428-25c9-4566-ad07-03861ab6144f
parent 7fe7c623
Branches
No related tags found
No related merge requests found
# -*- coding: utf-8 -*-
#
# Copyright 2014, Jérôme Colin, Jérôme Kerdreux, Philippe Tanguy, Telecom Bretagne.
# Copyright 2014, Jérôme Colin, Jérôme Kerdreux, Philippe Tanguy,
# Telecom Bretagne.
#
# This file is part of xAAL.
#
......@@ -22,6 +23,11 @@
import os
import uuid
import pysodium
import logging
import logging.config
from . import config
import sys
......@@ -30,19 +36,20 @@ if (sys.version_info.major > 2):
else:
from ConfigParser import RawConfigParser as ConfigParser
import pysodium
import logging
import logging.config
def getConfigFile(name, confDir=config.CONF_DIR):
filename = '%s.conf' % name
if os.path.isdir(confDir):
return os.path.join(confDir, filename)
else:
print("Please verify your configuration filename or configuration directory: - The default directory must exist and be in your user path and in a directory called .xaal - And/Or verify your configuration filename")
print("Please verify your configuration filename or\
configuration directory:\
- The default directory must exist and be in\
your user path and in a directory called .xaal\
- And/Or verify your configuration filename")
sys.exit(0)
def loadConfigFile(filename):
if os.path.exists(filename):
cfg = ConfigParser()
......@@ -50,20 +57,23 @@ def loadConfigFile(filename):
return cfg
return None
def getConfigFileAddr(appName):
configFile = getConfigFile(appName)
cfg = loadConfigFile(configFile)
if cfg == None:
if cfg is None:
cfg = newDefaultConfigFile(configFile, appName)
addr = cfg.get(appName, 'xaaladdr')
return addr
def configParser():
cfg = ConfigParser()
return cfg
def newDefaultConfigFile(filename, appName):
cfg = ConfigParser()
cfg.add_section(appName)
......@@ -72,9 +82,11 @@ def newDefaultConfigFile(filename,appName):
cfg.write(f)
return cfg
def getRandomUUID():
return uuid.uuid1().__str__()
def getLogger(name, level, filename=None):
"""
It creates logger if doesn't exist.
......@@ -85,14 +97,16 @@ def getLogger(name,level,filename=None):
logger = logging.getLogger(name)
# define handlers
formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
formatter = logging.Formatter(
'%(asctime)s - %(name)s - %(levelname)s - %(message)s')
console_handler = logging.StreamHandler()
console_handler.setLevel(logging.DEBUG)
console_handler.setFormatter(formatter)
logger.root.addHandler(console_handler)
if filename:
file_handler = logging.handlers.RotatingFileHandler(filename,'a',10000,1,'utf8')
file_handler = logging.handlers.RotatingFileHandler(
filename, 'a', 10000, 1, 'utf8')
file_handler.setLevel(logging.INFO)
file_handler.setFormatter(formatter)
logger.root.addHandler(file_handler)
......@@ -102,6 +116,7 @@ def getLogger(name,level,filename=None):
return logger
def pass2key(passphrase):
"""Generate key from passphrase using libsodium
crypto_pwhash_scryptsalsa208sha256 func
......@@ -110,9 +125,10 @@ def pass2key(passphrase):
memlimit: crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_INTERACTIVE
"""
KEY_BYTES = 32
salt='\00'*32 #bytearray(pysodium.crypto_pwhash_scryptsalsa208sha256_SALTBYTES)
# bytearray(pysodium.crypto_pwhash_scryptsalsa208sha256_SALTBYTES)
salt = '\00' * 32
opslimit = pysodium.crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_INTERACTIVE
memlimit = pysodium.crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_INTERACTIVE
key=pysodium.crypto_pwhash_scryptsalsa208sha256(KEY_BYTES,passphrase,salt,opslimit,memlimit)
key = pysodium.crypto_pwhash_scryptsalsa208sha256(
KEY_BYTES, passphrase, salt, opslimit, memlimit)
return key
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment