GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-01 00:21:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Escape password in url path

Browse Source
This commit is contained in:
David Kocik 2023-10-23 13:56:01 +02:00
parent 33b6165721
commit 82edbd5ee8
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/slic3r/Utils/Duet.cpp
View File

@ -29,10 +29,28 @@
#include "slic3r/GUI/format.hpp" #include "slic3r/GUI/format.hpp"
#include "Http.hpp" #include "Http.hpp"
#include <curl/curl.h>
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
namespace pt = boost::property_tree; namespace pt = boost::property_tree;
namespace Slic3r { namespace Slic3r {
namespace {
std::string escape_string(const std::string& unescaped)
{
std::string ret_val;
CURL* curl = curl_easy_init();
if (curl) {
char* decoded = curl_easy_escape(curl, unescaped.c_str(), unescaped.size());
if (decoded) {
ret_val = std::string(decoded);
curl_free(decoded);
}
curl_easy_cleanup(curl);
}
return ret_val;
}
}
Duet::Duet(DynamicPrintConfig *config) : Duet::Duet(DynamicPrintConfig *config) :
host(config->opt_string("print_host")), host(config->opt_string("print_host")),
@ -222,11 +240,11 @@ std::string Duet::get_connect_url(const bool dsfUrl) const
if (dsfUrl) { if (dsfUrl) {
return (boost::format("%1%machine/connect?password=%2%") return (boost::format("%1%machine/connect?password=%2%")
% get_base_url() % get_base_url()
% (password.empty() ? "reprap" : password)).str(); % (password.empty() ? "reprap" : escape_string(password))).str();
} else { } else {
return (boost::format("%1%rr_connect?password=%2%&%3%") return (boost::format("%1%rr_connect?password=%2%&%3%")
% get_base_url() % get_base_url()
% (password.empty() ? "reprap" : password) % (password.empty() ? "reprap" : escape_string(password))
% timestamp_str()).str(); % timestamp_str()).str();
} }
} }