Skip to content

fix(tokeer): escape JSON string values in the redeem request body #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
3304711297 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(tokeer): escape JSON string values in the redeem request body #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 32 additions & 1 deletion src/Utils/Tokeer/TokeerBridge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <shellapi.h>

#include <cstdint>
#include <cstdio>
#include <optional>
#include <string>
#include <string_view>
Expand Down Expand Up @@ -48,6 +49,36 @@ namespace {
return out;
}

// Minimal JSON string escaping for a value that is embedded into a request
// body. JSON requires that ", \\ and control characters are escaped; without
// this a bare quote in the value would terminate the string early and change
// the structure of the request.
std::string JsonEscape(std::string_view s) {
std::string out;
out.reserve(s.size() + 8);
for (const char c : s) {
switch (c) {
case '"': out += "\\\""; break;
case '\\': out += "\\\\"; break;
case '\b': out += "\\b"; break;
case '\f': out += "\\f"; break;
case '\n': out += "\\n"; break;
case '\r': out += "\\r"; break;
case '\t': out += "\\t"; break;
default:
if (static_cast<unsigned char>(c) < 0x20) {
char buf[7];
std::snprintf(buf, sizeof(buf), "\\u%04x",
static_cast<unsigned char>(c));
out += buf;
} else {
out += c;
}
}
}
return out;
}

// Minimal "key":"value" string extraction from the server's flat JSON reply.
bool JsonString(std::string_view body, std::string_view key, std::string& out) {
const std::string needle = "\"" + std::string(key) + "\"";
Expand Down Expand Up @@ -90,7 +121,7 @@ void Redeem(const std::string& code) {
namespace CS = OSTPlatform::SteamCredentialStore;

const std::string url = TokeerBaseUrl() + "/drm/redeem";
const std::string reqBody = "{\"code\":\"" + code + "\"}";
const std::string reqBody = "{\"code\":\"" + JsonEscape(code) + "\"}";

OSTPlatform::Http::Result r = OSTPlatform::Http::Execute(
L"POST", url.c_str(), reqBody.data(), static_cast<uint32_t>(reqBody.size()),
Expand Down