From 5b0dcb23ea5eb0e46e65d78ee7646206efa92a7b Mon Sep 17 00:00:00 2001 From: Nikola Petrov Date: Mon, 22 Jul 2024 10:43:35 +0200 Subject: [PATCH] rename sys to environment and change the environment defenition files to be in environment dir --- environment/lin.cpp | 103 +++++++++++++ environment/win.cpp | 108 ++++++++++++++ include/{sys.hpp => environment.hpp} | 0 source/arg_func.cpp | 2 +- source/environment.cpp | 12 ++ source/func.cpp | 4 - source/main.cpp | 2 +- source/sys.cpp | 211 --------------------------- 8 files changed, 225 insertions(+), 217 deletions(-) create mode 100644 environment/lin.cpp create mode 100644 environment/win.cpp rename include/{sys.hpp => environment.hpp} (100%) create mode 100644 source/environment.cpp delete mode 100644 source/sys.cpp diff --git a/environment/lin.cpp b/environment/lin.cpp new file mode 100644 index 0000000..fc32a6b --- /dev/null +++ b/environment/lin.cpp @@ -0,0 +1,103 @@ +#include +#include +#include + +#include "environment.hpp" +#include "func.hpp" + +#include +#include +#include +#include + +bool put_data_on_clipboard(const char *text) +{ + size_t len = strlen(text); + if (len == 0) + { + printf("Text is empty\n"); + return false; + } + + // Open a pipe to xclip command + FILE *pipe = popen("xclip -selection clipboard", "w"); + if (!pipe) + { + printf("Failed to open pipe to xclip\n"); + return false; + } + + // Write text to xclip + if (fwrite(text, 1, len, pipe) != len) + { + printf("Failed to write text to xclip\n"); + pclose(pipe); + return false; + } + + // Close the pipe + pclose(pipe); + return true; +} + +std::string get_user_password() +{ + struct termios oldt, newt; + + // Save the current terminal attributes + tcgetattr(STDIN_FILENO, &oldt); + + // Copy the old settings to the new settings + newt = oldt; + + // Disable echo input + newt.c_lflag &= ~ECHO; + + // Apply the new settings + tcsetattr(STDIN_FILENO, TCSANOW, &newt); + + // Take input + std::string ipt; + std::getline(std::cin, ipt); + + // Otherwise next cout will print into the same line + std::cout << std::endl; + + // Restore the terminal attributes + tcsetattr(STDIN_FILENO, TCSANOW, &oldt); + + return ipt; +} + +std::optional get_save_path() +{ + namespace fs = std::filesystem; + + const char *homeDir = getenv("HOME"); + if (homeDir == nullptr) + { + return {}; + } + + fs::path userDirectory(homeDir); + userDirectory /= ".config"; + userDirectory /= "password_manager"; + + if (!fs::exists(userDirectory)) + { + // Directory doesn't exist, create it + if (!fs::create_directory(userDirectory)) + { + return {}; + } + } + else if (!fs::is_directory(userDirectory)) + { + // Path exists but is not a directory + return {}; + } + + userDirectory /= "save.txt"; + + return userDirectory.string(); +} \ No newline at end of file diff --git a/environment/win.cpp b/environment/win.cpp new file mode 100644 index 0000000..6a57652 --- /dev/null +++ b/environment/win.cpp @@ -0,0 +1,108 @@ +#include +#include +#include + +#include "environment.hpp" +#include "func.hpp" + +#include +#include + +bool put_data_on_clipboard(const char *text) +{ + size_t len = strlen(text); + if (len == 0) + { + printf_s("Text is empty\n"); + return false; + } + // Open the clipboard + if (!OpenClipboard(nullptr)) + { + printf_s("Failed to open clipboard"); + return false; + } + // Allocate global memory for the text + HGLOBAL hMem = GlobalAlloc(GMEM_MOVEABLE, strlen(text) + 1); + if (!hMem) + { + CloseClipboard(); + printf_s("Failed to allocate memory for text"); + return false; + } + // Copy the text to the allocated memory + char *memData = static_cast(GlobalLock(hMem)); + if (!memData) + { + CloseClipboard(); + printf_s("Failed to lock memory for text"); + return false; + } + strcpy_s(memData, strlen(text) + 1, text); + GlobalUnlock(hMem); + // Set the data to the clipboard + EmptyClipboard(); + SetClipboardData(CF_TEXT, hMem); + // Clean up and close the clipboard + CloseClipboard(); + return true; +} + +std::string get_user_password() +{ + + HANDLE hStdInput = GetStdHandle(STD_INPUT_HANDLE); + DWORD mode = 0; + + // Create a restore point Mode + // is know 503 + GetConsoleMode(hStdInput, &mode); + + // Enable echo input + // set to 499 + SetConsoleMode(hStdInput, mode & (~ENABLE_ECHO_INPUT)); + + // Take input + std::string ipt; + std::getline(std::cin, ipt); + + // Otherwise next cout will print + // into the same line + std::cout << std::endl; + + // Restore the mode + SetConsoleMode(hStdInput, mode); + + return ipt; +} + +std::optional get_save_path() +{ + namespace fs = std::filesystem; + const char *path = std::getenv("PROGRAMDATA"); + if (path == nullptr) + { + return {}; + } + + fs::path userDirectory(path); + userDirectory /= "password_manager"; + + if (!fs::exists(userDirectory)) + { + // Directory doesn't exist, create it + if (!fs::create_directory(userDirectory)) + { + return {}; + } + } + else if (!fs::is_directory(userDirectory)) + { + // Path exists but is not a directory + return {}; + } + + userDirectory /= "save.txt"; + + return userDirectory.string(); +} \ No newline at end of file diff --git a/include/sys.hpp b/include/environment.hpp similarity index 100% rename from include/sys.hpp rename to include/environment.hpp diff --git a/source/arg_func.cpp b/source/arg_func.cpp index e160184..527438e 100644 --- a/source/arg_func.cpp +++ b/source/arg_func.cpp @@ -9,7 +9,7 @@ #include "arg_func.hpp" #include "func.hpp" -#include "sys.hpp" +#include "environment.hpp" #include "func.hpp" #include "buffer.hpp" #include "aes256.hpp" diff --git a/source/environment.cpp b/source/environment.cpp new file mode 100644 index 0000000..7f2db24 --- /dev/null +++ b/source/environment.cpp @@ -0,0 +1,12 @@ + +#define GLOB_IMPLEMENTATION +#include "glob.hpp" + +#define CRYPTORAND_IMPLEMENTATION +#include "cryptorand.hpp" + +#ifdef _WIN32 +#include "../environment/win.cpp" +#else +#include "../environment/lin.cpp" +#endif \ No newline at end of file diff --git a/source/func.cpp b/source/func.cpp index c745b26..3eba584 100644 --- a/source/func.cpp +++ b/source/func.cpp @@ -2,11 +2,7 @@ #include "func.hpp" #include "buffer.hpp" - -#define GLOB_IMPLEMENTATION #include "glob.hpp" - -#define CRYPTORAND_IMPLEMENTATION #include "cryptorand.hpp" int find_logininfo_in_buffer(Buffer &buffer, const char *label) diff --git a/source/main.cpp b/source/main.cpp index 34d0d3f..48d6f40 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -2,7 +2,7 @@ #include #include -#include "sys.hpp" +#include "environment.hpp" #include "buffer.hpp" #include "aes256.hpp" #include "func.hpp" diff --git a/source/sys.cpp b/source/sys.cpp deleted file mode 100644 index 3e5ef68..0000000 --- a/source/sys.cpp +++ /dev/null @@ -1,211 +0,0 @@ -#include -#include -#include - -#include "sys.hpp" -#include "func.hpp" - -#ifdef _WIN32 - -#include -#include - -bool put_data_on_clipboard(const char *text) -{ - size_t len = strlen(text); - if (len == 0) - { - printf_s("Text is empty\n"); - return false; - } - // Open the clipboard - if (!OpenClipboard(nullptr)) - { - printf_s("Failed to open clipboard"); - return false; - } - // Allocate global memory for the text - HGLOBAL hMem = GlobalAlloc(GMEM_MOVEABLE, strlen(text) + 1); - if (!hMem) - { - CloseClipboard(); - printf_s("Failed to allocate memory for text"); - return false; - } - // Copy the text to the allocated memory - char *memData = static_cast(GlobalLock(hMem)); - if (!memData) - { - CloseClipboard(); - printf_s("Failed to lock memory for text"); - return false; - } - strcpy_s(memData, strlen(text) + 1, text); - GlobalUnlock(hMem); - // Set the data to the clipboard - EmptyClipboard(); - SetClipboardData(CF_TEXT, hMem); - // Clean up and close the clipboard - CloseClipboard(); - return true; -} - -std::string get_user_password() -{ - - HANDLE hStdInput = GetStdHandle(STD_INPUT_HANDLE); - DWORD mode = 0; - - // Create a restore point Mode - // is know 503 - GetConsoleMode(hStdInput, &mode); - - // Enable echo input - // set to 499 - SetConsoleMode(hStdInput, mode & (~ENABLE_ECHO_INPUT)); - - // Take input - std::string ipt; - std::getline(std::cin, ipt); - - // Otherwise next cout will print - // into the same line - std::cout << std::endl; - - // Restore the mode - SetConsoleMode(hStdInput, mode); - - return ipt; -} - -std::optional get_save_path() -{ - namespace fs = std::filesystem; - const char *path = std::getenv("PROGRAMDATA"); - if (path == nullptr) - { - return {}; - } - - fs::path userDirectory(path); - userDirectory /= "password_manager"; - - if (!fs::exists(userDirectory)) - { - // Directory doesn't exist, create it - if (!fs::create_directory(userDirectory)) - { - return {}; - } - } - else if (!fs::is_directory(userDirectory)) - { - // Path exists but is not a directory - return {}; - } - - userDirectory /= "save.txt"; - - return userDirectory.string(); -} - -#else - -#include -#include -#include -#include - -bool put_data_on_clipboard(const char *text) -{ - size_t len = strlen(text); - if (len == 0) - { - printf("Text is empty\n"); - return false; - } - - // Open a pipe to xclip command - FILE *pipe = popen("xclip -selection clipboard", "w"); - if (!pipe) - { - printf("Failed to open pipe to xclip\n"); - return false; - } - - // Write text to xclip - if (fwrite(text, 1, len, pipe) != len) - { - printf("Failed to write text to xclip\n"); - pclose(pipe); - return false; - } - - // Close the pipe - pclose(pipe); - return true; -} - -std::string get_user_password() -{ - struct termios oldt, newt; - - // Save the current terminal attributes - tcgetattr(STDIN_FILENO, &oldt); - - // Copy the old settings to the new settings - newt = oldt; - - // Disable echo input - newt.c_lflag &= ~ECHO; - - // Apply the new settings - tcsetattr(STDIN_FILENO, TCSANOW, &newt); - - // Take input - std::string ipt; - std::getline(std::cin, ipt); - - // Otherwise next cout will print into the same line - std::cout << std::endl; - - // Restore the terminal attributes - tcsetattr(STDIN_FILENO, TCSANOW, &oldt); - - return ipt; -} - -std::optional get_save_path() -{ - namespace fs = std::filesystem; - - const char *homeDir = getenv("HOME"); - if (homeDir == nullptr) - { - return {}; - } - - fs::path userDirectory(homeDir); - userDirectory /= ".config"; - userDirectory /= "password_manager"; - - if (!fs::exists(userDirectory)) - { - // Directory doesn't exist, create it - if (!fs::create_directory(userDirectory)) - { - return {}; - } - } - else if (!fs::is_directory(userDirectory)) - { - // Path exists but is not a directory - return {}; - } - - userDirectory /= "save.txt"; - - return userDirectory.string(); -} - -#endif \ No newline at end of file