mirror of https://github.com/grpc/grpc.git
- Remove CredentialsFactory as it's unnecessary - Effectively make Credentials a channel factory, allowing different credential types to create different channel types - this gives us a hook so that InsecureCredentials can at runtime instantiate a different kind of channel as required - giving us a way of generating an openssl free version of grpc++. - Server credentials not touched yet, but they'll need to be updated.changes/49/217549/1
Craig Tiller
10 years ago
committed by
Craig Tiller
parent
8b13192243
commit
47c83fdaf7
17 changed files with 524 additions and 293 deletions
@ -0,0 +1,60 @@ |
||||
/*
|
||||
* |
||||
* Copyright 2015, Google Inc. |
||||
* All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are |
||||
* met: |
||||
* |
||||
* * Redistributions of source code must retain the above copyright |
||||
* notice, this list of conditions and the following disclaimer. |
||||
* * Redistributions in binary form must reproduce the above |
||||
* copyright notice, this list of conditions and the following disclaimer |
||||
* in the documentation and/or other materials provided with the |
||||
* distribution. |
||||
* * Neither the name of Google Inc. nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* |
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
* |
||||
*/ |
||||
|
||||
#include <string> |
||||
|
||||
#include <grpc/grpc.h> |
||||
#include <grpc/support/log.h> |
||||
|
||||
#include <grpc++/channel_arguments.h> |
||||
#include <grpc++/credentials.h> |
||||
#include "src/cpp/client/channel.h" |
||||
|
||||
namespace grpc { |
||||
|
||||
namespace { |
||||
class InsecureCredentialsImpl final : public Credentials { |
||||
public: |
||||
std::shared_ptr<grpc::ChannelInterface> CreateChannel(const string& target, const grpc::ChannelArguments& args) override { |
||||
grpc_channel_args channel_args; |
||||
args.SetChannelArgs(&channel_args); |
||||
return std::shared_ptr<ChannelInterface>(new Channel(target, grpc_channel_create(target.c_str(), &channel_args))); |
||||
} |
||||
}; |
||||
} // namespace
|
||||
|
||||
std::unique_ptr<Credentials> InsecureCredentials() { |
||||
return std::unique_ptr<Credentials>(new InsecureCredentialsImpl()); |
||||
} |
||||
|
||||
} // namespace grpc
|
||||
@ -0,0 +1,128 @@ |
||||
/*
|
||||
* |
||||
* Copyright 2015, Google Inc. |
||||
* All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are |
||||
* met: |
||||
* |
||||
* * Redistributions of source code must retain the above copyright |
||||
* notice, this list of conditions and the following disclaimer. |
||||
* * Redistributions in binary form must reproduce the above |
||||
* copyright notice, this list of conditions and the following disclaimer |
||||
* in the documentation and/or other materials provided with the |
||||
* distribution. |
||||
* * Neither the name of Google Inc. nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* |
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
* |
||||
*/ |
||||
|
||||
#include <string> |
||||
|
||||
#include <grpc/grpc_security.h> |
||||
#include <grpc/support/log.h> |
||||
|
||||
#include <grpc++/channel_arguments.h> |
||||
#include <grpc++/credentials.h> |
||||
#include "src/cpp/client/channel.h" |
||||
|
||||
namespace grpc { |
||||
|
||||
namespace { |
||||
class SecureCredentials final : public Credentials { |
||||
public: |
||||
explicit SecureCredentials(grpc_credentials* c_creds) : c_creds_(c_creds) {} |
||||
~SecureCredentials() override { grpc_credentials_release(c_creds_); } |
||||
grpc_credentials* GetRawCreds() { return c_creds_; } |
||||
|
||||
std::shared_ptr<grpc::ChannelInterface> CreateChannel( |
||||
const string& target, const grpc::ChannelArguments& args) override { |
||||
grpc_channel_args channel_args; |
||||
args.SetChannelArgs(&channel_args); |
||||
return std::shared_ptr<ChannelInterface>(new Channel( |
||||
target, |
||||
grpc_secure_channel_create(c_creds_, target.c_str(), &channel_args))); |
||||
} |
||||
|
||||
private: |
||||
grpc_credentials* const c_creds_; |
||||
}; |
||||
|
||||
std::unique_ptr<Credentials> WrapCredentials(grpc_credentials* creds) { |
||||
return creds == nullptr |
||||
? nullptr |
||||
: std::unique_ptr<Credentials>(new SecureCredentials(creds)); |
||||
} |
||||
} // namespace
|
||||
|
||||
std::unique_ptr<Credentials> DefaultCredentials() { |
||||
return WrapCredentials(grpc_default_credentials_create()); |
||||
} |
||||
|
||||
// Builds SSL Credentials given SSL specific options
|
||||
std::unique_ptr<Credentials> SslCredentials( |
||||
const SslCredentialsOptions& options) { |
||||
grpc_ssl_pem_key_cert_pair pem_key_cert_pair = { |
||||
options.pem_private_key.c_str(), options.pem_cert_chain.c_str()}; |
||||
|
||||
grpc_credentials* c_creds = grpc_ssl_credentials_create( |
||||
options.pem_root_certs.empty() ? nullptr : options.pem_root_certs.c_str(), |
||||
options.pem_private_key.empty() ? nullptr : &pem_key_cert_pair); |
||||
return WrapCredentials(c_creds); |
||||
} |
||||
|
||||
// Builds credentials for use when running in GCE
|
||||
std::unique_ptr<Credentials> ComputeEngineCredentials() { |
||||
return WrapCredentials(grpc_compute_engine_credentials_create()); |
||||
} |
||||
|
||||
// Builds service account credentials.
|
||||
std::unique_ptr<Credentials> ServiceAccountCredentials( |
||||
const grpc::string& json_key, const grpc::string& scope, |
||||
std::chrono::seconds token_lifetime) { |
||||
gpr_timespec lifetime = gpr_time_from_seconds( |
||||
token_lifetime.count() > 0 ? token_lifetime.count() : 0); |
||||
return WrapCredentials(grpc_service_account_credentials_create( |
||||
json_key.c_str(), scope.c_str(), lifetime)); |
||||
} |
||||
|
||||
// Builds IAM credentials.
|
||||
std::unique_ptr<Credentials> IAMCredentials( |
||||
const grpc::string& authorization_token, |
||||
const grpc::string& authority_selector) { |
||||
return WrapCredentials(grpc_iam_credentials_create( |
||||
authorization_token.c_str(), authority_selector.c_str())); |
||||
} |
||||
|
||||
// Combines two credentials objects into a composite credentials.
|
||||
std::unique_ptr<Credentials> ComposeCredentials( |
||||
const std::unique_ptr<Credentials>& creds1, |
||||
const std::unique_ptr<Credentials>& creds2) { |
||||
// Note that we are not saving unique_ptrs to the two credentials
|
||||
// passed in here. This is OK because the underlying C objects (i.e.,
|
||||
// creds1 and creds2) into grpc_composite_credentials_create will see their
|
||||
// refcounts incremented.
|
||||
SecureCredentials* s1 = dynamic_cast<SecureCredentials*>(creds1.get()); |
||||
SecureCredentials* s2 = dynamic_cast<SecureCredentials*>(creds2.get()); |
||||
if (s1 && s2) { |
||||
return WrapCredentials(grpc_composite_credentials_create( |
||||
s1->GetRawCreds(), s2->GetRawCreds())); |
||||
} |
||||
return nullptr; |
||||
} |
||||
|
||||
} // namespace grpc
|
||||
Loading…
Reference in new issue