From 8ebca780cd366923f5b2564b6cc8323847feb0db Mon Sep 17 00:00:00 2001 From: Nikola Petrov Date: Mon, 28 Aug 2023 00:35:49 +0200 Subject: [PATCH] arg_generate and input --- Password_manager/include/arg_func.h | 4 +- Password_manager/source/arg_func.cpp | 60 +++++++++++++--------------- 2 files changed, 29 insertions(+), 35 deletions(-) diff --git a/Password_manager/include/arg_func.h b/Password_manager/include/arg_func.h index 20cbfeb..d671697 100644 --- a/Password_manager/include/arg_func.h +++ b/Password_manager/include/arg_func.h @@ -19,13 +19,11 @@ enum class Arg Error // error }; -void print_args(); - Arg get_args(int argc, char** argv, char** label); std::optional arg_get(Buffer& decrypted_buffer, const char* label); -std::optional arg_generate(Buffer& decrypted_buffer, Buffer& encrypted_buffer, const char* label, Cryptography& crypto); +LoginInfoPointer arg_generate(Buffer& decrypted_buffer, Buffer& encrypted_buffer, const char* label, Cryptography& crypto); std::optional arg_input(Buffer& decrypted_buffer, Buffer& encrypted_buffer, const char* label, Cryptography& crypto); diff --git a/Password_manager/source/arg_func.cpp b/Password_manager/source/arg_func.cpp index 3836379..fee11a6 100644 --- a/Password_manager/source/arg_func.cpp +++ b/Password_manager/source/arg_func.cpp @@ -76,29 +76,8 @@ std::string get_user_string() { return ret; } -std::optional arg_generate(Buffer& decrypted_buffer, Buffer& encrypted_buffer, const char* label, Cryptography& crypto) +LoginInfoPointer save(Buffer& decrypted_buffer, Buffer& encrypted_buffer, const char* label, Cryptography& crypto, std::string& username, std::string& password) { - std::string username = get_user_string(); - - int default_length = 15; - printf_s("Input password length [%d]:", default_length); - std::string input; - int length = default_length; - - std::getline(std::cin, input); - - - if (!input.empty()) - { - std::istringstream iss(input); - if (!(iss >> length)) length = default_length; - } - - printf_s("Generating password for %s\n", label); - - std::string password; - generate_password(password, length); - int pass = find_logininfo_in_buffer(decrypted_buffer, label); if (pass >= 0) delete_logininfo_from_buffer(decrypted_buffer, pass); @@ -109,27 +88,44 @@ std::optional arg_generate(Buffer& decrypted_buffer, Buffer& e return get_logininfo_pointer_from_buffer(decrypted_buffer, index->count - 1); } +LoginInfoPointer arg_generate(Buffer& decrypted_buffer, Buffer& encrypted_buffer, const char* label, Cryptography& crypto) +{ + printf_s("Generating password for %s\n", label); + + std::string username = get_user_string(); + + int default_length = 15; + printf_s("Input password length [%d]:", default_length); + std::string input; + int length = default_length; + + std::getline(std::cin, input); + if (!input.empty()) + { + std::istringstream iss(input); + if (!(iss >> length)) length = default_length; + } + + std::string password; + generate_password(password, length); + + return save(decrypted_buffer, encrypted_buffer, label, crypto, username, password); +} + std::optional arg_input(Buffer& decrypted_buffer, Buffer& encrypted_buffer, const char* label, Cryptography& crypto) { std::string username = get_user_string(); printf_s("Input password for %s:", label); - std::string new_string = get_user_password(); - if (new_string.empty()) + std::string password = get_user_password(); + if (password.empty()) { printf_s("error getting password\n"); return {}; } - int pass = find_logininfo_in_buffer(decrypted_buffer, label); - if (pass >= 0) delete_logininfo_from_buffer(decrypted_buffer, pass); - - add_logininfo_to_buffer(decrypted_buffer, label, username.c_str(), new_string.c_str()); - crypto.encrypt(&decrypted_buffer, &encrypted_buffer); - encrypted_buffer.save_to_file(); - Index* index = (Index*)decrypted_buffer.buffer; - return get_logininfo_pointer_from_buffer(decrypted_buffer, index->count - 1); + return save(decrypted_buffer, encrypted_buffer, label, crypto, username, password); } void arg_list(Buffer& decrypted_buffer)