jiazhizhong/higress
1
0
Fork 0
mirror of https://github.com/alibaba/higress.git synced 2026-06-02 09:07:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

wasm: strip port from host when match host (#626)

Browse Source
This commit is contained in:
澄潭
2023-11-07 17:11:56 +08:00
committed by GitHub
parent 26654aefc0
commit 9f5b795a4d
4 changed files with 75 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/wasm-cpp/common/route_rule_matcher.h
View File

@@ -387,6 +387,8 @@ class RouteRuleMatcher {
return true;
}
request_host = Wasm::Common::Http::stripPortFromHost(request_host);
for (const auto& host_match : rule.hosts) {
const auto& host = host_match.second;
switch (host_match.first) {

42
plugins/wasm-cpp/extensions/basic_auth/plugin_test.cc
View File

@@ -584,6 +584,48 @@ TEST_F(BasicAuthTest, RuleWithConsumerAllow) {
FilterHeadersStatus::Continue);
}
TEST_F(BasicAuthTest, GlobalAuthRuleWithDomainPort) {
std::string configuration = R"(
{
"global_auth": true,
"consumers" : [
{"credential" : "ok:test", "name" : "consumer_ok"},
{"credential" : "admin2:admin2", "name" : "consumer2"},
{"credential" : "YWRtaW4zOmFkbWluMw==", "name" : "consumer3"},
{"credential" : "admin:admin", "name" : "consumer"}
],
"_rules_" : [
{
"_match_domain_" : ["test.com", "*.example.com"],
"allow" : [ "consumer" ]
}
]
})";
BufferBase buffer;
buffer.set({configuration.data(), configuration.size()});
EXPECT_CALL(*mock_context_, getBuffer(WasmBufferType::PluginConfiguration))
.WillOnce([&buffer](WasmBufferType) { return &buffer; });
EXPECT_TRUE(root_context_->configure(configuration.size()));
authority_ = "www.example.com:8080";
cred_ = "admin:admin";
authorization_header_ = "Basic " + Base64::encode(cred_.data(), cred_.size());
EXPECT_EQ(context_->onRequestHeaders(0, false),
FilterHeadersStatus::Continue);
cred_ = "admin2:admin2";
authorization_header_ = "Basic " + Base64::encode(cred_.data(), cred_.size());
EXPECT_EQ(context_->onRequestHeaders(0, false),
FilterHeadersStatus::StopIteration);
authority_ = "abc.com";
authorization_header_ = "Basic " + Base64::encode(cred_.data(), cred_.size());
EXPECT_EQ(context_->onRequestHeaders(0, false),
FilterHeadersStatus::Continue);
}
TEST_F(BasicAuthTest, RuleWithEncryptedConsumerAllow) {
std::string configuration = R"(
{