Ajout support serveur MAIL et XMPP

tools/databaseinit.py

@@ -1,50 +1,72 @@
-#!venv/bin/python
-
+from flask import Flask
 import sqlite3
-import os.path
+import os
+
+app = Flask( 'pywallter' )
+app.config.from_pyfile('config.py')
+
+
+DATABASE = app.config['DATABASE']
+DOSSIER_PERSO = app.config['DOSSIER_APP']
+DATABASE = app.config['DATABASE']
+
+
 
 def init_db():
-    if os.path.isfile('base.db'):
-        return False
-    else:
-        conn = sqlite3.connect('base.db')
-        cursor = conn.cursor()
-        cursor.execute("""
-            CREATE TABLE IF NOT EXISTS users(
-            Mail CHAR(80) PRIMARY KEY UNIQUE NOT NULL,
-            name TEXT,
-            alias TEXT,
-            xmpp TEXT,
-            passwd TEXT,
-            avatar TEXT,
-            nom TEXT,
-            prenom TEXT,
-            age TEXT,
-            website TEXT,
-            Token CHAR(30),
-            Mail_rescue TEXT )
-        """)
-        conn.commit()
-        print ('table users OK')
+    conn = sqlite3.connect(DATABASE)
+    cursor = conn.cursor()
+    cursor.execute("""
+    CREATE TABLE IF NOT EXISTS users(
+    Mail CHAR(80) PRIMARY KEY UNIQUE NOT NULL,
+    name TEXT,
+    alias TEXT,
+    xmpp TEXT,
+    passwd TEXT,
+    avatar TEXT,
+    nom TEXT,
+    prenom TEXT,
+    age TEXT,
+    website TEXT,
+    Token CHAR(30),
+    invitations INTEGER DEFAULT (20),
+    Mail_rescue TEXT )
+    """)
+    conn.commit()
+    print ('table users Ok')
 
-        cursor.execute("""
-            CREATE TABLE IF NOT EXISTS posts(
-            id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE,
-            title TEXT,
-            content TEXT,
-            time TEXT,
-            category TEXT,
-            author TEXT,
-            status TEXT
-            )
-        """)
-        conn.commit()
-        conn.close()
-        print ('table posts OK')
-        return True
+    cursor.execute("""
+    CREATE TABLE IF NOT EXISTS posts(
+    id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE,
+    title TEXT,
+    content TEXT,
+    time TEXT,
+    category TEXT,
+    author TEXT,
+    status TEXT
+    )
+    """)
+    conn.commit()
+    conn.close()
+    print ('table posts OK')
 
 def init_dir():
     if os.path.isdir('users'):
         return False
     else:
         os.makedirs('./users/')
+
+def db_migrate():
+    conn = sqlite3.connect(DATABASE)
+    cursor = conn.cursor()
+
+    cursor.execute("""SELECT name FROM PRAGMA_TABLE_INFO('users');""")
+    db_columns = cursor.fetchall()
+    present = False
+    for col in db_columns:
+        if "invitations" == col[0]:
+            present = True
+
+    if not(present):
+        cursor.execute("""ALTER TABLE users ADD COLUMN invitations INTEGER DEFAULT (20);""")
+        conn.commit()
+        print ("Ajout du champ invitations")

tools/utils.py

@@ -0,0 +1,75 @@
+from flask import Flask
+import sqlite3
+import os
+import string
+import random
+
+app = Flask( 'pywallter' )
+app.config.from_pyfile('config.py')
+
+
+DATABASE = app.config['DATABASE']
+DOSSIER_PERSO = app.config['DOSSIER_APP']
+DATABASE = app.config['DATABASE']
+
+def append_to_log(log_line, user):
+    log_file=os.path.join(DOSSIER_PERSO, user, "log.txt")
+    logs=open(log_file, "r")
+    tmp=logs.read()
+    logs.close()
+    log=open(log_file, "w")
+    log.write(log_line)
+    log.write(tmp)
+    log.close()
+
+
+
+def email_disp(email):
+    disp = True
+    conn = sqlite3.connect(DATABASE) # Connexion à la base de donnée
+    cursor = conn.cursor() # Création de l'objet "curseur"
+
+
+    cursor.execute("""SELECT mail FROM users WHERE mail=?""", (email,))
+    testmail = cursor.fetchall()
+    if testmail:
+        print ("on passe ici")
+        disp = False
+
+    if disp:
+        cursor.execute("""SELECT alias FROM users""")
+        aliases = cursor.fetchall()
+        for alist in aliases:
+            for alias in alist:
+                if alias:
+                    if email in alias:
+                        disp=False
+    return disp
+
+def valid_token_register(token):
+    valid = True
+    print(token)
+    if len(token) != 30:
+        valid = False
+
+    if valid:
+        conn = sqlite3.connect(DATABASE)
+        cursor = conn.cursor()
+        cursor.execute("""SELECT name, invitations FROM users where Token=?""", (token,))
+        tmp = cursor.fetchone()
+        conn.close()
+        print (tmp)
+        if tmp:
+            valid = True
+        else:
+            valid = False
+    print(valid)
+    return valid
+
+#Génère un token de 30 caratères aléatoires
+def gen_token():
+    letters = random.choices(string.ascii_letters, k=20)
+    digits = random.choices(string.digits, k=10)
+    sample = ''.join(random.sample(digits + letters, 30))
+
+    return sample