TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 15:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename PublicCredential to SharedCredential and PrivateCredential to LocalCredential

Browse Source 
PiperOrigin-RevId: 503221477
This commit is contained in:
Anay Wadhera
2023-01-24 12:09:21 -08:00
committed by Copybara-Service
parent f4d85f9b90
commit c58b45eb50
24 changed files with 192 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/credential_storage_impl.cc
+4 -4
View File
@@ -20,8 +20,8 @@
namespace nearby {
using ::nearby::internal::PrivateCredential;
using ::nearby::internal::PublicCredential;
using ::nearby::internal::LocalCredential;
using ::nearby::internal::SharedCredential;
using ::nearby::presence::CredentialSelector;
using ::nearby::presence::GetPrivateCredentialsResultCallback;
using ::nearby::presence::GetPublicCredentialsResultCallback;
@@ -29,8 +29,8 @@ using ::nearby::presence::PublicCredentialType;
void CredentialStorageImpl::SaveCredentials(
absl::string_view manager_app_id, absl::string_view account_name,
const std::vector<PrivateCredential>& private_credentials,
const std::vector<PublicCredential>& public_credentials,
const std::vector<LocalCredential>& private_credentials,
const std::vector<SharedCredential>& public_credentials,
PublicCredentialType public_credential_type,
SaveCredentialsResultCallback callback) {
return impl_->SaveCredentials(manager_app_id, account_name,
internal/platform/credential_storage_impl.h
+2 -2
View File
@@ -42,8 +42,8 @@ class CredentialStorageImpl : public api::CredentialStorage {
void SaveCredentials(
absl::string_view manager_app_id, absl::string_view account_name,
const std::vector<PrivateCredential>& private_credentials,
const std::vector<PublicCredential>& public_credentials,
const std::vector<LocalCredential>& private_credentials,
const std::vector<SharedCredential>& public_credentials,
PublicCredentialType public_credential_type,
SaveCredentialsResultCallback callback) override;
internal/platform/credential_storage_impl_test.cc
+36 -36
View File
@@ -33,8 +33,8 @@ namespace nearby {
namespace {
using ::nearby::internal::IdentityType;
using ::nearby::internal::PrivateCredential;
using ::nearby::internal::PublicCredential;
using ::nearby::internal::LocalCredential;
using ::nearby::internal::SharedCredential;
using ::nearby::presence::CredentialSelector;
using ::nearby::presence::GetPrivateCredentialsResultCallback;
using ::nearby::presence::GetPublicCredentialsResultCallback;
@@ -49,24 +49,24 @@ constexpr absl::string_view kManagerAppId = "manager app id";
constexpr absl::string_view kAccountName = "test_account";
// `secret_id` is used to create credentials with different content.
PrivateCredential CreatePrivateCredential(absl::string_view secret_id,
LocalCredential CreatePrivateCredential(absl::string_view secret_id,
IdentityType identity_type) {
PrivateCredential private_credential;
LocalCredential private_credential;
private_credential.set_secret_id(secret_id);
private_credential.set_identity_type(identity_type);
return private_credential;
}
PublicCredential CreatePublicCredential(absl::string_view secret_id,
SharedCredential CreatePublicCredential(absl::string_view secret_id,
IdentityType identity_type) {
PublicCredential public_credential;
SharedCredential public_credential;
public_credential.set_secret_id(secret_id);
public_credential.set_identity_type(identity_type);
return public_credential;
}
std::vector<PrivateCredential> BuildPrivateCreds(absl::string_view secret_id) {
std::vector<PrivateCredential> private_credentials = {
std::vector<LocalCredential> BuildPrivateCreds(absl::string_view secret_id) {
std::vector<LocalCredential> private_credentials = {
CreatePrivateCredential(secret_id, IdentityType::IDENTITY_TYPE_PRIVATE),
CreatePrivateCredential(secret_id, IdentityType::IDENTITY_TYPE_TRUSTED),
CreatePrivateCredential(secret_id,
@@ -74,8 +74,8 @@ std::vector<PrivateCredential> BuildPrivateCreds(absl::string_view secret_id) {
return private_credentials;
}
std::vector<PublicCredential> BuildPublicCreds(absl::string_view secret_id) {
std::vector<PublicCredential> public_credentials = {
std::vector<SharedCredential> BuildPublicCreds(absl::string_view secret_id) {
std::vector<SharedCredential> public_credentials = {
CreatePublicCredential(secret_id, IdentityType::IDENTITY_TYPE_PRIVATE),
CreatePublicCredential(secret_id, IdentityType::IDENTITY_TYPE_TRUSTED),
CreatePublicCredential(secret_id,
@@ -83,25 +83,25 @@ std::vector<PublicCredential> BuildPublicCreds(absl::string_view secret_id) {
return public_credentials;
}
absl::StatusOr<std::vector<PrivateCredential>> GetPrivateCredentials(
absl::StatusOr<std::vector<LocalCredential>> GetPrivateCredentials(
CredentialStorageImpl& credential_storage, IdentityType identity_type,
absl::string_view manager_app_id = kManagerAppId,
absl::string_view account_name = kAccountName) {
CredentialSelector selector = {.manager_app_id = std::string(manager_app_id),
.account_name = std::string(account_name),
.identity_type = identity_type};
absl::StatusOr<std::vector<PrivateCredential>> private_credentials;
absl::StatusOr<std::vector<LocalCredential>> private_credentials;
credential_storage.GetPrivateCredentials(
selector,
GetPrivateCredentialsResultCallback{
.credentials_fetched_cb =
[&](absl::StatusOr<std::vector<PrivateCredential>> credentials) {
[&](absl::StatusOr<std::vector<LocalCredential>> credentials) {
private_credentials = std::move(credentials);
}});
return private_credentials;
}
absl::StatusOr<std::vector<PublicCredential>> GetPublicCredentials(
absl::StatusOr<std::vector<SharedCredential>> GetPublicCredentials(
CredentialStorageImpl& credential_storage, IdentityType identity_type,
PublicCredentialType credential_type,
absl::string_view manager_app_id = kManagerAppId,
@@ -109,12 +109,12 @@ absl::StatusOr<std::vector<PublicCredential>> GetPublicCredentials(
CredentialSelector selector = {.manager_app_id = std::string(manager_app_id),
.account_name = std::string(account_name),
.identity_type = identity_type};
absl::StatusOr<std::vector<PublicCredential>> public_credentials;
absl::StatusOr<std::vector<SharedCredential>> public_credentials;
credential_storage.GetPublicCredentials(
selector, credential_type,
GetPublicCredentialsResultCallback{
.credentials_fetched_cb =
[&](absl::StatusOr<std::vector<PublicCredential>> credentials) {
[&](absl::StatusOr<std::vector<SharedCredential>> credentials) {
public_credentials = std::move(credentials);
}});
return public_credentials;
@@ -123,8 +123,8 @@ absl::StatusOr<std::vector<PublicCredential>> GetPublicCredentials(
absl::Status SaveCredentials(CredentialStorageImpl& credential_storage,
absl::string_view manager_app_id,
absl::string_view account_name,
std::vector<PrivateCredential> private_credentials,
std::vector<PublicCredential> public_credentials,
std::vector<LocalCredential> private_credentials,
std::vector<SharedCredential> public_credentials,
PublicCredentialType public_credential_type) {
absl::Status save_status = absl::UnknownError("");
@@ -139,8 +139,8 @@ absl::Status SaveCredentials(CredentialStorageImpl& credential_storage,
}
absl::Status SaveCredentials(CredentialStorageImpl& credential_storage,
std::vector<PrivateCredential> private_credentials,
std::vector<PublicCredential> public_credentials) {
std::vector<LocalCredential> private_credentials,
std::vector<SharedCredential> public_credentials) {
return SaveCredentials(credential_storage, kManagerAppId, kAccountName,
private_credentials, public_credentials,
PublicCredentialType::kLocalPublicCredential);
@@ -150,7 +150,7 @@ absl::Status SavePrivateCredentials(CredentialStorageImpl& credential_storage,
absl::string_view secret_id) {
return SaveCredentials(credential_storage, kManagerAppId, kAccountName,
BuildPrivateCreds(secret_id),
std::vector<PublicCredential>(),
std::vector<SharedCredential>(),
PublicCredentialType::kLocalPublicCredential);
}
@@ -158,14 +158,14 @@ absl::Status SavePublicCredentials(CredentialStorageImpl& credential_storage,
PublicCredentialType credential_type,
absl::string_view secret_id) {
return SaveCredentials(credential_storage, kManagerAppId, kAccountName,
std::vector<PrivateCredential>(),
std::vector<LocalCredential>(),
BuildPublicCreds(secret_id), credential_type);
}
TEST(CredentialStorageImplTest, SaveAndGetPrivateCredentials) {
std::vector<PrivateCredential> default_private_creds =
std::vector<LocalCredential> default_private_creds =
BuildPrivateCreds(kSecretId);
std::vector<PublicCredential> empty_public_creds;
std::vector<SharedCredential> empty_public_creds;
CredentialStorageImpl credential_storage;
absl::Status save_status = absl::UnknownError("");
@@ -201,8 +201,8 @@ TEST(CredentialStorageImplTest, ReplaceAndGetPrivateCredentials) {
}
TEST(CredentialStorageImplTest, SaveAndGetLocalPublicCredentials) {
std::vector<PrivateCredential> empty_private_creds;
std::vector<PublicCredential> public_creds = BuildPublicCreds(kSecretId);
std::vector<LocalCredential> empty_private_creds;
std::vector<SharedCredential> public_creds = BuildPublicCreds(kSecretId);
CredentialStorageImpl credential_storage;
absl::Status save_status = absl::UnknownError("");
@@ -244,8 +244,8 @@ TEST(CredentialStorageImplTest, ReplaceAndGetLocalPublicCredentials) {
}
TEST(CredentialStorageImplTest, SaveAndGetRemotePublicCredentials) {
std::vector<PrivateCredential> empty_private_creds;
std::vector<PublicCredential> public_creds = BuildPublicCreds(kSecretId);
std::vector<LocalCredential> empty_private_creds;
std::vector<SharedCredential> public_creds = BuildPublicCreds(kSecretId);
CredentialStorageImpl credential_storage;
absl::Status save_status = absl::UnknownError("");
@@ -287,8 +287,8 @@ TEST(CredentialStorageImplTest, ReplaceAndGetRemotePublicCredentials) {
}
TEST(CredentialStorageImplTest, SavePrivateAndLocalPublicCredentials) {
std::vector<PrivateCredential> private_creds = BuildPrivateCreds(kSecretId);
std::vector<PublicCredential> public_creds = BuildPublicCreds(kSecretId);
std::vector<LocalCredential> private_creds = BuildPrivateCreds(kSecretId);
std::vector<SharedCredential> public_creds = BuildPublicCreds(kSecretId);
CredentialStorageImpl credential_storage;
absl::Status status =
@@ -309,8 +309,8 @@ TEST(CredentialStorageImplTest, SavePrivateAndLocalPublicCredentials) {
}
TEST(CredentialStorageImplTest, SaveCredentialsFailsWhenNoCredentials) {
std::vector<PrivateCredential> empty_private_creds;
std::vector<PublicCredential> empty_public_creds;
std::vector<LocalCredential> empty_private_creds;
std::vector<SharedCredential> empty_public_creds;
CredentialStorageImpl credential_storage;
absl::Status save_status = absl::UnknownError("");
@@ -415,7 +415,7 @@ TEST_P(IdentityFilterTest, FilterPrivateCredentialsByIdentityType) {
EXPECT_THAT(
*private_credentials,
UnorderedPointwise(EqualsProto(),
std::vector<PrivateCredential>{CreatePrivateCredential(
std::vector<LocalCredential>{CreatePrivateCredential(
kSecretId, identity_type)}));
}
@@ -426,7 +426,7 @@ TEST_P(IdentityFilterTest,
IdentityType other_type = identity_type == IdentityType::IDENTITY_TYPE_PRIVATE
? IdentityType::IDENTITY_TYPE_TRUSTED
: IdentityType::IDENTITY_TYPE_PRIVATE;
std::vector<PrivateCredential> private_creds = {
std::vector<LocalCredential> private_creds = {
CreatePrivateCredential(kSecretId, other_type)};
CredentialStorageImpl credential_storage;
EXPECT_OK(SaveCredentials(credential_storage, private_creds,
@@ -452,7 +452,7 @@ TEST_P(IdentityFilterTest, FilterPublicCredentialsByIdentityType) {
EXPECT_THAT(
*public_credentials,
UnorderedPointwise(EqualsProto(),
std::vector<PublicCredential>{CreatePublicCredential(
std::vector<SharedCredential>{CreatePublicCredential(
kSecretId, identity_type)}));
}
@@ -462,7 +462,7 @@ TEST_P(IdentityFilterTest, FilterPublicCredentialsFailsWhenNoCredentialsMatch) {
IdentityType other_type = identity_type == IdentityType::IDENTITY_TYPE_PRIVATE
? IdentityType::IDENTITY_TYPE_TRUSTED
: IdentityType::IDENTITY_TYPE_PRIVATE;
std::vector<PublicCredential> public_creds = {
std::vector<SharedCredential> public_creds = {
CreatePublicCredential(kSecretId, other_type)};
CredentialStorageImpl credential_storage;
EXPECT_OK(SaveCredentials(credential_storage, BuildPrivateCreds(kSecretId),
internal/platform/implementation/credential_callbacks.h
+3 -3
View File
@@ -66,7 +66,7 @@ struct SaveCredentialsResultCallback {
struct GenerateCredentialsResultCallback {
absl::AnyInvocable<void(
absl::StatusOr<std::vector<nearby::internal::PublicCredential>>)>
absl::StatusOr<std::vector<nearby::internal::SharedCredential>>)>
credentials_generated_cb;
};
@@ -76,13 +76,13 @@ struct UpdateRemotePublicCredentialsCallback {
struct GetPrivateCredentialsResultCallback {
absl::AnyInvocable<void(
absl::StatusOr<std::vector<nearby::internal::PrivateCredential>>)>
absl::StatusOr<std::vector<nearby::internal::LocalCredential>>)>
credentials_fetched_cb;
};
struct GetPublicCredentialsResultCallback {
absl::AnyInvocable<void(
absl::StatusOr<std::vector<nearby::internal::PublicCredential>>)>
absl::StatusOr<std::vector<nearby::internal::SharedCredential>>)>
credentials_fetched_cb;
};
internal/platform/implementation/credential_storage.h
+4 -4
View File
@@ -28,8 +28,8 @@ namespace api {
// Credential Storage interface
class CredentialStorage {
public:
using PrivateCredential = ::nearby::internal::PrivateCredential;
using PublicCredential = ::nearby::internal::PublicCredential;
using LocalCredential = ::nearby::internal::LocalCredential;
using SharedCredential = ::nearby::internal::SharedCredential;
using PublicCredentialType = ::nearby::presence::PublicCredentialType;
using SaveCredentialsResultCallback =
::nearby::presence::SaveCredentialsResultCallback;
@@ -55,8 +55,8 @@ class CredentialStorage {
// which is used for querying credentials.
virtual void SaveCredentials(
absl::string_view manager_app_id, absl::string_view account_name,
const std::vector<PrivateCredential>& private_credentials,
const std::vector<PublicCredential>& public_credentials,
const std::vector<LocalCredential>& Local_credentials,
const std::vector<SharedCredential>& Shared_credentials,
PublicCredentialType public_credential_type,
SaveCredentialsResultCallback callback) = 0;
internal/platform/implementation/g3/credential_storage_impl.cc
+4 -4
View File
@@ -52,8 +52,8 @@ void FilterIdentityType(std::vector<Credential>& credentials,
void CredentialStorageImpl::SaveCredentials(
absl::string_view manager_app_id, absl::string_view account_name,
const std::vector<PrivateCredential>& private_credentials,
const std::vector<PublicCredential>& public_credentials,
const std::vector<LocalCredential>& private_credentials,
const std::vector<SharedCredential>& public_credentials,
PublicCredentialType public_credential_type,
SaveCredentialsResultCallback callback) {
if (private_credentials.empty() && public_credentials.empty()) {
@@ -117,7 +117,7 @@ void CredentialStorageImpl::GetPrivateCredentials(
absl::StrFormat("No private credentials for %v", credential_selector)));
return;
}
std::vector<PrivateCredential> private_credentials =
std::vector<LocalCredential> private_credentials =
private_credentials_map_[key];
FilterIdentityType(private_credentials, credential_selector.identity_type);
if (private_credentials.empty()) {
@@ -145,7 +145,7 @@ void CredentialStorageImpl::GetPublicCredentials(
absl::StrFormat("No public credentials for %v", credential_selector)));
return;
}
std::vector<PublicCredential> public_credentials =
std::vector<SharedCredential> public_credentials =
public_credentials_map_[key];
FilterIdentityType(public_credentials, credential_selector.identity_type);
if (public_credentials.empty()) {
internal/platform/implementation/g3/credential_storage_impl.h
+6 -6
View File
@@ -38,8 +38,8 @@ namespace g3 {
*/
class CredentialStorageImpl : public api::CredentialStorage {
public:
using PrivateCredential = ::nearby::internal::PrivateCredential;
using PublicCredential = ::nearby::internal::PublicCredential;
using LocalCredential = ::nearby::internal::LocalCredential;
using SharedCredential = ::nearby::internal::SharedCredential;
using PublicCredentialType = ::nearby::presence::PublicCredentialType;
using PrivateCredentialKey = std::pair<std::string, std::string>;
using PublicCredentialKey =
@@ -51,8 +51,8 @@ class CredentialStorageImpl : public api::CredentialStorage {
// Used to save private and public credentials.
void SaveCredentials(
absl::string_view manager_app_id, absl::string_view account_name,
const std::vector<PrivateCredential>& private_credentials,
const std::vector<PublicCredential>& public_credentials,
const std::vector<LocalCredential>& private_credentials,
const std::vector<SharedCredential>& public_credentials,
PublicCredentialType public_credential_type,
SaveCredentialsResultCallback callback) override;
@@ -79,9 +79,9 @@ class CredentialStorageImpl : public api::CredentialStorage {
return std::make_tuple(std::string(manager_app_id),
std::string(account_name), credential_type);
}
absl::flat_hash_map<PrivateCredentialKey, std::vector<PrivateCredential>>
absl::flat_hash_map<PrivateCredentialKey, std::vector<LocalCredential>>
private_credentials_map_;
absl::flat_hash_map<PublicCredentialKey, std::vector<PublicCredential>>
absl::flat_hash_map<PublicCredentialKey, std::vector<SharedCredential>>
public_credentials_map_;
absl::Mutex private_mutex_;
absl::Mutex public_mutex_;
internal/proto/credential.proto
+4 -4
View File
@@ -15,12 +15,12 @@ enum IdentityType {
}
// A proto to store the local device's private credential.
message PrivateCredential {
message LocalCredential {
optional IdentityType identity_type = 1;
// The unique id of (and hashed based on) a pair of secret
// key (PrivateCredential.verification_key) and X509Certificate's public
// key (PublicCredential.verification_key).
// key (LocalCredential.verification_key) and X509Certificate's public
// key (SharedCredential.verification_key).
optional bytes secret_id = 2;
// The aes key to encrypt personal fields in public certificates.
@@ -48,7 +48,7 @@ message PrivateCredential {
optional DeviceMetadata device_metadata = 9;
}
message PublicCredential {
message SharedCredential {
optional IdentityType identity_type = 1;
// The unique id of (and hashed based on) a pair of secret