Skip to content

Escape HTML output in builtin /flags service #3529

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
wwbmmm wants to merge 1 commit into
base: master
Choose a base branch
from
+73 −3
Open

Escape HTML output in builtin /flags service #3529

Show file tree
Hide file tree
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
9 changes: 6 additions & 3 deletions src/brpc/builtin/flags_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,11 @@ void FlagsService::set_value_page(Controller* cntl,
const bool is_string = (info.type == "string");
os << "<!DOCTYPE html><html><body>"
"<form action='' method='get'>"
" Set `" << name << "' from ";
" Set `" << WebEscape(name) << "' from ";
if (is_string) {
os << '"';
}
os << info.current_value;
os << WebEscape(info.current_value);
if (is_string) {
os << '"';
}
Expand Down Expand Up @@ -177,9 +177,12 @@ void FlagsService::default_method(::google::protobuf::RpcController* cntl_base,
return;
}
butil::IOBufBuilder os;
os << "Set `" << constraint << "' to " << *value_str;
if (use_html) {
os << "Set `" << WebEscape(constraint) << "' to "
<< WebEscape(*value_str);
os << "<br><a href='/flags'>[back to flags]</a>";
} else {
os << "Set `" << constraint << "' to " << *value_str;
}
os.move_to(cntl->response_attachment());
return;
Expand Down
67 changes: 67 additions & 0 deletions test/brpc_builtin_service_unittest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,17 @@
DEFINE_bool(foo, false, "Flags for UT");
BRPC_VALIDATE_GFLAG(foo, brpc::PassValidate);

// A reloadable string gflag so that FlagsService is able to modify its
// value via ?setvalue=. String flags must register the validator manually,
// see comments in butil/reloadable_flags.h.
DEFINE_string(reloadable_string_flag_for_ut, "", "Flags for UT");
static bool PassValidateStringFlag(const char*, const std::string&) {
return true;
}
const bool ALLOW_UNUSED dummy_validate_reloadable_string_flag_for_ut =
GFLAGS_NAMESPACE::RegisterFlagValidator(
&FLAGS_reloadable_string_flag_for_ut, PassValidateStringFlag);

namespace brpc {
DECLARE_bool(enable_rpcz);
DECLARE_bool(rpcz_hex_log_id);
Expand Down Expand Up @@ -686,6 +697,62 @@ TEST_F(BuiltinServiceTest, flags) {
TestFlags(true);
}

TEST_F(BuiltinServiceTest, flags_escaping) {
brpc::FlagsService service;
brpc::FlagsRequest req;
brpc::FlagsResponse res;
const std::string payload = "<svg onload=alert(1)>&\"'";
const std::string escaped = brpc::WebEscape(payload);
std::string saved_value;
ASSERT_TRUE(GFLAGS_NAMESPACE::GetCommandLineOption(
"reloadable_string_flag_for_ut", &saved_value));
Comment on lines +704 to +708

// Reflected: the ?setvalue= value is echoed into the html page.
{
ClosureChecker done;
brpc::Controller cntl;
SetUpController(&cntl, true);
cntl.http_request()._unresolved_path = "reloadable_string_flag_for_ut";
cntl.http_request().uri().SetQuery(brpc::SETVALUE_STR, payload);
service.default_method(&cntl, &req, &res, &done);
EXPECT_FALSE(cntl.Failed());
const std::string& body = cntl.response_attachment().to_string();
EXPECT_EQ(std::string::npos, body.find(payload))
<< "unescaped payload in html: " << body;
CheckContent(cntl, escaped.c_str());
}
// Stored: ?setvalue&withform renders the flag value stored above.
{
ClosureChecker done;
brpc::Controller cntl;
SetUpController(&cntl, true);
cntl.http_request()._unresolved_path = "reloadable_string_flag_for_ut";
cntl.http_request().uri().SetQuery(brpc::SETVALUE_STR, "");
cntl.http_request().uri().SetQuery("withform", "");
service.default_method(&cntl, &req, &res, &done);
EXPECT_FALSE(cntl.Failed());
const std::string& body = cntl.response_attachment().to_string();
EXPECT_EQ(std::string::npos, body.find(payload))
<< "unescaped payload in html: " << body;
CheckContent(cntl, escaped.c_str());
}
// Plain text output is not html-escaped.
{
ClosureChecker done;
brpc::Controller cntl;
SetUpController(&cntl, false);
cntl.http_request()._unresolved_path = "reloadable_string_flag_for_ut";
cntl.http_request().uri().SetQuery(brpc::SETVALUE_STR, payload);
service.default_method(&cntl, &req, &res, &done);
EXPECT_FALSE(cntl.Failed());
CheckContent(cntl, payload.c_str());
}

// Restore the flag value not to affect other tests.
GFLAGS_NAMESPACE::SetCommandLineOption(
"reloadable_string_flag_for_ut", saved_value.c_str());
}

TEST_F(BuiltinServiceTest, bad_method) {
TestBadMethod(false);
TestBadMethod(true);
Expand Down
Loading