vesta-web 1.1.1__py3-none-any.whl → 1.1.2__py3-none-any.whl

vesta/db/db_service.py

@@ -152,7 +152,7 @@ class DB:
             else:
                 return []
         except Exception as e:
-            print(f"[VESTA] An error occurred with the db: {e}")
+            print(f"[VESTA] An error occurred with the db in getFilters: {e}")
             self.conn.rollback()
 
     def insertDict(self, table, dict, getId=False):
@@ -194,8 +194,15 @@ class DB:
         self.conn.commit()
 
     def resetTable(self, table):
-        sql_str = """delete from {} cascade;ALTER SEQUENCE {} RESTART WITH 1""".format(table, table + "_id_seq")
-        self.cur.execute(sql_str)
+        # Use SQL identifiers to prevent SQL injection
+        self.cur.execute(
+            sql.SQL("DELETE FROM {} CASCADE").format(sql.Identifier(table))
+        )
+        self.cur.execute(
+            sql.SQL("ALTER SEQUENCE {} RESTART WITH 1").format(
+                sql.Identifier(table + "_id_seq")
+            )
+        )
         self.conn.commit()
 
     def edit(self, table, id, element, value, selector='id'):

vesta/emptyProject/.gitlab-ci.yml

@@ -8,5 +8,4 @@ test:
     - python -m venv venv
     - source venv/bin/activate
     - pip install -r requirements.txt
-    - pip install git+https://gitlab.com/Louciole/vesta.git/
     - vesta test

vesta/emptyProject/requirements.txt

@@ -0,0 +1 @@
+vesta-web

vesta/http/baseServer.py

@@ -116,7 +116,7 @@ class BaseServer:
             query = re.split(RE_URL, environ['QUERY_STRING'])
             for i in range(0, len(query)):
                 query[i] = re.split(RE_PARAM, query[i])
-                args[query[i][0]] = urllib.parse.unquote(query[i][1])
+                args[query[i][0]] = urllib.parse.unquote_plus(query[i][1], encoding='utf-8')
         if content_type[0] == "multipart/form-data":
             length = int(environ.get('CONTENT_LENGTH'))
             body = environ['wsgi.input'].read(length)

vesta/http/response.py

@@ -7,7 +7,17 @@ class Response:
     def __init__(self, start_response, code=200, type="html"):
         self.cookies = {}
         self.type = type
-        self.headers = [('Content-Type', 'text/' + type),('Cache-Control', 'no-cache'), ('Server', 'mag v1 Harpie')]
+        self.headers = [
+            ('Content-Type', 'text/' + type + '; charset=utf-8'),
+            ('Cache-Control', 'no-cache'),
+            ('Server', 'Vesta v1 Harpie'),
+            # Security headers
+            ('X-Content-Type-Options', 'nosniff'),
+            ('X-Frame-Options', 'DENY'),
+            ('X-XSS-Protection', '1; mode=block'),
+            ('Referrer-Policy', 'strict-origin-when-cross-origin'),
+            ('Permissions-Policy', 'geolocation=(), microphone=(), camera=()')
+        ]
         self.code = code
         self.start_response = start_response
         self.content = ""
@@ -16,21 +26,21 @@ class Response:
         if self.code != 200 and self.code != 302:
             if self.code in self.ERROR_PAGES.keys():
                 self.type = "html"
-                self.headers = [('Content-Type', 'text/html')]
+                self.headers = [('Content-Type', 'text/html; charset=utf-8')]
                 file = open(self.ERROR_PAGES[self.code])
                 self.content = file.read()
                 file.close()
             else:
                 self.type = "plain"
-                self.headers = [('Content-Type', 'text/plain')]
+                self.headers = [('Content-Type', 'text/plain; charset=utf-8')]
         self.start_response(self.CODES.get(self.code, "500 UNEXPECTED"), self.headers)
 
     def encode(self):
         # print("[INFO] encoding response : ", self.content)
 
         if self.type == "plain":
-            return (self.CODES[self.code] + " " + self.content).encode()
-        return str(self.content).encode()
+            return (self.CODES[self.code] + " " + self.content).encode('utf-8')
+        return str(self.content).encode('utf-8')
 
     def set_cookie(self, name, value, exp=None, samesite=None, secure=False, httponly=False):
         """Set a response cookie for the client.

vesta/mailing/mailing_service.py

@@ -103,15 +103,16 @@ class Mailing:
         self.sendMail(mail_confirmation)
 
     def sendOrgInvite(self, target, company):
-        try:
-            self.template_org_invitation
-        except:
-            f = open(self.path + "/mailing/mailInvite.html", "r")
-            self.template_org_invitation = f.read()
-            f.close()
-            self.mail_invitation = MIMEMultipart('alternative')
-            self.mail_invitation['Subject'] = "🔔 Rejoignez " + company + " 🔔"
-            self.mail_invitation['From'] = self.name + " <" + self.address + ">"
+        if not hasattr(self, 'template_org_invitation'):
+            try:
+                with open(self.path + "/mailing/mailInvite.html", "r") as f:
+                    self.template_org_invitation = f.read()
+                self.mail_invitation = MIMEMultipart('alternative')
+                self.mail_invitation['Subject'] = "🔔 Rejoignez " + company + " 🔔"
+                self.mail_invitation['From'] = self.name + " <" + self.address + ">"
+            except (FileNotFoundError, IOError) as e:
+                print(f"[Vesta - mails] Error loading org invitation template: {e}")
+                raise
 
         self.mail_invitation['Message-ID'] = email.utils.make_msgid(domain='carbonlab.dev')
         self.mail_invitation['Date'] = email.utils.formatdate()

vesta/scripts/initDB.py

@@ -22,20 +22,22 @@ class DBInitializer(Server):
             sql.SQL("""
             CREATE SERVER if not exists uniauth
             FOREIGN DATA WRAPPER postgres_fdw
