Skip to content

Commit

Permalink
Session -> session
Browse files Browse the repository at this point in the history
  • Loading branch information
@braindigitalis
braindigitalis committed Oct 5, 2024
1 parent 361ef8b commit 202c2b5
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 50 deletions.
2 changes: 1 addition & 1 deletion include/dpp/discordvoiceclient.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ namespace dpp {
class audio_mixer;

namespace dave::mls {
class Session;
class session;
}

// !TODO: change these to constexpr and rename every occurrence across the codebase
Expand Down
64 changes: 32 additions & 32 deletions src/dpp/dave/session.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,19 @@ struct QueuedProposal {
::mlspp::bytes_ns::bytes ref;
};

Session::Session(key_pair_context_type context,
session::session(key_pair_context_type context,
const std::string& authSessionId,
MLSFailureCallback callback) noexcept
mls_failure_callback callback) noexcept
: signingKeyId_(authSessionId)
, keyPairContext_(context)
, onMLSFailureCallback_(std::move(callback))
{
DISCORD_LOG(LS_INFO) << "Creating a new MLS session";
}

Session::~Session() noexcept = default;
session::~session() noexcept = default;

void Session::Init(protocol_version protocolVersion,
void session::Init(protocol_version protocolVersion,
uint64_t groupId,
std::string const& selfUserId,
std::shared_ptr<::mlspp::SignaturePrivateKey>& transientKey) noexcept
Expand All @@ -87,7 +87,7 @@ void Session::Init(protocol_version protocolVersion,
CreatePendingGroup();
}

void Session::Reset() noexcept
void session::Reset() noexcept
{
DISCORD_LOG(LS_INFO) << "Resetting MLS session";

Expand All @@ -100,7 +100,7 @@ void Session::Reset() noexcept
groupId_.clear();
}

void Session::SetProtocolVersion(protocol_version version) noexcept
void session::SetProtocolVersion(protocol_version version) noexcept
{
if (version != protocolVersion_) {
// when we need to retain backwards compatibility
Expand All @@ -110,7 +110,7 @@ void Session::SetProtocolVersion(protocol_version version) noexcept
}
}

std::vector<uint8_t> Session::GetLastEpochAuthenticator() const noexcept
std::vector<uint8_t> session::GetLastEpochAuthenticator() const noexcept
{
if (!currentState_) {
DISCORD_LOG(LS_ERROR) << "Cannot get epoch authenticator without an established MLS group";
Expand All @@ -120,7 +120,7 @@ std::vector<uint8_t> Session::GetLastEpochAuthenticator() const noexcept
return std::move(currentState_->epoch_authenticator().as_vec());
}

void Session::SetExternalSender(const std::vector<uint8_t>& marshalledExternalSender) noexcept
void session::SetExternalSender(const std::vector<uint8_t>& marshalledExternalSender) noexcept
try {
if (currentState_) {
DISCORD_LOG(LS_ERROR) << "Cannot set external sender after joining/creating an MLS group";
Expand All @@ -144,7 +144,7 @@ catch (const std::exception& e) {
return;
}

std::optional<std::vector<uint8_t>> Session::ProcessProposals(
std::optional<std::vector<uint8_t>> session::ProcessProposals(
std::vector<uint8_t> proposals,
std::set<std::string> const& recognizedUserIDs) noexcept
try {
Expand Down Expand Up @@ -267,8 +267,8 @@ catch (const std::exception& e) {
return std::nullopt;
}

bool Session::IsRecognizedUserID(const ::mlspp::Credential& cred,
std::set<std::string> const& recognizedUserIDs) const
bool session::IsRecognizedUserID(const ::mlspp::Credential& cred,
std::set<std::string> const& recognizedUserIDs) const
{
std::string uid = UserCredentialToString(cred, protocolVersion_);
if (uid.empty()) {
Expand All @@ -284,9 +284,9 @@ bool Session::IsRecognizedUserID(const ::mlspp::Credential& cred,
return true;
}

bool Session::ValidateProposalMessage(::mlspp::AuthenticatedContent const& message,
::mlspp::State const& targetState,
std::set<std::string> const& recognizedUserIDs) const
bool session::ValidateProposalMessage(::mlspp::AuthenticatedContent const& message,
::mlspp::State const& targetState,
std::set<std::string> const& recognizedUserIDs) const
{
if (message.wire_format != ::mlspp::WireFormat::mls_public_message) {
DISCORD_LOG(LS_ERROR) << "MLS proposal message must be PublicMessage";
Expand Down Expand Up @@ -337,7 +337,7 @@ bool Session::ValidateProposalMessage(::mlspp::AuthenticatedContent const& messa
return true;
}

bool Session::CanProcessCommit(const ::mlspp::MLSMessage& commit) noexcept
bool session::CanProcessCommit(const ::mlspp::MLSMessage& commit) noexcept
{
if (!stateWithProposals_) {
return false;
Expand All @@ -351,7 +351,7 @@ bool Session::CanProcessCommit(const ::mlspp::MLSMessage& commit) noexcept
return true;
}

roster_variant Session::ProcessCommit(std::vector<uint8_t> commit) noexcept
roster_variant session::ProcessCommit(std::vector<uint8_t> commit) noexcept
try {
DISCORD_LOG(LS_INFO) << "Processing commit";
DISCORD_LOG(LS_INFO) << "Commit: " << ::mlspp::bytes_ns::bytes(commit);
Expand Down Expand Up @@ -395,7 +395,7 @@ catch (const std::exception& e) {
return failed_t{};
}

std::optional<roster_map> Session::ProcessWelcome(
std::optional<roster_map> session::ProcessWelcome(
std::vector<uint8_t> welcome,
std::set<std::string> const& recognizedUserIDs) noexcept
try {
Expand Down Expand Up @@ -453,7 +453,7 @@ catch (const std::exception& e) {
return std::nullopt;
}

roster_map Session::ReplaceState(std::unique_ptr<::mlspp::State>&& state)
roster_map session::ReplaceState(std::unique_ptr<::mlspp::State>&& state)
{
roster_map newRoster;
for (const ::mlspp::LeafNode& node : state->roster()) {
Expand Down Expand Up @@ -505,13 +505,13 @@ roster_map Session::ReplaceState(std::unique_ptr<::mlspp::State>&& state)
return changeMap;
}

bool Session::HasCryptographicStateForWelcome() const noexcept
bool session::HasCryptographicStateForWelcome() const noexcept
{
return joinKeyPackage_ && joinInitPrivateKey_ && selfSigPrivateKey_ && selfHPKEPrivateKey_;
}

bool Session::VerifyWelcomeState(::mlspp::State const& state,
std::set<std::string> const& recognizedUserIDs) const
bool session::VerifyWelcomeState(::mlspp::State const& state,
std::set<std::string> const& recognizedUserIDs) const
{
if (!externalSender_) {
DISCORD_LOG(LS_ERROR) << "Cannot verify MLS welcome without an external sender";
Expand Down Expand Up @@ -555,8 +555,8 @@ bool Session::VerifyWelcomeState(::mlspp::State const& state,
return true;
}

void Session::InitLeafNode(std::string const& selfUserId,
std::shared_ptr<::mlspp::SignaturePrivateKey>& transientKey) noexcept
void session::InitLeafNode(std::string const& selfUserId,
std::shared_ptr<::mlspp::SignaturePrivateKey>& transientKey) noexcept
try {
auto ciphersuite = ciphersuite_for_protocol_version(protocolVersion_);

Expand Down Expand Up @@ -599,7 +599,7 @@ catch (const std::exception& e) {
TRACK_MLS_ERROR(e.what());
}

void Session::ResetJoinKeyPackage() noexcept
void session::ResetJoinKeyPackage() noexcept
try {
if (!selfLeafNode_) {
DISCORD_LOG(LS_ERROR) << "Cannot initialize join key package without a leaf node";
Expand All @@ -626,7 +626,7 @@ catch (const std::exception& e) {
TRACK_MLS_ERROR(e.what());
}

void Session::CreatePendingGroup() noexcept
void session::CreatePendingGroup() noexcept
try {
if (groupId_.empty()) {
DISCORD_LOG(LS_ERROR) << "Cannot create MLS group without a group ID";
Expand Down Expand Up @@ -663,7 +663,7 @@ catch (const std::exception& e) {
return;
}

std::vector<uint8_t> Session::GetMarshalledKeyPackage() noexcept
std::vector<uint8_t> session::GetMarshalledKeyPackage() noexcept
try {
// key packages are not meant to be re-used
// so every time the client asks for a key package we create a new one
Expand All @@ -682,7 +682,7 @@ catch (const std::exception& e) {
return {};
}

std::unique_ptr<key_ratchet_interface> Session::GetKeyRatchet(std::string const& userId) const noexcept
std::unique_ptr<key_ratchet_interface> session::GetKeyRatchet(std::string const& userId) const noexcept
{
if (!currentState_) {
DISCORD_LOG(LS_ERROR) << "Cannot get key ratchet without an established MLS group";
Expand All @@ -696,16 +696,16 @@ std::unique_ptr<key_ratchet_interface> Session::GetKeyRatchet(std::string const&

// generate the base secret for the hash ratchet
auto baseSecret =
currentState_->do_export(Session::USER_MEDIA_KEY_BASE_LABEL, userIdBytes, AES_GCM_128_KEY_BYTES);
currentState_->do_export(session::USER_MEDIA_KEY_BASE_LABEL, userIdBytes, AES_GCM_128_KEY_BYTES);

// this assumes the MLS ciphersuite produces a kAesGcm128KeyBytes sized key
// would need to be updated to a different ciphersuite if there's a future mismatch
return std::make_unique<MlsKeyRatchet>(currentState_->cipher_suite(), std::move(baseSecret));
}

void Session::GetPairwiseFingerprint(uint16_t version,
std::string const& userId,
PairwiseFingerprintCallback callback) const noexcept
void session::GetPairwiseFingerprint(uint16_t version,
std::string const& userId,
PairwiseFingerprintCallback callback) const noexcept
try {
if (!currentState_ || !selfSigPrivateKey_) {
throw std::invalid_argument("No established MLS group");
Expand Down Expand Up @@ -787,7 +787,7 @@ catch (const std::exception& e) {
callback({});
}

void Session::ClearPendingState()
void session::ClearPendingState()
{
pendingGroupState_.reset();
pendingGroupCommit_.reset();
Expand Down
30 changes: 15 additions & 15 deletions src/dpp/dave/session.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,30 +38,30 @@
#include "version.h"

namespace mlspp {
struct AuthenticatedContent;
struct Credential;
struct ExternalSender;
struct HPKEPrivateKey;
struct KeyPackage;
struct LeafNode;
struct MLSMessage;
struct SignaturePrivateKey;
class State;
struct AuthenticatedContent;
struct Credential;
struct ExternalSender;
struct HPKEPrivateKey;
struct KeyPackage;
struct LeafNode;
struct MLSMessage;
struct SignaturePrivateKey;
class State;
} // namespace mlspp

namespace dpp::dave::mls {

struct QueuedProposal;

class Session {
class session {
public:
using MLSFailureCallback = std::function<void(std::string const&, std::string const&)>;
using mls_failure_callback = std::function<void(std::string const&, std::string const&)>;

Session(key_pair_context_type context,
session(key_pair_context_type context,
const std::string& authSessionId,
MLSFailureCallback callback) noexcept;
mls_failure_callback callback) noexcept;

~Session() noexcept;
~session() noexcept;

void Init(protocol_version version,
uint64_t groupId,
Expand Down Expand Up @@ -147,7 +147,7 @@ class Session {
std::unique_ptr<::mlspp::State> stateWithProposals_;
std::list<QueuedProposal> proposalQueue_;

MLSFailureCallback onMLSFailureCallback_{};
mls_failure_callback onMLSFailureCallback_{};
};

} // namespace dpp::dave::mls
Expand Down
2 changes: 1 addition & 1 deletion src/dpp/voice/enabled/enabled.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
namespace dpp {

struct dave_state {
std::unique_ptr<dave::mls::Session> dave_session{};
std::unique_ptr<dave::mls::session> dave_session{};
std::shared_ptr<::mlspp::SignaturePrivateKey> mls_key;
std::vector<uint8_t> cached_commit;
uint64_t transition_id{0};
Expand Down
2 changes: 1 addition & 1 deletion src/dpp/voice/enabled/handle_frame.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ bool discord_voice_client::handle_frame(const std::string &data, ws_opcode opcod
}

mls_state = std::make_unique<dave_state>();
mls_state->dave_session = std::make_unique<dave::mls::Session>(
mls_state->dave_session = std::make_unique<dave::mls::session>(
nullptr, "" /* sessionid */, [this](std::string const& s1, std::string const& s2) {
log(ll_debug, "Dave session constructor callback: " + s1 + ", " + s2);
});
Expand Down

0 comments on commit 202c2b5

Please sign in to comment.