Lew/LumberJack_TUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

General update during the refactoring process

Browse Source
This commit is contained in:
rapturate
2026-06-24 12:58:05 -04:00
parent 77ea44b03d
commit f4916f76a2
2 changed files with 91 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
log_parsing/log_parsing.cpp
+81 -57
View File
@@ -1,3 +1,5 @@
#include <algorithm>
#include <cstddef>
#include <cstdlib> #include <cstdlib>
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
@@ -11,72 +13,94 @@
#include "log_parsing.hpp" #include "log_parsing.hpp"
#include "../ip_to_geo/ip_to_geo.hpp" #include "../ip_to_geo/ip_to_geo.hpp"
p_logs::p_logs(std::string log_path) { p_logs::p_logs(std::string dir_path) {
if(log_path.empty()){ if(dir_path.empty()){
log_path = std::getenv("LOG_PATH"); const char* dir_val = std::getenv("LOG_PATH");
} if(dir_val != nullptr){
std::ifstream file(log_path); dir_path = dir_val;
if (!file.is_open()) { } else {
std::ofstream error_file("error.log", std::ios::app); std::ofstream error_file("error.log", std::ios::app);
if (error_file.is_open()) { if (error_file.is_open()) {
auto now = std::chrono::system_clock::now(); auto now = std::chrono::system_clock::now();
std::time_t now_time = std::chrono::system_clock::to_time_t(now); std::time_t now_time = std::chrono::system_clock::to_time_t(now);
error_file << "[" << std::put_time(std::localtime(&now_time), "%Y-%m-%d %H:%M:%S") << "] " error_file << "[" << std::put_time(std::localtime(&now_time), "%Y-%m-%d %H:%M:%S") << "] "
<< "Log file failed to load at: " << log_path << std::endl; << "Log files failed to load in: " << dir_path << std::endl;
error_file.close();
error_file.close(); }
} return;
return;
}
std::regex log_pattern(R"((\S+)\s+-\s+-\s+\[([^\]]+)\]\s+\"([^\"]+)\"\s+(\d+)\s+(\d+|-)\s+\"([^\"]*)\"\s+\"([^\"]*)\")");
std::string line;
std::smatch match;
while (getline(file, line)) {
if (regex_search(line, match, log_pattern)) {
Entry current_entry;
current_entry.ip = match[1].str();
current_entry.timestamp = match[2].str();
current_entry.request = match[3].str();
current_entry.status = match[4].str();
current_entry.bytes = match[5].str();
current_entry.referer = match[6].str();
std::string raw_ua = match[7].str();
if (raw_ua.find("Windows NT 10.0") != std::string::npos) current_entry.os = "Windows 10/11";
else if (raw_ua.find("Windows NT 6.1") != std::string::npos) current_entry.os = "Windows 7";
else if (raw_ua.find("iPhone") != std::string::npos) current_entry.os = "iOS (iPhone)";
else if (raw_ua.find("iPad") != std::string::npos) current_entry.os = "iOS (iPad)";
else if (raw_ua.find("Android") != std::string::npos) current_entry.os = "Android";
else if (raw_ua.find("Macintosh") != std::string::npos) current_entry.os = "macOS";
else if (raw_ua.find("Linux") != std::string::npos) current_entry.os = "Linux";
else current_entry.os = "Unknown OS";
if (raw_ua.find("Edg/") != std::string::npos) current_entry.browser = "Microsoft Edge";
else if (raw_ua.find("OPR/") != std::string::npos) current_entry.browser = "Opera";
else if (raw_ua.find("Chrome/") != std::string::npos) current_entry.browser = "Google Chrome";
else if (raw_ua.find("Safari/") != std::string::npos) current_entry.browser = "Apple Safari";
else if (raw_ua.find("Firefox/") != std::string::npos) current_entry.browser = "Mozilla Firefox";
else if (raw_ua.find("curl/") != std::string::npos) current_entry.browser = "curl (CLI Tool)";
else current_entry.browser = "Unknown Browser/Bot";
current_entry.location = iplookup(current_entry.ip);
logs.push_back(current_entry);
} }
} }
file.close();
for(const auto& log_path : p_logs::log_paths){
std::ifstream file(log_path);
if (!file.is_open()) {
std::ofstream error_file("error.log", std::ios::app);
if (error_file.is_open()) {
auto now = std::chrono::system_clock::now();
std::time_t now_time = std::chrono::system_clock::to_time_t(now);
error_file << "[" << std::put_time(std::localtime(&now_time), "%Y-%m-%d %H:%M:%S") << "] "
<< "Log file failed to load at: " << log_path << std::endl;
error_file.close();
}
continue;
}
std::regex log_pattern(R"((\S+)\s+-\s+-\s+\[([^\]]+)\]\s+\"([^\"]+)\"\s+(\d+)\s+(\d+|-)\s+\"([^\"]*)\"\s+\"([^\"]*)\")");
std::string line;
std::smatch match;
while (getline(file, line)) {
if (regex_search(line, match, log_pattern)) {
Entry current_entry;
current_entry.ip = match[1].str();
current_entry.timestamp = match[2].str();
current_entry.request = match[3].str();
current_entry.status = match[4].str();
current_entry.bytes = match[5].str();
current_entry.referer = match[6].str();
std::string raw_ua = match[7].str();
if (raw_ua.find("Windows NT 10.0") != std::string::npos) current_entry.os = "Windows 10/11";
else if (raw_ua.find("Windows NT 6.1") != std::string::npos) current_entry.os = "Windows 7";
else if (raw_ua.find("iPhone") != std::string::npos) current_entry.os = "iOS (iPhone)";
else if (raw_ua.find("iPad") != std::string::npos) current_entry.os = "iOS (iPad)";
else if (raw_ua.find("Android") != std::string::npos) current_entry.os = "Android";
else if (raw_ua.find("Macintosh") != std::string::npos) current_entry.os = "macOS";
else if (raw_ua.find("Linux") != std::string::npos) current_entry.os = "Linux";
else current_entry.os = "Unknown OS";
if (raw_ua.find("Edg/") != std::string::npos) current_entry.browser = "Microsoft Edge";
else if (raw_ua.find("OPR/") != std::string::npos) current_entry.browser = "Opera";
else if (raw_ua.find("Chrome/") != std::string::npos) current_entry.browser = "Google Chrome";
else if (raw_ua.find("Safari/") != std::string::npos) current_entry.browser = "Apple Safari";
else if (raw_ua.find("Firefox/") != std::string::npos) current_entry.browser = "Mozilla Firefox";
else if (raw_ua.find("curl/") != std::string::npos) current_entry.browser = "curl (CLI Tool)";
else current_entry.browser = "Unknown Browser/Bot";
current_entry.location = iplookup(current_entry.ip);
logs.push_back(current_entry);
}
}
file.close();
}
} }
std::vector<Entry> p_logs::get_all_logs(){ std::vector<Entry> p_logs::get_all_logs(){
return logs; return logs;
} }
std::vector<std::filesystem::path> p_logs::get_log_paths(){
return log_paths;
}
std::string p_logs::entryx_ip(int x){ std::string p_logs::entryx_ip(int x){
return logs[x].ip; return logs[x].ip;
} }
log_parsing/log_parsing.hpp
+10 -2
View File
@@ -10,6 +10,7 @@
*/ */
#pragma once #pragma once
#include <filesystem>
#include <string> #include <string>
#include <vector> #include <vector>
#include "../ip_to_geo/ip_to_geo.hpp" #include "../ip_to_geo/ip_to_geo.hpp"
@@ -30,17 +31,24 @@ class p_logs {
private: private:
Entry entry; Entry entry;
std::vector<Entry> logs; std::vector<Entry> logs;
std::string url; std::vector<std::filesystem::path> log_paths;
public: public:
/** /**
* @brief Construct a new parsed logs object * @brief Construct a new parsed logs object
* Detailed explanation: This function takes in the absolute path to a .log file and parses the lines into individual "Entry"s. These Entrys are then stored into a vector that can then be accessed via getter functions. * Detailed explanation: This function takes in the path to the access log directory parses the lines into individual "Entry"s. These Entrys are then stored into a vector that can then be accessed via getter functions.
* @param string * @param string
*/ */
p_logs(std::string); p_logs(std::string);
std::vector<Entry> get_all_logs(); std::vector<Entry> get_all_logs();
/**
* @brief Get the log paths object
* Detailed explanation: This function returns all of the paths to the log files in the user provided directory.
* @return std::vector<std::filesystem::path>
*/
std::vector<std::filesystem::path> get_log_paths();
/** /**
* @brief Getter function for a specific Entry's IP * @brief Getter function for a specific Entry's IP
* *