Add password salting and minor corrections (#6)

Author: Liiizak

.github/workflows/ci.yml

@@ -34,7 +34,7 @@ jobs:
           - name: Reuse ccache directory
             uses: actions/cache@v4
             with:
-                path: ~/.ccache
+                path: ~/.cache/ccache
                 key: '${{matrix.os}} ${{matrix.info}} ccache-dir ${{github.ref}} run-${{github.run_number}}'
                 restore-keys: |
                     ${{matrix.os}} ${{matrix.info}} ccache-dir ${{github.ref}} run-'

.gitignore

@@ -8,5 +8,4 @@ compile_commands.json
 .ccache/
 cmake-build-*
 Testing/
-configs/static_config.yaml
 .DS_Store

CMakeLists.txt

@@ -97,6 +97,8 @@ add_library(${PROJECT_NAME}_objs OBJECT
 		src/validators/user_validators.cpp
 		src/validators/length_validator.hpp
 		src/validators/length_validator.cpp
+		src/utils/random.hpp
+		src/utils/random.cpp
 		src/utils/errors.hpp
 		src/utils/errors.cpp
 		src/utils/make_error.hpp
@@ -142,7 +144,6 @@ add_google_tests(${PROJECT_NAME}_unittest)
 # Functional Tests
 add_subdirectory(tests)
 
-
 # Install
 include(GNUInstallDirs)
 
@@ -152,12 +153,8 @@ if(DEFINED ENV{PREFIX})
     set(CMAKE_INSTALL_PREFIX ${PREFIX_PATH})
 endif()
 
-set(CONFIG_VAR_PATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/${PROJECT_NAME}/config_vars.yaml)
-set(CONFIG_FALLBACK_PATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/${PROJECT_NAME}/dynamic_config_fallback.json)
 set(CONFIG_JWT ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/${PROJECT_NAME}/jwt_config.json)
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configs/static_config.yaml.in ${CMAKE_CURRENT_SOURCE_DIR}/configs/static_config.yaml)
-
 file(GLOB CONFIGS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/configs/*.yaml ${CMAKE_CURRENT_SOURCE_DIR}/configs/*.json)
 
 install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${PROJECT_NAME})

configs/dynamic_config_fallback.json

@@ -1,7 +1,3 @@
-# yaml
-
-config_vars: @CONFIG_VAR_PATH@
-
 components_manager:
     coro_pool:
         initial_size: 500             # Preallocate 500 coroutines at startup.

configs/static_config.yaml.in configs/static_config.yamlconfigs/static_config.yaml.in renamed to configs/static_config.yaml

@@ -9,6 +9,7 @@ CREATE TABLE IF NOT EXISTS real_medium.users(
         bio text,
         image varchar(255),
         password_hash varchar(255) NOT NULL,
+        salt varchar(255) NOT NULL,
         CONSTRAINT uniq_username UNIQUE (username),
         CONSTRAINT uniq_email UNIQUE (email)
 );
@@ -77,7 +78,8 @@ CREATE TYPE real_medium.user AS (
         email text,
         bio TEXT,
         image VARCHAR(255),
-        password_hash TEXT
+        password_hash TEXT,
+        salt TEXT
 );
 
 CREATE TYPE real_medium.full_article_info AS (

postgresql/schemas/db-1.sql

@@ -5,8 +5,8 @@
 namespace real_medium::sql {
 
 inline constexpr std::string_view kInsertUser = R"~(
-INSERT INTO real_medium.users(username, email, password_hash)
-VALUES($1, $2, $3)
+INSERT INTO real_medium.users(username, email, password_hash, salt)
+VALUES($1, $2, $3, $4)
 RETURNING *
 )~";
 
@@ -21,7 +21,8 @@ UPDATE real_medium.users SET
   email = COALESCE($3, email),
   bio = COALESCE($4, bio),
   image = COALESCE($5, image),
-  password_hash = COALESCE($6, password_hash)
+  password_hash = COALESCE($6, password_hash),
+  salt = COALESCE($7, salt)
 WHERE user_id = $1
 RETURNING *
 )~";
@@ -111,6 +112,10 @@ SELECT profile.username, profile.bio, profile.image,
 FROM profile
 )~";
 
+inline constexpr std::string_view kGetSaltByEmail = R"~(
+SELECT salt FROM real_medium.users WHERE email = $1
+)~";
+
 inline constexpr std::string_view KFollowingUser = R"~(
 WITH profile AS (
   SELECT * FROM real_medium.users WHERE user_id = $1
@@ -235,7 +240,7 @@ SELECT a.article_id AS articleId,
               FROM real_medium.followers fl
               WHERE fl.followed_user_id = a.user_id
        ) AS author_followed_by_user_ids,
-       ROW(u.user_id, u.username, u.email, u.bio, u.image, u.password_hash)::real_medium.user AS author_info
+       ROW(u.user_id, u.username, u.email, u.bio, u.image, u.password_hash, u.salt)::real_medium.user AS author_info
 FROM real_medium.articles a
 JOIN real_medium.users u ON a.user_id = u.user_id
 )~"};
@@ -247,7 +252,7 @@ SELECT c.comment_id,
        c.body,
        c.user_id,
        a.slug,
-       ROW(u.user_id, u.username, u.email, u.bio, u.image, u.password_hash)::real_medium.user AS author_info,
+       ROW(u.user_id, u.username, u.email, u.bio, u.image, u.password_hash, u.salt)::real_medium.user AS author_info,
             ARRAY(
     SELECT follower_user_id
     FROM real_medium.followers fl

src/db/sql.hpp

@@ -18,7 +18,7 @@ userver::formats::json::Value Handler::HandleRequestJsonThrow(
     const userver::formats::json::Value& /*request_json*/,
     userver::server::request::RequestContext& context) const {
   auto user_id = context.GetData<std::optional<std::string>>("id");
-  const auto& comment_id = std::atoi(request.GetPathArg("id").c_str());
+  const auto& comment_id = userver::utils::FromString<int, std::string>(request.GetPathArg("id"));
   const auto& slug = request.GetPathArg("slug");
 
   const auto result_find_comment = pg_cluster_->Execute(

src/handlers/comments/comment_delete.cpp

@@ -4,6 +4,7 @@
 #include <fmt/format.h>
 #include <string>
 #include <string_view>
+#include <userver/utils/from_string.hpp>
 
 #include "userver/server/handlers/http_handler_base.hpp"
 #include "userver/server/handlers/http_handler_json_base.hpp"

src/handlers/comments/comment_delete.hpp

@@ -10,7 +10,6 @@
 #include "userver/storages/postgres/cluster.hpp"
 #include "userver/storages/postgres/component.hpp"
 
-using namespace std;
 using namespace userver::formats;
 using namespace userver::server::http;
 using namespace userver::server::request;