mirror of
https://github.com/kidfromjupiter/nearby.git
synced 2026-09-15 15:16:12 -04:00
The `RandBytes` functions were being placed in the `crypto` namespace, which collides with Chromium's namespace of the same name. Within, `RandBytes` was defined with almost-the-same API. Then in Chromium builds, the Chromium header would be used instead (though somewhat inconsistently). This creates a lot of pain for Chromium development as there's a third-party repository directly depending on headers from Chromium's source tree, and is against the third-party policies for that reason. There are a number of other headers that mirror Chromium and are swapped out in the Chromium build that will cause similar pain, such as: ``` include "crypto/aead.h" include "crypto/ec_private_key.h" include "crypto/hkdf.h" ``` This CL provides a template for how to get rid of these header swaps and give a platform abstraction in nearby instead. We provide a platform abstraction in `platform/crypto.h` (really in `platform/implementation/crypto.h`) which is implemented in `platform/implementation/shared/crypto.cc`. However that implementation is removed by `#ifdef` when in the Chromium build. Then, in the Chromium repo, we will add (separately) an implementation of the same abstraction in `//third_party/nearby/platform_impl` with GN rules to include it in the build. It will replace the implementation from the nearby repo. Copybara import of the project: -- 6ca8099 by danakj <danakj@chromium.org>: Provide a platform abstraction for RandBytes instead of swapping headers The `RandBytes` functions were being placed in the `crypto` namespace, which collides with Chromium's namespace of the same name. Within, `RandBytes` was defined with almost-the-same API. Then in Chromium builds, the Chromium header would be used instead (though somewhat inconsistently). This creates a lot of pain for Chromium development as there's a third-party repository directly depending on headers from Chromium's source tree, and is against the third-party policies for that reason. There are a number of other headers that mirror Chromium and are swapped out in the Chromium build that will cause similar pain, such as: ``` include "crypto/aead.h" include "crypto/ec_private_key.h" include "crypto/hkdf.h" ``` This CL provides a template for how to get rid of these header swaps and give a platform abstraction in nearby instead. We provide a platform abstraction in `platform/crypto.h` (really in `platform/implementation/crypto.h`) which is implemented in `platform/implementation/shared/crypto.cc`. However that implementation is removed by `#ifdef` when in the Chromium build. Then, in the Chromium repo, we will add (separately) an implementation of the same abstraction in `//third_party/nearby/platform_impl` with GN rules to include it in the build. It will replace the implementation from the nearby repo. -- 9c2654b by danakj <danakj@chromium.org>: Remove CryptoSpan, use absl::Span The header swapping of Chromium crypto libraries is problematic, but absl::Span will convert to base::span so there's no need for the typedef even without removing the header swapping yet. -- df1135d by danakj <danakj@chromium.org>: Add missing files -- ab18a15 by danakj <danakj@chromium.org>: Remove the random_unittest.cc from Swift build The file moved, so the Swift package needs its path updated. -- 2038f78 by danakj <danakj@chromium.org>: Combine crypto unittests into crypto_test.cc -- f7ad176 by danakj <danakj@chromium.org>: Add stdint and stddef includes for uint8_t and size_t -- 9f04590 by danakj <danakj@chromium.org>: Mark the shared crypto implementation compatable_with non_prod -- 18eeafd by danakj <danakj@chromium.org>: Add IWYU pragma for crypto implementation PiperOrigin-RevId: 632150866
114 lines
3.7 KiB
C++
114 lines
3.7 KiB
C++
// Copyright 2022 Google LLC
|
|
//
|
|
// 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
|
|
//
|
|
// https://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 "presence/implementation/base_broadcast_request.h"
|
|
|
|
#include <string>
|
|
#include <variant>
|
|
|
|
#include "absl/status/status.h"
|
|
#include "absl/strings/string_view.h"
|
|
#include "internal/platform/implementation/crypto.h"
|
|
#include "internal/platform/logging.h"
|
|
#include "presence/broadcast_request.h"
|
|
#include "presence/implementation/action_factory.h"
|
|
|
|
namespace nearby {
|
|
namespace presence {
|
|
|
|
BasePresenceRequestBuilder& BasePresenceRequestBuilder::SetSalt(
|
|
absl::string_view salt) {
|
|
if (salt.size() != kSaltSize) {
|
|
NEARBY_LOG(WARNING, "Unsupported salt length: %d", salt.size());
|
|
} else {
|
|
salt_ = std::string(salt);
|
|
}
|
|
return *this;
|
|
}
|
|
BasePresenceRequestBuilder& BasePresenceRequestBuilder::SetTxPower(
|
|
int8_t tx_power) {
|
|
tx_power_ = tx_power;
|
|
return *this;
|
|
}
|
|
|
|
BasePresenceRequestBuilder& BasePresenceRequestBuilder::SetAction(
|
|
const Action& action) {
|
|
action_ = action;
|
|
return *this;
|
|
}
|
|
|
|
BasePresenceRequestBuilder& BasePresenceRequestBuilder::SetPowerMode(
|
|
PowerMode power_mode) {
|
|
power_mode_ = power_mode;
|
|
return *this;
|
|
}
|
|
|
|
BasePresenceRequestBuilder& BasePresenceRequestBuilder::SetAccountName(
|
|
absl::string_view account_name) {
|
|
account_name_ = std::string(account_name);
|
|
return *this;
|
|
}
|
|
|
|
BasePresenceRequestBuilder& BasePresenceRequestBuilder::SetManagerAppId(
|
|
absl::string_view manager_app_id) {
|
|
manager_app_id_ = std::string(manager_app_id);
|
|
return *this;
|
|
}
|
|
|
|
BasePresenceRequestBuilder::operator BaseBroadcastRequest() const {
|
|
BaseBroadcastRequest::BasePresence presence{
|
|
.credential_selector = {.manager_app_id = manager_app_id_,
|
|
.account_name = account_name_,
|
|
.identity_type = identity_},
|
|
.action = action_};
|
|
|
|
std::string bytes(kSaltSize, 0);
|
|
RandBytes(const_cast<std::string::value_type*>(bytes.data()), bytes.size());
|
|
|
|
BaseBroadcastRequest broadcast_request{
|
|
.variant = presence,
|
|
.salt = salt_.size() == kSaltSize ? salt_ : bytes,
|
|
.tx_power = tx_power_,
|
|
.power_mode = power_mode_};
|
|
return broadcast_request;
|
|
}
|
|
|
|
absl::StatusOr<BaseBroadcastRequest> BaseBroadcastRequest::Create(
|
|
const BroadcastRequest& request) {
|
|
if (absl::holds_alternative<PresenceBroadcast>(request.variant)) {
|
|
const auto& presence_request =
|
|
absl::get<PresenceBroadcast>(request.variant);
|
|
if (presence_request.sections.empty()) {
|
|
return absl::InvalidArgumentError("Missing broadcast sections");
|
|
}
|
|
if (presence_request.sections.size() > 1) {
|
|
NEARBY_LOG(WARNING,
|
|
"Only first section is used in BLE 4.2 advertisement");
|
|
}
|
|
const PresenceBroadcast::BroadcastSection& section =
|
|
presence_request.sections.front();
|
|
return BaseBroadcastRequest(
|
|
BasePresenceRequestBuilder(section.identity)
|
|
.SetTxPower(request.tx_power)
|
|
.SetAction(ActionFactory::CreateAction(section.extended_properties))
|
|
.SetPowerMode(request.power_mode)
|
|
.SetManagerAppId(section.manager_app_id)
|
|
.SetAccountName(section.account_name));
|
|
}
|
|
return absl::UnimplementedError("Request not supported");
|
|
}
|
|
|
|
} // namespace presence
|
|
} // namespace nearby
|