Refactoring to a better file structure

This commit is contained in:
rapturate
2026-05-22 16:17:14 -04:00
parent 3ecc1a9176
commit fc67b944d7
6 changed files with 102 additions and 81 deletions

0
ip_to_geo/ip_to_geo.cpp Normal file
View File

0
ip_to_geo/ip_to_geo.h Normal file
View File

View File

@@ -0,0 +1,65 @@
#include <cstdlib>
#include <iostream>
#include <fstream>
#include <ostream>
#include <string>
#include <vector>
#include <regex>
#include "log_parsing.h"
parse::parse(const std::smatch& match) {
Entry entry;
entry.ip = match[1].str();
entry.timestamp = match[2].str();
entry.request = match[3].str();
entry.status = match[4].str();
entry.bytes = match[5].str();
entry.referer = match[6].str();
std::string raw_ua = match[7].str();
if (raw_ua.find("Windows NT 10.0") != std::string::npos) entry.os = "Windows 10/11";
else if (raw_ua.find("Windows NT 6.1") != std::string::npos) entry.os = "Windows 7";
else if (raw_ua.find("iPhone") != std::string::npos) entry.os = "iOS (iPhone)";
else if (raw_ua.find("iPad") != std::string::npos) entry.os = "iOS (iPad)";
else if (raw_ua.find("Android") != std::string::npos) entry.os = "Android";
else if (raw_ua.find("Macintosh") != std::string::npos) entry.os = "macOS";
else if (raw_ua.find("Linux") != std::string::npos) entry.os = "Linux";
else entry.os = "Unknown OS";
if (raw_ua.find("Edg/") != std::string::npos) entry.browser = "Microsoft Edge";
else if (raw_ua.find("OPR/") != std::string::npos) entry.browser = "Opera";
else if (raw_ua.find("Chrome/") != std::string::npos) entry.browser = "Google Chrome";
else if (raw_ua.find("Safari/") != std::string::npos) entry.browser = "Apple Safari";
else if (raw_ua.find("Firefox/") != std::string::npos) entry.browser = "Mozilla Firefox";
else if (raw_ua.find("curl/") != std::string::npos) entry.browser = "curl (CLI Tool)";
else entry.browser = "Unknown Browser/Bot";
}
std::vector<parse> parse_file(std::string log_url) {
std::ifstream file(log_url);
if(!file.is_open()) {
std::cerr << "Error loading " << log_url << std::endl;
EXIT_FAILURE;
}
std::vector<std::string> lines;
std::string line;
while(std::getline(file, line)){
lines.push_back(std::move(line));
}
file.close();
std::vector<parse> all_logs;
std::regex log_pattern(R"((\S+)\s+-\s+-\s+\[([^\]]+)\]\s+\"([^\"]+)\"\s+(\d+)\s+(\d+|-)\s+\"([^\"]*)\"\s+\"([^\"]*)\")");
for(const auto& log_line : lines) {
std::smatch match;
if(std::regex_search(log_line, match, log_pattern)) {
all_logs.emplace_back(match);
}
}
return all_logs;
}

34
log_parsing/log_parsing.h Normal file
View File

@@ -0,0 +1,34 @@
#pragma once
#include <regex>
#include <string>
struct Entry {
std::string ip;
std::string timestamp;
std::string request;
std::string status;
std::string bytes;
std::string referer;
std::string os;
std::string browser;
};
class parsed_logs {
private:
Entry entry;
std::vector<Entry> logs;
std::string url;
public:
parsed_logs(std::string url);
void parse(const std::smatch& match);
std::vector<parsed_logs> parse_file(std::string log_url);
std::string get_ip();
std::string get_timestamp();
std::string get_request();
std::string get_status();
std::string get_bytes();
std::string get_referer();
std::string get_os();
std::string get_browser();
};

BIN
main

Binary file not shown.

View File

@@ -1,83 +1,5 @@
#include <iostream> #include "log_parsing/log_parsing.h"
#include <fstream>
#include <ostream>
#include <string>
#include <vector>
#include <regex>
class log_entry { int main(){
public: parse logs;
std::string ip;
std::string timestamp;
std::string request;
std::string status;
std::string bytes;
std::string referer;
std::string os;
std::string browser;
log_entry(const std::smatch& match) {
ip = match[1].str();
timestamp = match[2].str();
request = match[3].str();
status = match[4].str();
bytes = match[5].str();
referer = match[6].str();
std::string raw_ua = match[7].str();
if (raw_ua.find("Windows NT 10.0") != std::string::npos) os = "Windows 10/11";
else if (raw_ua.find("Windows NT 6.1") != std::string::npos) os = "Windows 7";
else if (raw_ua.find("iPhone") != std::string::npos) os = "iOS (iPhone)";
else if (raw_ua.find("iPad") != std::string::npos) os = "iOS (iPad)";
else if (raw_ua.find("Android") != std::string::npos) os = "Android";
else if (raw_ua.find("Macintosh") != std::string::npos) os = "macOS";
else if (raw_ua.find("Linux") != std::string::npos) os = "Linux";
else os = "Unknown OS";
if (raw_ua.find("Edg/") != std::string::npos) browser = "Microsoft Edge";
else if (raw_ua.find("OPR/") != std::string::npos) browser = "Opera";
else if (raw_ua.find("Chrome/") != std::string::npos) browser = "Google Chrome";
else if (raw_ua.find("Safari/") != std::string::npos) browser = "Apple Safari";
else if (raw_ua.find("Firefox/") != std::string::npos) browser = "Mozilla Firefox";
else if (raw_ua.find("curl/") != std::string::npos) browser = "curl (CLI Tool)";
else browser = "Unknown Browser/Bot";
}
};
int main(int argc, char* argv[]) {
std::ifstream file(argv[1]);
if(!file.is_open()) {
std::cerr << "Error loading " << argv[1] << std::endl;
return 1;
}
std::vector<std::string> lines;
std::string line;
while(std::getline(file, line)){
lines.push_back(std::move(line));
}
file.close();
std::vector<log_entry> all_logs;
std::regex log_pattern(R"((\S+)\s+-\s+-\s+\[([^\]]+)\]\s+\"([^\"]+)\"\s+(\d+)\s+(\d+|-)\s+\"([^\"]*)\"\s+\"([^\"]*)\")");
for(const auto& log_line : lines) {
std::smatch match;
if(std::regex_search(log_line, match, log_pattern)) {
all_logs.emplace_back(match);
}
}
for (size_t i = 0; i < all_logs.size(); ++i) {
std::cout << "Entry #" << i + 1 << ":\n"
<< " IP: " << all_logs[i].ip << "\n"
<< " OS: " << all_logs[i].os << "\n"
<< " Browser: " << all_logs[i].browser << "\n"
<< " Status: " << all_logs[i].status << "\n\n";
}
return 0;
} }