Sécurity MAJ

CenRa_METABASE/dock.py

@@ -47,11 +47,10 @@ from pg_metadata.connection_manager import (
     settings_connections_names,
 )
 '''
-
+from CenRa_METABASE.tools.PythonSQL import login_base
 from .tools.resources import (
     load_ui,
     resources_path,
-    login_base,
 )
 
 DOCK_CLASS = load_ui('CenRa_Metabase_dockwidget_base.ui')

CenRa_METABASE/editor.py

@@ -38,10 +38,10 @@ from qgis.PyQt.QtWidgets import (
 )
 from qgis.utils import iface
 
+from CenRa_METABASE.tools.PythonSQL import login_base
 from .tools.resources import (
     load_ui,
     resources_path,
-    login_base,
     send_issues,
 )
 from .issues import CenRa_Issues

CenRa_METABASE/tools/PythonSQL.py

@@ -1,6 +1,10 @@
 import sys
 import socket
 import os
+import base64
+import psycopg2
+import psycopg2.extras
+
 IPAddr=socket.gethostbyname(socket.gethostname())
 #print(IPAddr)
 if IPAddr[0:11] == "100.100.100": #4269
@@ -31,4 +35,23 @@ else:
 if os_user == 'STAGE':
     os_user='stage'
 if os_user == 'Administrateur':
-    os_user='stage'
+    os_user='stage'
+
+def login_base(take=None):
+    first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
+    first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
+    first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
+    res_ident = first_cur.fetchone()
+
+    mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
+    user = res_ident[1]
+
+    con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
+    
+    cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
+    first_conn.close()
+
+    if take:
+        return cur,con
+    else:
+        return cur

CenRa_METABASE/tools/resources.py

@@ -3,9 +3,6 @@
 import configparser
 import shutil
 import tempfile
-import base64
-import psycopg2
-import psycopg2.extras
 from os.path import abspath, join, pardir, dirname
 from qgis.PyQt.QtWidgets import QApplication
 from qgis.PyQt import uic
@@ -107,25 +104,6 @@ def load_ui(*args):
 
     return ui_class
 
-def login_base(take=None):
-    from CenRa_METABASE.tools.PythonSQL import host,port,dbname,password,os_user
-    first_conn = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=first_cnx password=" + password)
-    first_cur = first_conn.cursor(cursor_factory = psycopg2.extras.DictCursor)
-    first_cur.execute("SELECT mdp_w, login_w FROM pg_catalog.pg_user t1, admin_sig.vm_users_sig t2 WHERE t2.oid = t1.usesysid AND (login_w = '" + os_user + "' OR login_w = '" + os_user + "')")
-    res_ident = first_cur.fetchone()
-
-    mdp = base64.b64decode(str(res_ident[0])).decode('utf-8')
-    user = res_ident[1]
-
-    con = psycopg2.connect("host=" + host + " port=" + port + " dbname="+dbname+" user=" + user + " password=" + mdp)
-    
-    cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-    first_conn.close()
-
-    if take:
-        return cur,con
-    else:
-        return cur
 def send_issues(url,titre,body,labels):
     import requests
     import json