Skip to content

Populate origin.user attribute from the SAN field of client cert #142

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

Merged
wattli merged 9 commits into from
Mar 2, 2017
Merged

Populate origin.user attribute from the SAN field of client cert #142

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2bd3a75
Test
Mar 2, 2017
da04a56
test
Mar 2, 2017
7dbd223
test
Mar 2, 2017
a1450d1
revert file
Mar 2, 2017
6333055
address comments
Mar 2, 2017
fb75535
test
Mar 2, 2017
4c88590
fix typo
Mar 2, 2017
24fbbf3
fix format
Mar 2, 2017
320ea7a
fix format
Mar 2, 2017
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
15 changes: 10 additions & 5 deletions src/envoy/mixer/http_control.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,19 @@ namespace Mixer {
namespace {

// Define attribute names
const std::string kRequestPath = "request.path";
const std::string kOriginUser = "origin.user";

const std::string kRequestHeaders = "request.headers";
const std::string kRequestHost = "request.host";
const std::string kRequestPath = "request.path";
const std::string kRequestSize = "request.size";
const std::string kRequestTime = "request.time";
const std::string kRequestHeaders = "request.headers";

const std::string kResponseHeaders = "response.headers";
const std::string kResponseHttpCode = "response.http.code";
const std::string kResponseLatency = "response.latency";
const std::string kResponseSize = "response.size";
const std::string kResponseTime = "response.time";
const std::string kResponseLatency = "response.latency";
const std::string kResponseHttpCode = "response.http.code";

Attributes::Value StringValue(const std::string& str) {
Attributes::Value v;
Expand Down Expand Up @@ -169,9 +171,12 @@ void HttpControl::FillCheckAttributes(HeaderMap& header_map, Attributes* attr) {
}
}

void HttpControl::Check(HttpRequestDataPtr request_data, HeaderMap& headers,
void HttpControl::Check(HttpRequestDataPtr request_data, HeaderMap& headers, std::string origin_user,

@qiwzhang qiwzhang Mar 2, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it seems that format is wrong.

@wattli wattli Mar 2, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

DoneFunc on_done) {
FillCheckAttributes(headers, &request_data->attributes);
if (origin_user != "") {

@qiwzhang qiwzhang Mar 2, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can call SetStringAttribute

@wattli wattli Mar 2, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

request_data->attributes.attributes[kOriginUser] = StringValue(origin_user);
}
log().debug("Send Check: {}", request_data->attributes.DebugString());
mixer_client_->Check(request_data->attributes, on_done);
}
Expand Down
2 changes: 1 addition & 1 deletion src/envoy/mixer/http_control.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class HttpControl final : public Logger::Loggable<Logger::Id::http> {
std::map<std::string, std::string>&& attributes);

// Make mixer check call.
void Check(HttpRequestDataPtr request_data, HeaderMap& headers,
void Check(HttpRequestDataPtr request_data, HeaderMap& headers, std::string origin_user,
::istio::mixer_client::DoneFunc on_done);

// Make mixer report call.
Expand Down
16 changes: 15 additions & 1 deletion src/envoy/mixer/http_filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "common/http/headers.h"
#include "common/http/utility.h"
#include "envoy/server/instance.h"
#include "envoy/ssl/connection.h"
#include "server/config/network/http_connection_manager.h"
#include "src/envoy/mixer/http_control.h"
#include "src/envoy/mixer/utils.h"
Expand Down Expand Up @@ -151,8 +152,15 @@ class Instance : public Http::StreamFilter, public Http::AccessLog::Instance {
state_ = Calling;
initiating_call_ = true;
request_data_ = std::make_shared<HttpRequestData>();

std::string origin_user;
Ssl::Connection* ssl = const_cast<Ssl::Connection *>(decoder_callbacks_->ssl());
if (ssl != nullptr) {
origin_user = ssl->uriSanPeerCertificate();

@qiwzhang qiwzhang Mar 2, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we use const for this function? or why do we need const_cast?

@wattli wattli Mar 2, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's something i can add to envoy.

}

http_control_->Check(
request_data_, headers,
request_data_, headers, origin_user,
wrapper([this](const Status& status) { completeCheck(status); }));
initiating_call_ = false;

Expand Down Expand Up @@ -180,13 +188,15 @@ class Instance : public Http::StreamFilter, public Http::AccessLog::Instance {
}
return FilterTrailersStatus::Continue;
}

void setDecoderFilterCallbacks(
StreamDecoderFilterCallbacks& callbacks) override {
Log().debug("Called Mixer::Instance : {}", __func__);
decoder_callbacks_ = &callbacks;
decoder_callbacks_->addResetStreamCallback(
[this]() { state_ = Responded; });
}

void completeCheck(const Status& status) {
Log().debug("Called Mixer::Instance : check complete {}",
status.ToString());
Expand All @@ -197,6 +207,7 @@ class Instance : public Http::StreamFilter, public Http::AccessLog::Instance {
status.ToString());
return;
}

state_ = Complete;
if (!initiating_call_) {
decoder_callbacks_->continueDecoding();
Expand All @@ -208,15 +219,18 @@ class Instance : public Http::StreamFilter, public Http::AccessLog::Instance {
Log().debug("Called Mixer::Instance : {}", __func__);
return FilterHeadersStatus::Continue;
}

virtual FilterDataStatus encodeData(Buffer::Instance& data,
bool end_stream) override {
Log().debug("Called Mixer::Instance : {}", __func__);
return FilterDataStatus::Continue;
}

virtual FilterTrailersStatus encodeTrailers(HeaderMap& trailers) override {
Log().debug("Called Mixer::Instance : {}", __func__);
return FilterTrailersStatus::Continue;
}

virtual void setEncoderFilterCallbacks(
StreamEncoderFilterCallbacks& callbacks) override {
Log().debug("Called Mixer::Instance : {}", __func__);
Expand Down