janis/ma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing bugs, changing some code from char arrays to c++ std::string

Browse Source
This commit is contained in:
jakani24
2024-03-13 19:10:31 +01:00
parent 717c7956f5
commit 41e0889a6e
38 changed files with 1242 additions and 1038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

181
src/client_backend/connect.cpp
View File

@@ -1,61 +1,63 @@
#pragma warning(disable:4996)
#ifndef CONNECT_CPP
#define CONNECT_CPP
#include "connect.h"
#include "well_known.h"
#include "security.h"
#include <curl/curl.h>
#include <string>
int fast_send(const char * url,bool ignore_insecure) {
//send get rewuest to server, and cloe connection after maximum 1 second
int fast_send(const std::string& url, bool ignore_insecure) {
CURL* curl;
CURLcode res;
curl = curl_easy_init();
if (curl) {
curl_easy_setopt(curl, CURLOPT_URL, url);
if(ignore_insecure==true)
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
curl_easy_setopt(curl, CURLOPT_TIMEOUT, 1L);
res = curl_easy_perform(curl);
curl_easy_cleanup(curl);
curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
if (ignore_insecure)
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
curl_easy_setopt(curl, CURLOPT_TIMEOUT, 1L);
res = curl_easy_perform(curl);
curl_easy_cleanup(curl);
if (res == CURLE_OK) {
return 0;
}
return 0;
}
else {
return res;
}
}
return res;
}
}
return 1;
}
static size_t write_callback_connect(void* contents, size_t size, size_t nmemb, void* userp)
{
static size_t write_callback_connect(void* contents, size_t size, size_t nmemb, void* userp) {
((std::string*)userp)->append((char*)contents, size * nmemb);
return size * nmemb;
}
int connect_to_srv(const char*url,char*out,int max_len, bool ignore_insecure) {
int connect_to_srv(const std::string& url, char* out, int max_len, bool ignore_insecure) {
CURL* curl;
CURLcode res;
std::string readBuffer;
curl = curl_easy_init();
if (curl) {
curl_easy_setopt(curl, CURLOPT_URL, url);
curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback_connect);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &readBuffer);
if(ignore_insecure==true)
if (ignore_insecure)
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
res = curl_easy_perform(curl);
curl_easy_cleanup(curl);
if (max_len > (int)strlen(readBuffer.c_str())) {
if (max_len > (int)readBuffer.length()) {
strcpy(out, readBuffer.c_str());
return 0;
}
else
return 1;
return 1;
}
return 2;
}
size_t write_callback_download(void* contents, size_t size, size_t nmemb, void* userp) {
size_t totalSize = size * nmemb;
FILE* file = (FILE*)userp;
@@ -65,12 +67,11 @@ size_t write_callback_download(void* contents, size_t size, size_t nmemb, void*
return totalSize;
}
int download_file_from_srv(const char* url, const char* output_file_path, bool ignore_insecure) {
//use curl to download a file from a server
char*temp_path = new char[515];
char* buf = new char[505];
strcpy_s(temp_path,495, output_file_path);
strcat_s(temp_path,505, ".temp");
int download_file_from_srv(const std::string& url, const std::string& output_file_path, bool ignore_insecure) {
char* temp_path = new char[output_file_path.size() + 6];
strcpy(temp_path, output_file_path.c_str());
strcat(temp_path, ".temp");
CURL* curl;
CURLcode res;
FILE* output_file;
@@ -78,137 +79,111 @@ int download_file_from_srv(const char* url, const char* output_file_path, bool i
curl = curl_easy_init();
if (!curl) {
delete[] temp_path;
delete[] buf;
return 1;
}
// Set the URL to download
curl_easy_setopt(curl, CURLOPT_URL, url);
curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
// Create a file to write the downloaded data
output_file = fopen(temp_path, "wb");
if (!output_file) {
curl_easy_cleanup(curl);
delete [] temp_path;
delete[] buf;
delete[] temp_path;
return 2;
}
// Set the write callback function
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback_download);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, output_file);
if (ignore_insecure == true)
if (ignore_insecure)
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
// Perform the download
res = curl_easy_perform(curl);
if (res != CURLE_OK) {
fclose(output_file);
delete[] temp_path;
delete[] buf;
return 3;
}
// Cleanup and close the file
curl_easy_cleanup(curl);
fclose(output_file);
if ((output_file = fopen(temp_path, "r")) == 0) {
delete[] temp_path;
delete[] buf;
return 4;
}
else {
char buf[501];
fscanf(output_file, "%500s", buf);
if (strcmp(buf, "no_auth") == 0) {
fclose(output_file);
delete[] temp_path;
delete[] buf;
return 5;
}
else if(check_cert(buf, SECRETS)==0){
remove(output_file_path);//remove old file, so it can be overwritten
else if (check_cert(buf, SECRETS) == 0) {
remove(output_file_path.c_str());
fclose(output_file);
if (rename(temp_path, output_file_path)!=0) {
if (rename(temp_path, output_file_path.c_str()) != 0) {
delete[] temp_path;
delete[] buf;
return 6;
return 6;
}
}else {
fclose(output_file);
delete[] temp_path;
delete[] buf;
}
else {
fclose(output_file);
delete[] temp_path;
return 7;
}
}
delete[] buf;
delete[] temp_path;
return 0;
}
char* url_encode(const char* input) {
// Allocate memory for the encoded string (worst case: every character needs encoding)
size_t input_len = strlen(input);
char* encoded = (char*)malloc(input_len * 3 + 1); // +1 for null terminator
if (!encoded) {
fprintf(stderr, "Memory allocation failed\n");
exit(EXIT_FAILURE);
}
// Define the characters that don't need encoding
const char* safe_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_.~";
// Initialize variables for input and output string indices
size_t i = 0; // index for input string
size_t j = 0; // index for output string
// Loop through each character in the input string
while (input[i]) {
// Check if the character is a safe character
if (strchr(safe_chars, input[i]) != NULL) {
encoded[j++] = input[i++]; // Copy safe character as is
std::string url_encode(const std::string& input) {
static const char* const safe_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_.~";
std::string encoded;
for (char c : input) {
if (std::strchr(safe_chars, c) != nullptr) {
encoded += c;
}
else {
// Encode non-safe character as percent-encoded representation
sprintf(encoded + j, "%%%02X", (unsigned char)input[i]);
j += 3; // Increment output index by 3 to account for encoding (%XX)
i++; // Move to the next character in the input string
char temp[4];
sprintf(temp, "%%%02X", (unsigned char)c);
encoded += temp;
}
}
// Null-terminate the encoded string
encoded[j] = '\0';
return encoded;
}
int upload_to_srv(const char* url, const char* filepath,bool ignore_insecure) {
//upload a file to the server
int upload_to_srv(const std::string& url, const std::string& filepath, bool ignore_insecure) {
CURL* curl;
CURLcode res;
struct curl_httppost* formpost = NULL;
struct curl_httppost* lastptr = NULL;
struct curl_slist* headerlist = NULL;
struct curl_httppost* formpost = nullptr;
struct curl_httppost* lastptr = nullptr;
struct curl_slist* headerlist = nullptr;
static const char buf[] = "Expect:";
curl_global_init(CURL_GLOBAL_ALL);
curl_formadd(&formpost, &lastptr, CURLFORM_COPYNAME, "file", CURLFORM_FILE, filepath, CURLFORM_END);
curl_formadd(&formpost, &lastptr, CURLFORM_COPYNAME, "file", CURLFORM_FILE, filepath.c_str(), CURLFORM_END);
curl = curl_easy_init();
if (curl) {
curl_easy_setopt(curl, CURLOPT_URL, url);
if(ignore_insecure==true)
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
headerlist = curl_slist_append(headerlist, buf);
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headerlist);
curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
res = curl_easy_perform(curl);
curl_easy_cleanup(curl);
curl_formfree(formpost);
curl_slist_free_all(headerlist);
if (res == CURLE_OK) {
return 0;
}
else {
return 1;
}
}
curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
if (ignore_insecure)
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
headerlist = curl_slist_append(headerlist, buf);
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headerlist);
curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
res = curl_easy_perform(curl);
curl_easy_cleanup(curl);
curl_formfree(formpost);
curl_slist_free_all(headerlist);
if (res == CURLE_OK) {
return 0;
}
else {
return 1;
}
}
return 2;
}
#endif
#endif