Hashed password, adaugat .env file in arhiva, mutat partea de psql in…

… script separat

.github/actions/configure-PostgreSQL/action.yml

@@ -9,13 +9,15 @@ runs:
       if: runner.os == 'Linux'
       run: |        
         sudo systemctl start postgresql.service
+        sudo -u postgres bash ./scripts/configure_postgres.sh
 
     - name: Start MacOS PostgreSQL service
       shell: bash
       if: runner.os == 'macOS'
       run: |
         brew install postgresql
         brew services start postgresql@14
+        bash ./scripts/configure_postgres.sh
 
     - name: Start Windows PostgreSQL service
       shell: bash
@@ -26,9 +28,4 @@ runs:
         net start $serviceName
         export PGPASSWORD="root"
         export PATH="$PATH:/c/Program Files/PostgreSQL/14/bin:/c/Program Files/PostgreSQL/14/lib"
-
-    - name: Create Database
-      shell: bash
-      run: |
-        psql postgres -c "CREATE USER $DATABASE_USER WITH CREATEDB PASSWORD '${DATABASE_PASSWORD}';"
-        psql postgres -c "CREATE DATABASE $DATABASE_NAME WITH OWNER $DATABASE_USER;"
+        bash ./scripts/configure_postgres.sh

CMakeLists.txt

@@ -86,5 +86,6 @@ endif()
 
 include(cmake/CopyHelper.cmake)
 copy_files(FILES tastatura.txt COPY_TO_DESTINATION TARGET_NAME ${MAIN_EXECUTABLE_NAME})
+copy_files(FILES .env COPY_TO_DESTINATION TARGET_NAME ${MAIN_EXECUTABLE_NAME})
 # copy_files(FILES tastatura.txt config.json DIRECTORY images sounds COPY_TO_DESTINATION TARGET_NAME ${MAIN_EXECUTABLE_NAME})
 # copy_files(DIRECTORY images sounds COPY_TO_DESTINATION TARGET_NAME ${MAIN_EXECUTABLE_NAME})

database/Database.cpp

@@ -3,7 +3,6 @@
 
 Database::Database(const bool& withDropTables) {
     setConnectionString();
-    connString = "dbname=oop_db user=oop password=ooppa55 hostaddr=127.0.0.1 port=5432 connect_timeout=10";
     connection = std::make_unique<pqxx::connection>(connString);
     if (!connection->is_open())
         throw std::runtime_error("Database exists but a connection couldn't be established");
@@ -30,7 +29,7 @@ void Database::createTables(){
         CREATE TABLE IF NOT EXISTS USERS (
                 id SERIAL PRIMARY KEY,
                 name VARCHAR(20) NOT NULL,
-                password VARCHAR(20) NOT NULL
+                password VARCHAR(255) NOT NULL
         )
     )";
 
@@ -50,8 +49,11 @@ void Database::dropTables(){
 
 void Database::addUser(std::string name, std::string password) {
     pqxx::work transaction(*connection);
+    std::string hashQuery = "SELECT crypt($1, gen_salt('bf')) AS hashed_password;";
+    pqxx::result hashResult = transaction.exec_params(hashQuery,password);
+    std::string hashedPassword = hashResult[0]["hashed_password"].c_str();
     std::string insertUserQuery = "INSERT INTO USERS (name, password) VALUES ($1, $2);";
-    transaction.exec_params(insertUserQuery, name, password);
+    transaction.exec_params(insertUserQuery, name, hashedPassword);
     transaction.commit();
 }
 

scripts/configure_postgres.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/bash
+
+psql -h 127.0.0.1 -U postgres -c "CREATE USER $DATABASE_USER WITH CREATEDB PASSWORD '$DATABASE_PASSWORD';"
+psql -h 127.0.0.1 -U postgres -c "CREATE DATABASE $DATABASE_NAME WITH OWNER $DATABASE_USER;"
+psql -h 127.0.0.1 -U postgres -d $DATABASE_NAME -c "CREATE EXTENSION IF NOT EXISTS pgcrypto;"