Skip to content
Snippets Groups Projects
Verified Commit b4807aad authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Merge branch 'f-authentication' into f-conan

parents c456bbbf 2a15f103
Branches
Tags
No related merge requests found
Pipeline #9521 failed
...@@ -35,7 +35,9 @@ ...@@ -35,7 +35,9 @@
#include "caosdb/utils.h" // for base64_encode #include "caosdb/utils.h" // for base64_encode
#include "grpcpp/impl/codegen/status.h" // for Status #include "grpcpp/impl/codegen/status.h" // for Status
#include "grpcpp/impl/codegen/string_ref.h" // for string_ref #include "grpcpp/impl/codegen/string_ref.h" // for string_ref
namespace grpc { class AuthContext; } namespace grpc {
class AuthContext;
}
namespace caosdb { namespace caosdb {
namespace authentication { namespace authentication {
...@@ -67,10 +69,10 @@ private: ...@@ -67,10 +69,10 @@ private:
public: public:
MetadataCredentialsPluginImpl(std::string key, std::string value); MetadataCredentialsPluginImpl(std::string key, std::string value);
auto auto GetMetadata(string_ref service_url, string_ref method_name,
GetMetadata(string_ref service_url, string_ref method_name,
const AuthContext &channel_auth_context, const AuthContext &channel_auth_context,
std::multimap<grpc::string, grpc::string> *metadata) -> Status override; std::multimap<grpc::string, grpc::string> *metadata)
-> Status override;
}; };
class PlainPasswordAuthenticator : public Authenticator { class PlainPasswordAuthenticator : public Authenticator {
......
...@@ -31,9 +31,21 @@ ...@@ -31,9 +31,21 @@
#include <memory> // for shared_ptr, unique_ptr #include <memory> // for shared_ptr, unique_ptr
#include <string> // for string #include <string> // for string
#include "caosdb/info/v1alpha1/main.grpc.pb.h" // for GeneralInfoService #include "caosdb/info/v1alpha1/main.grpc.pb.h" // for GeneralInfoService
namespace caosdb { namespace authentication { class Authenticator; } } namespace caosdb {
namespace caosdb { namespace info { namespace v1alpha1 { class VersionInfo; } } } namespace authentication {
namespace grpc { class ChannelCredentials; } class Authenticator;
}
} // namespace caosdb
namespace caosdb {
namespace info {
namespace v1alpha1 {
class VersionInfo;
}
} // namespace info
} // namespace caosdb
namespace grpc {
class ChannelCredentials;
}
namespace caosdb::connection { namespace caosdb::connection {
using caosdb::authentication::Authenticator; using caosdb::authentication::Authenticator;
......
...@@ -33,7 +33,9 @@ ...@@ -33,7 +33,9 @@
#include "caosdb/info/v1alpha1/main.pb.h" // for GetVersionInfoResp... #include "caosdb/info/v1alpha1/main.pb.h" // for GetVersionInfoResp...
#include "caosdb/utils.h" // for load_string_file #include "caosdb/utils.h" // for load_string_file
#include "grpcpp/impl/codegen/status_code_enum.h" // for StatusCode, UNAUTH... #include "grpcpp/impl/codegen/status_code_enum.h" // for StatusCode, UNAUTH...
namespace grpc { class Channel; } namespace grpc {
class Channel;
}
namespace caosdb::connection { namespace caosdb::connection {
using caosdb::authentication::Authenticator; using caosdb::authentication::Authenticator;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment