vesta-web 1.1.10__py3-none-any.whl → 1.2.0__py3-none-any.whl

vesta/__init__.py

@@ -101,26 +101,27 @@ class Server(server):
         self.sendVerification(user)
 
     @server.expose
-    def login(self, email, password, parrain=None):
-        if 'email' and 'password':
-            password = password.encode('utf-8')  # converting to bytes array
-            account = self.uniauth.getUserCredentials(email)
-            # If account exists in accounts table
-            if account:
-                msg = self.connect(account, password)
-            else:
-                msg = self.register(email, password, parrain)
+    def login(self, email=None, password=None, parrain=None):
+        if not email or not password:
+            return 'please give an email and a password'
+
+        password = password.encode('utf-8')  # converting to bytes array
+        account = self.uniauth.getUserCredentials(email)
+        # If account exists in accounts table
+        if account:
+            msg = self.connect(account, password)
         else:
-            msg = 'please give an email and a password'
+            msg = self.register(email, password, parrain)
 
         return msg
 
     @server.expose
-    def changePasswordVerif(self,mail, code, password):
-        id = self.uniauth.getSomething("account", mail,"email")["id"]
-        if not id :
+    def changePasswordVerif(self, mail, code, password):
+        account = self.uniauth.getSomething("account", mail, "email")
+        if not account or not account.get("id"):
             return "no account found for " + mail
 
+        id = account["id"]
         password = password.encode('utf-8')
         actual = self.uniauth.getSomething("reset_code", id)
         if actual and str(actual["code"]) == code and actual["expiration"] > datetime.datetime.now():
@@ -152,7 +153,7 @@ class Server(server):
         user = self.getUser(verif=True)
         print("user:", user)
         actual = self.uniauth.getSomething("verif_code", user)
-        if str(actual["code"]) == code and actual["expiration"] > datetime.datetime.now():
+        if actual and str(actual["code"]) == code and actual["expiration"] > datetime.datetime.now():
             self.uniauth.edit("account", user, "verified", True)
             self.createJwt(user, True)
             self.onLogin(user)
@@ -162,7 +163,11 @@ class Server(server):
 
     @server.expose
     def logout(self):
-        token = self.getJWT()
+        try:
+            token = self.getJWT()
+        except:
+            pass  # Cookie doesn't exist, that's fine
+
         self.response.del_cookie('JWT')
         self.response.del_cookie('auth')
         raise HTTPRedirect(self.response, "/auth")

vesta/scripts/cli.py

@@ -2,6 +2,7 @@ import argparse
 import os
 import subprocess
 from .utils import ex, Installer
+from .initDB import DBInitializer
 
 HERE = os.path.dirname(__file__)
 PATH = os.getcwd()
@@ -191,7 +192,6 @@ def main():
     service_subparsers = parser_service.add_subparsers(dest='service_command')
     parser_service_setup = service_subparsers.add_parser('setup', help='Install systemd config')
 
-
     args = parser.parse_args()
 
     if args.command == 'init':

vesta/scripts/initDB.py

@@ -18,27 +18,29 @@ class DBInitializer(Server):
 
     def referenceUniauth(self):
         self.db.cur.execute("CREATE EXTENSION if not exists postgres_fdw;")
-        self.db.cur.execute(
-            sql.SQL("""
-            CREATE SERVER if not exists uniauth
-            FOREIGN DATA WRAPPER postgres_fdw
-            OPTIONS (host %s, port %s, dbname %s);
-            """),
-            (
-                self.config.get('UNIAUTH', 'DB_HOST'),
-                self.config.get('UNIAUTH', 'DB_PORT'),
-                self.config.get('UNIAUTH', 'DB_NAME')
-            ))
 
-        self.db.cur.execute(
-            sql.SQL("""
-            CREATE USER MAPPING if not exists FOR CURRENT_USER SERVER uniauth
-            OPTIONS (user %s, password %s);
-            """),
-            (
-                self.config.get('DB', 'DB_USER'),
-                self.config.get('DB', 'DB_PASSWORD')
-            ))
+        ua_host = self.config.get('UNIAUTH', 'DB_HOST')
+        ua_port = self.config.get('UNIAUTH', 'DB_PORT')
+        ua_dbname = self.config.get('UNIAUTH', 'DB_NAME')
+        q_server = sql.SQL("""
+            CREATE SERVER IF NOT EXISTS uniauth
+            FOREIGN DATA WRAPPER postgres_fdw
+            OPTIONS (host {host}, port {port}, dbname {dbname});
+        """).format(
+            host=sql.Literal(ua_host),
+            port=sql.Literal(ua_port),
+            dbname=sql.Literal(ua_dbname)
+        )
+        self.db.cur.execute(q_server)
+
+        q_mapping = sql.SQL("""
+        CREATE USER MAPPING IF NOT EXISTS FOR CURRENT_USER SERVER uniauth
+        OPTIONS (user {user}, password {password});
+    """).format(
+            user=sql.Literal(self.config.get('DB', 'DB_USER')),
+            password=sql.Literal(self.config.get('DB', 'DB_PASSWORD'))
+        )
+        self.db.cur.execute(q_mapping)
         self.db.cur.execute(
             """
             CREATE FOREIGN TABLE if not exists account (id bigserial NOT NULL)
@@ -48,7 +50,7 @@ class DBInitializer(Server):
 
 
 
-initializer = DBInitializer(path=PATH[:-3], configFile="/server.ini", noStart=True)
-initializer.initUniauth()
-initializer.initDB()
-print("DB ready")
+# initializer = DBInitializer(path=PATH[:-3], configFile="/server.ini", noStart=True)
+# initializer.initUniauth()
+# initializer.initDB()
+# print("DB ready")

{vesta_web-1.1.10.dist-info → vesta_web-1.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vesta-web
-Version: 1.1.10
+Version: 1.2.0
 Summary: An extensive web framework adding every feature needed for Carbonlab
 Project-URL: Homepage, https://gitlab.com/Louciole/vesta
 Project-URL: Issues, https://gitlab.com/Louciole/vesta/-/issues

{vesta_web-1.1.10.dist-info → vesta_web-1.2.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-vesta/__init__.py,sha256=B84n0xvfCLiCpXLpvPkjlEgGwBaxCzr0Xazm5e84mdo,17977
+vesta/__init__.py,sha256=nK5NpQ_E9DbuhuoDNJsUdKdLVQ3PFK2Ou1fepo-92Q0,18106
 vesta/db/UNIAUTH.sql,sha256=3R8Si3rcXfRFC5idmaKTixDWXMazXQzdC9u1BCPCovY,2126
 vesta/db/db_service.py,sha256=E2r6LxxycMOBtpUXWbVIge_363QUCOIJg-MK-Z5dzmw,10058
 vesta/emptyProject/.gitignore,sha256=9ImxEbKZYcw6fZv2coknCwBdmfY7xWkrOgfBWR03VG0,206
@@ -50,13 +50,13 @@ vesta/http/error.py,sha256=fWdp-oI2ObJD2mHHuxs1yVJvhON5oHYgYFRLAcUMs-I,180
 vesta/http/redirect.py,sha256=OiDeOmU-X5Mos8a0BQIeOIJqvgWjDEtaYrM4-x4MXl0,177
 vesta/http/response.py,sha256=G7cmbrXFNbIbQoqNxNkR06I5VymIwjFSAe3LtVa56Ok,3760
 vesta/mailing/mailing_service.py,sha256=GBO5Hnspm9Pqwd5kGB0iekZaMoIrfQvrhMUf8tVma7g,5386
-vesta/scripts/cli.py,sha256=AtC7hxB3sMH984e65msO2-R0s4nkrzP09Aqd3OPwCes,8224
-vesta/scripts/initDB.py,sha256=TKaK4RZM6CycBEsHeGb9Q9PdphkQgaJDnEWhvRnGC9k,1659
+vesta/scripts/cli.py,sha256=8IHmL09-kzdp-FdqyFlO6cmgYKX5UcpdXdjQDXJpzHs,8257
+vesta/scripts/initDB.py,sha256=4o_J3IK0vcil2oHvk_qmtqLSlWABcRPFBC3M61-oSF8,1842
 vesta/scripts/install.py,sha256=GvH_HHx5aU5_54RQ1_2vz4DaLCh42AHfUKy-m0q21vY,2125
 vesta/scripts/testsRun.py,sha256=bXJImdexKQUDW8CR8F9VIKTrgkd7QfnvHQPENEV4x38,2463
 vesta/scripts/utils.py,sha256=PR2XPonaoZEbegzV3QX1EHfyq67sU-cbDEUexCuJp9Q,6013
-vesta_web-1.1.10.dist-info/METADATA,sha256=vFJSmvsrvfNqk0S14S5Gggw4xDVoZuUBZZueNNh9gTQ,1585
-vesta_web-1.1.10.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-vesta_web-1.1.10.dist-info/entry_points.txt,sha256=MHMrWJwtkb4FmNz0CTpxZzwQ3LTqndXBh8YBPDfXlW4,49
-vesta_web-1.1.10.dist-info/licenses/LICENSE.md,sha256=zoPFEFUUoSgosmDBK5fGTWGRHHBaSVuuJT2ZQIYXuIk,177
-vesta_web-1.1.10.dist-info/RECORD,,
+vesta_web-1.2.0.dist-info/METADATA,sha256=-Y1fT4y1JvrNFro0-AnUig48F5cAru500JpWkdsUy-0,1584
+vesta_web-1.2.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+vesta_web-1.2.0.dist-info/entry_points.txt,sha256=MHMrWJwtkb4FmNz0CTpxZzwQ3LTqndXBh8YBPDfXlW4,49
+vesta_web-1.2.0.dist-info/licenses/LICENSE.md,sha256=zoPFEFUUoSgosmDBK5fGTWGRHHBaSVuuJT2ZQIYXuIk,177
+vesta_web-1.2.0.dist-info/RECORD,,