-            OPTIONS (host {}, port {}, dbname {});
-            """).format(
-                sql.Literal(self.config.get('UNIAUTH', 'DB_HOST')),
-                sql.Literal(self.config.get('UNIAUTH', 'DB_PORT')),
-                sql.Literal(self.config.get('UNIAUTH', 'DB_NAME'))
+            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');
-            """).format(
-                sql.Literal(self.config.get('DB', 'DB_USER')),
-                sql.Literal(self.config.get('DB', 'DB_PASSWORD'))
+            OPTIONS (user %s, password %s);
+            """),
+            (
+                self.config.get('DB', 'DB_USER'),
+                self.config.get('DB', 'DB_PASSWORD')
             ))
         self.db.cur.execute(
             """

vesta/scripts/testsRun.py

@@ -20,14 +20,16 @@ def run_file(file_path):
     # Look for a 'run' function within the module (assuming tests are run from this function)
     if hasattr(test_module, 'run'):
         try:
+            count = (0,0)
             result = test_module.run()
             for res in result:
                 if res[1] == False:
+                    count = (count[0],count[1]+1)
                     print(Fore.RED +f"FAILED: '{res[0]}' @{readable_path}")
-                    return False
                 else:
+                    count = (count[0]+1,count[1]+1)
                     print(Fore.GREEN +f"PASSED: '{res[0]}' @{readable_path}")
-                    return True
+            return count
         except Exception as e:
             print(f"Error running test file '{readable_path}': {e}")
     else:
@@ -45,10 +47,8 @@ def run_folder(folder):
             if file.endswith('.py'):
                 file_path = os.path.join(root, file)
                 res = run_file(file_path)
-                if res == True:
-                    counter = (counter[0]+1,counter[1]+1)
-                elif res == False:
-                    counter = (counter[0],counter[1]+1)
+                if res:
+                    counter = (counter[0] + res[0], counter[1] + res[1])
 
     return counter
 

{vesta_web-1.1.1.dist-info → vesta_web-1.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vesta-web
-Version: 1.1.1
+Version: 1.1.2
 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.1.dist-info → vesta_web-1.1.2.dist-info}/RECORD

@@ -1,13 +1,13 @@
 vesta/__init__.py,sha256=6aOfxktSRs50uhCMF-473xwmK9Z15uFfvoRXZN2cMos,17865
 vesta/db/UNIAUTH.sql,sha256=Aroke4pBNrvOh2wZlA09--awCs17BdsyymSVEgLtjDQ,1985
-vesta/db/db_service.py,sha256=TIovohU6VjAHAudIWk7aBePPqEVqpy7eR_7-MWg7Mgo,9860
+vesta/db/db_service.py,sha256=E2r6LxxycMOBtpUXWbVIge_363QUCOIJg-MK-Z5dzmw,10058
 vesta/emptyProject/.gitignore,sha256=9ImxEbKZYcw6fZv2coknCwBdmfY7xWkrOgfBWR03VG0,206
-vesta/emptyProject/.gitlab-ci.yml,sha256=y-UMgAb0CVntqhCkh_iWXe3mXzdBmTpmlN-J51vrLEo,371
+vesta/emptyProject/.gitlab-ci.yml,sha256=N3XrdO2CWlAoTOzaX6Gh_vaPRyUdr78Sc9OdKTOnFGQ,310
 vesta/emptyProject/CONTRIBUTING.md,sha256=kSyO3LxwWrt7i8qmH8IDt0x4y4u18r5u5OvbuoYzMlU,1449
 vesta/emptyProject/LICENSE.md,sha256=a3dZ32blcDksEC_UGru2vhpuD_JmxXWh4-VMhT1InkQ,644
 vesta/emptyProject/README.md,sha256=fWesqkMlQPxo3FPl4jFL4RBwbCeTPoyLhUwRBQlV-hM,937
 vesta/emptyProject/install.sh,sha256=0c3pug86_XfA3wF0atXVTAgjLDG35D_TDW0daE12ejs,663
-vesta/emptyProject/requirements.txt,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+vesta/emptyProject/requirements.txt,sha256=ow0jU_n0A4ZAtezF_4okmgqEOur6TSDp845UPXzbtZI,9
 vesta/emptyProject/server_static.ini,sha256=Bzuqbh_6GU_bqGsEVlw3DQSizQYnaRn-pGshRjsKT2k,86
 vesta/emptyProject/server_static.py,sha256=SHtoQcv4QZxXUDe58gJYHy0Ghitojl4mSKEOugEVvnQ,329
 vesta/emptyProject/server_static_orm.ini,sha256=uXF3jcl8rVEDPrU-NvYLKdgOF_1pHbDqoXf1FI46C0U,195
@@ -45,18 +45,18 @@ vesta/emptyProject/static/translations/fr.mjs,sha256=ouMluPVTgB4Q5vmb7zGE6YGTH4U
 vesta/emptyProject/static/translations/translation.mjs,sha256=JxJ2peSlYVQK-bUKpfddPLXm0XZiz2yu6A6iWIqpKyM,1422
 vesta/emptyProject/static/ws/onMessage.mjs,sha256=ow5nwSEdiBcvm-Y2zOUMhnqLp-5xWgo11kHviaTRlTw,658
 vesta/emptyProject/tests/example/foo.py,sha256=NS9oIXFBOvIyWK1LHwkJm9amJuSMN4cxJwouBrJlh2I,115
-vesta/http/baseServer.py,sha256=e7cq9xUTVCz3h0W7H3AaIxrz0dUTp_fU6wE2TvjrIJA,8289
+vesta/http/baseServer.py,sha256=7jN0y1SpIRWE9ohzT8IlehTbzy3ofqrOPeKA4vKOC1k,8312
 vesta/http/error.py,sha256=fWdp-oI2ObJD2mHHuxs1yVJvhON5oHYgYFRLAcUMs-I,180
 vesta/http/redirect.py,sha256=OiDeOmU-X5Mos8a0BQIeOIJqvgWjDEtaYrM4-x4MXl0,177
-vesta/http/response.py,sha256=OLcqq7X9lDyNyJ4xoTOK2zPizr6Lg71_QQPDNnfFliU,3325
-vesta/mailing/mailing_service.py,sha256=BfJ_z5mcJiECPFzUR49MJmHZc4VX_Zavdd_b-lwmW14,5212
-vesta/scripts/initDB.py,sha256=RhiWOs3tMBf6cQ8Ks8NRW-c6Z8pduGMY6OwojbPvbxU,1714
+vesta/http/response.py,sha256=G7cmbrXFNbIbQoqNxNkR06I5VymIwjFSAe3LtVa56Ok,3760
+vesta/mailing/mailing_service.py,sha256=GBO5Hnspm9Pqwd5kGB0iekZaMoIrfQvrhMUf8tVma7g,5386
+vesta/scripts/cli.py,sha256=xfY-dVzPAbJdmgpRJoGGNSlSXDsMyrQPwykAK017YqE,7506
+vesta/scripts/initDB.py,sha256=TKaK4RZM6CycBEsHeGb9Q9PdphkQgaJDnEWhvRnGC9k,1659
 vesta/scripts/install.py,sha256=GvH_HHx5aU5_54RQ1_2vz4DaLCh42AHfUKy-m0q21vY,2125
-vesta/scripts/testsRun.py,sha256=PQkxKyCwM-TGu9KbLSIkz70o5jnGQSf5aFN9Gil3_1U,2459
+vesta/scripts/testsRun.py,sha256=bXJImdexKQUDW8CR8F9VIKTrgkd7QfnvHQPENEV4x38,2463
 vesta/scripts/utils.py,sha256=MQZ29b4eplF0OR9EimUToOO73CVoV_cTxQeez2F3OoY,3460
-vesta/scripts/vesta.py,sha256=xfY-dVzPAbJdmgpRJoGGNSlSXDsMyrQPwykAK017YqE,7506
-vesta_web-1.1.1.dist-info/METADATA,sha256=avBj6zSXwT0FDvjBkpk36sMrjF2hLChFn8-TEB_4RC0,1558
-vesta_web-1.1.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-vesta_web-1.1.1.dist-info/entry_points.txt,sha256=_x509HUdPeKL_Fja0OqUuDa8zKGeLndMxIE_IfojlJg,51
-vesta_web-1.1.1.dist-info/licenses/LICENSE.md,sha256=zoPFEFUUoSgosmDBK5fGTWGRHHBaSVuuJT2ZQIYXuIk,177
-vesta_web-1.1.1.dist-info/RECORD,,
+vesta_web-1.1.2.dist-info/METADATA,sha256=F1vBrwheV7MlW4UmsKMehblxF1Cleqk1LkNObRJvgU8,1558
+vesta_web-1.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+vesta_web-1.1.2.dist-info/entry_points.txt,sha256=MHMrWJwtkb4FmNz0CTpxZzwQ3LTqndXBh8YBPDfXlW4,49
+vesta_web-1.1.2.dist-info/licenses/LICENSE.md,sha256=zoPFEFUUoSgosmDBK5fGTWGRHHBaSVuuJT2ZQIYXuIk,177
+vesta_web-1.1.2.dist-info/RECORD,,

vesta_web-1.1.2.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+vesta = vesta.scripts.cli:main

vesta_web-1.1.1.dist-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-vesta = vesta.scripts.vesta:main