v3.4.9.1

app/create_db.py

@@ -121,7 +121,7 @@ def create_table(**kwargs):
 		CREATE TABLE IF NOT EXISTS `telegram` (`id` integer primary key autoincrement, `token` VARCHAR ( 64 ), `chanel_name` INTEGER NOT NULL DEFAULT 1, `groups` INTEGER NOT NULL DEFAULT 1);
 		CREATE TABLE IF NOT EXISTS `metrics` (`serv` varchar(64), curr_con INTEGER, cur_ssl_con INTEGER, sess_rate INTEGER, max_sess_rate INTEGER,`date` timestamp default '0000-00-00 00:00:00');
 		CREATE TABLE IF NOT EXISTS `settings` (`param` varchar(64) UNIQUE, value varchar(64), section varchar(64), `desc` varchar(100));
-		CREATE TABLE IF NOT EXISTS `version` (`version` varchar(64));
+		CREATE TABLE IF NOT EXISTS `version` (`version` varchar(64), `hash` INTEGER NOT NULL DEFAULT 1,);
 		CREATE TABLE IF NOT EXISTS `options` ( `id`	INTEGER NOT NULL, `options`	VARCHAR ( 64 ), `groups`	VARCHAR ( 120 ), PRIMARY KEY(`id`)); 
 		);
 		"""
@@ -401,7 +401,7 @@ def update_db_v_3_4_7(**kwargs):
 	
 def update_ver(**kwargs):
 	con, cur = get_cur()
-	sql = """update version set version = '3.4.9'; """
+	sql = """update version set version = '3.4.9.1'; """
 	try:    
 		cur.execute(sql)
 		con.commit()
@@ -410,6 +410,61 @@ def update_ver(**kwargs):
 	cur.close() 
 	con.close()
 	
+	
+def check_hash():
+	con, cur = get_cur()
+	sql = """select hash from version"""
+
+	try:    
+		cur.execute(sql)
+		return False
+	except sqltool.Error as e:
+		return True
+	cur.close()    
+	con.close() 
+	
+	
+def update_to_hash():
+	cur_ver = funct.check_ver()
+	cur_ver = cur_ver.replace('.','')
+	i = 1
+	ver = ''
+	for l in cur_ver:
+		ver += l
+		if i == 4:
+			break
+		i += 1
+	if cur_ver <= '3490' and check_hash():	
+		con, cur = get_cur()
+		sql = """select id, password from user """ 
+		try:    
+			cur.execute(sql)
+		except sqltool.Error as e:
+			out_error(e)
+		else:
+			for u in cur.fetchall():
+				sql = """ update user set password = '%s' where id = '%s' """ % (funct.get_hash(u[1]), u[0])
+				try:    
+					cur.execute(sql)
+					con.commit()
+				except sqltool.Error as e:
+					if kwargs.get('silent') != 1:
+						print("An error occurred:", e)
+						
+		con, cur = get_cur()
+		sql = """
+		ALTER TABLE `version` ADD COLUMN hash INTEGER NOT NULL DEFAULT 1;
+		"""
+		try:    
+			cur.execute(sql)
+			con.commit()
+		except sqltool.Error as e:
+			if kwargs.get('silent') != 1:
+				print("An error occurred:", e)
+
+		cur.close() 
+		con.close()
+	
 			
 def update_all():	
 	update_db_v_31()
@@ -425,6 +480,7 @@ def update_all():
 		update_db_v_3_4_5_22()
 	update_db_v_3_4_7()
 	update_ver()
+	update_to_hash()
 	
 	
 def update_all_silent():

app/funct.py

@@ -637,4 +637,11 @@ def versions():
 		new_ver = "Sorry cannot get new version"
 		new_ver_without_dots = 0
 		
-	return current_ver, new_ver, current_ver_without_dots, new_ver_without_dots
+	return current_ver, new_ver, current_ver_without_dots, new_ver_without_dots
+	
+	
+def get_hash(value):
+	import hashlib
+	h = hashlib.md5(value.encode('utf-8'))
+	p = h.hexdigest()
+	return p

app/login.py

@@ -131,6 +131,7 @@ if form.getvalue('logout'):
 if login is not None and password is not None:
 
 	USERS = sql.select_users(user=login)
+	password = funct.get_hash(password)
 		
 	for users in USERS:	
 		if users[7] == 0:

app/sql.py

@@ -24,7 +24,7 @@ def out_error(e):
 def add_user(user, email, password, role, group, activeuser):
 	con, cur = create_db.get_cur()
 	if password != 'aduser':
-		sql = """INSERT INTO user (username, email, password, role, groups, activeuser) VALUES ('%s', '%s', '%s', '%s', '%s', '%s')""" % (user, email, password, role, group, activeuser)
+		sql = """INSERT INTO user (username, email, password, role, groups, activeuser) VALUES ('%s', '%s', '%s', '%s', '%s', '%s')""" % (user, email, funct.get_hash(password), role, group, activeuser)
 	else:
 		sql = """INSERT INTO user (username, email, role, groups, ldap_user, activeuser) VALUES ('%s', '%s', '%s', '%s', '1', '%s')""" % (user, email, role, group, activeuser)		
 	try:    
@@ -47,7 +47,7 @@ def update_user(user, email, password, role, group, id, activeuser):
 			role = '%s', 
 			groups = '%s',
 			activeuser = '%s'
-			where id = '%s'""" % (user, email, password, role, group, activeuser, id)
+			where id = '%s'""" % (user, email, funct.get_hash(password), role, group, activeuser, id)
 	try:    
 		cur.execute(sql)
 		con.commit()