hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add support for non-URL-compatible parameter parsing (taking + to not mean space, not encoding as such either) and uses it for RTMP auth

Browse source
This commit is contained in:
Thulinma 2024-06-07 21:06:28 +02:00
parent 8664daeb9a
commit 6eec3661ca
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/encode.cpp
View file

@ -97,7 +97,7 @@ namespace Encodings{
}
/// urlencodes std::string data, leaving only the characters A-Za-z0-9~!&()' alone.
std::string URL::encode(const std::string &c, const std::string &ign){
std::string URL::encode(const std::string &c, const std::string &ign, bool queryStr){
std::string escaped = "";
int max = c.length();
for (int i = 0; i < max; i++){
@ -107,7 +107,7 @@ namespace Encodings{
(ign.size() && ign.find(c[i]) != std::string::npos)){
escaped.append(&c[i], 1);
}else{
if (c[i] == ' '){
if (c[i] == ' ' && queryStr){
escaped.append("+");
}else{
escaped.append("%");
@ -119,7 +119,7 @@ namespace Encodings{
}
/// urldecodes std::string data, parsing out both %-encoded characters and +-encoded spaces.
std::string URL::decode(const std::string &in){
std::string URL::decode(const std::string &in, bool queryStr){
std::string out;
for (unsigned int i = 0; i < in.length(); ++i){
if (in[i] == '%'){
@ -130,7 +130,7 @@ namespace Encodings{
if (i < in.length()){tmp += Hex::ord(in[i]);}
out += tmp;
}else{
if (in[i] == '+'){
if (in[i] == '+' && queryStr){
out += ' ';
}else{
out += in[i];