vesta-web 1.1.3__py3-none-any.whl → 1.1.5__py3-none-any.whl

vesta/scripts/cli.py

@@ -203,9 +203,9 @@ def main():
             installer.createDB()
             installer.createUniauth()
             installer.initDB()
-        elif args.nginx_command == 'init':
+        elif args.db_command == 'init':
             installer.initDB()
-        elif args.nginx_command == 'reset':
+        elif args.db_command == 'reset':
             installer.resetDB()
         else:
             parser_db.print_help()

vesta/scripts/utils.py

@@ -89,7 +89,8 @@ class Installer:
 
     # -----------------__DB METHODS__----------------- #
     def initDB(self):
-        initializer = DBInitializer(path=self.PATH, configFile=self.PATH + "/server.ini", noStart=True)
+        initializer = DBInitializer(path=self.PATH, configFile="/server.ini", noStart=True)
+        self.uniauth = True
         if self.uniauth:
             initializer.initUniauth()
         initializer.initDB()
@@ -127,27 +128,29 @@ class DBInitializer(Server):
 
     def referenceUniauth(self):
         self.db.cur.execute("CREATE EXTENSION if not exists postgres_fdw;")
+        # using sql.SQL because we cant use %s inside OPTIONS
         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')
-            ))
+    CREATE SERVER IF NOT EXISTS uniauth
+    FOREIGN DATA WRAPPER postgres_fdw
+    OPTIONS (host {host}, port {port}, dbname {dbname});
+    """).format(
+                host=sql.Literal(self.config.get('UNIAUTH', 'DB_HOST')),
+                port=sql.Literal(self.config.get('UNIAUTH', 'DB_PORT')),
+                dbname=sql.Literal(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')
-            ))
+    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(
             """
             CREATE FOREIGN TABLE if not exists account (id bigserial NOT NULL)

{vesta_web-1.1.3.dist-info → vesta_web-1.1.5.dist-info}/METADATA

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

@@ -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=3vKp-imzaAxLHkOwFcNznQ8t9j3St9m0G6RJMpErJIc,8230
+vesta/scripts/cli.py,sha256=AtC7hxB3sMH984e65msO2-R0s4nkrzP09Aqd3OPwCes,8224
 vesta/scripts/initDB.py,sha256=TKaK4RZM6CycBEsHeGb9Q9PdphkQgaJDnEWhvRnGC9k,1659
 vesta/scripts/install.py,sha256=GvH_HHx5aU5_54RQ1_2vz4DaLCh42AHfUKy-m0q21vY,2125
 vesta/scripts/testsRun.py,sha256=bXJImdexKQUDW8CR8F9VIKTrgkd7QfnvHQPENEV4x38,2463
-vesta/scripts/utils.py,sha256=g5QKt1Xeezqf56m4ETLvYBhbZ82eg3qHRPKdjE6mjAQ,5860
-vesta_web-1.1.3.dist-info/METADATA,sha256=7EY_IDwbSTQEmK2TXoIcm6A5sCt9Bojo_dhDR6s_mcc,1584
-vesta_web-1.1.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-vesta_web-1.1.3.dist-info/entry_points.txt,sha256=MHMrWJwtkb4FmNz0CTpxZzwQ3LTqndXBh8YBPDfXlW4,49
-vesta_web-1.1.3.dist-info/licenses/LICENSE.md,sha256=zoPFEFUUoSgosmDBK5fGTWGRHHBaSVuuJT2ZQIYXuIk,177
-vesta_web-1.1.3.dist-info/RECORD,,
+vesta/scripts/utils.py,sha256=PR2XPonaoZEbegzV3QX1EHfyq67sU-cbDEUexCuJp9Q,6013
+vesta_web-1.1.5.dist-info/METADATA,sha256=FITHu0FmVWzp5CLDqXmzPgnQA02nUQ5twObyHu39m8w,1584
+vesta_web-1.1.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+vesta_web-1.1.5.dist-info/entry_points.txt,sha256=MHMrWJwtkb4FmNz0CTpxZzwQ3LTqndXBh8YBPDfXlW4,49
+vesta_web-1.1.5.dist-info/licenses/LICENSE.md,sha256=zoPFEFUUoSgosmDBK5fGTWGRHHBaSVuuJT2ZQIYXuIk,177
+vesta_web-1.1.5.dist-info/RECORD,,