Add send_attribute filter. #115
+391
−20
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| /* Copyright 2017 Istio Authors. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #include "precompiled/precompiled.h" | ||
|
|
||
| #include "common/common/base64.h" | ||
| #include "common/common/logger.h" | ||
| #include "common/http/headers.h" | ||
| #include "common/http/utility.h" | ||
| #include "envoy/server/instance.h" | ||
| #include "server/config/network/http_connection_manager.h" | ||
| #include "src/envoy/mixer/utils.h" | ||
|
|
||
| namespace Http { | ||
| namespace ForwardAttribute { | ||
| namespace { | ||
|
|
||
| // The Json object name to specify attributes which will be forwarded | ||
| // to the upstream istio proxy. | ||
| const std::string kJsonNameAttributes("attributes"); | ||
|
|
||
| } // namespace | ||
|
|
||
| class Config : public Logger::Loggable<Logger::Id::http> { | ||
| private: | ||
| std::string attributes_; | ||
|
|
||
| public: | ||
| Config(const Json::Object& config) { | ||
| Utils::StringMap attributes = | ||
| Utils::ExtractStringMap(config, kJsonNameAttributes); | ||
| if (!attributes.empty()) { | ||
| std::string serialized_str = Utils::SerializeStringMap(attributes); | ||
| attributes_ = | ||
| Base64::encode(serialized_str.c_str(), serialized_str.size()); | ||
| } | ||
| } | ||
|
|
||
| const std::string& attributes() const { return attributes_; } | ||
| }; | ||
|
|
||
| typedef std::shared_ptr<Config> ConfigPtr; | ||
|
|
||
| class ForwardAttributeFilter : public Http::StreamDecoderFilter { | ||
| private: | ||
| ConfigPtr config_; | ||
|
|
||
| public: | ||
| ForwardAttributeFilter(ConfigPtr config) : config_(config) {} | ||
|
|
||
| FilterHeadersStatus decodeHeaders(HeaderMap& headers, | ||
| bool end_stream) override { | ||
| if (!config_->attributes().empty()) { | ||
| headers.addStatic(Utils::kIstioAttributeHeader, config_->attributes()); | ||
| } | ||
| return FilterHeadersStatus::Continue; | ||
| } | ||
|
|
||
| FilterDataStatus decodeData(Buffer::Instance& data, | ||
| bool end_stream) override { | ||
| return FilterDataStatus::Continue; | ||
| } | ||
|
|
||
| FilterTrailersStatus decodeTrailers(HeaderMap& trailers) override { | ||
| return FilterTrailersStatus::Continue; | ||
| } | ||
|
|
||
| void setDecoderFilterCallbacks( | ||
| StreamDecoderFilterCallbacks& callbacks) override {} | ||
| }; | ||
|
|
||
| } // namespace ForwardAttribute | ||
| } // namespace Http | ||
|
|
||
| namespace Server { | ||
| namespace Configuration { | ||
|
|
||
| class ForwardAttributeConfig : public HttpFilterConfigFactory { | ||
| public: | ||
| HttpFilterFactoryCb tryCreateFilterFactory( | ||
| HttpFilterType type, const std::string& name, const Json::Object& config, | ||
| const std::string&, Server::Instance& server) override { | ||
| if (type != HttpFilterType::Decoder || name != "forward_attribute") { | ||
| return nullptr; | ||
| } | ||
|
|
||
| Http::ForwardAttribute::ConfigPtr add_header_config( | ||
| new Http::ForwardAttribute::Config(config)); | ||
| return [add_header_config]( | ||
| Http::FilterChainFactoryCallbacks& callbacks) -> void { | ||
| std::shared_ptr<Http::ForwardAttribute::ForwardAttributeFilter> instance( | ||
| new Http::ForwardAttribute::ForwardAttributeFilter( | ||
| add_header_config)); | ||
| callbacks.addStreamDecoderFilter(Http::StreamDecoderFilterPtr(instance)); | ||
| }; | ||
| } | ||
| }; | ||
|
|
||
| static RegisterHttpFilterConfigFactory<ForwardAttributeConfig> register_; | ||
|
|
||
| } // namespace Configuration | ||
| } // namespace server |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is the MIXER SERVER an environment variable? Or is it just for illustration? If it's the latter, I suggest using Envoy type notation "..." or the type of the attribute ""
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's just a template value in a standalone prototype proxy + mixer. The reason for this PR was that I wanted to have explicit values in the envoy config rather than some secret environment variables that the filter picks up.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So it gets overriden during config gen? Then it sounds fine. In that case I would say use some non colliding variables like Mixer__server
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will leave it as ${MIXER_SERFVER}