Paths

Table of Contentst

-
keyserver/src/socket/
-
src/
-
socket/
-
tunnelbroker.js

[Keyserver] Use getCommConfig for tunnelbroker connection
ClosedPublic
Actions

Authored by kamil on Aug 25 2023, 1:00 PM.

Details

Reviewers

marcin
• jon
ashoat

Commits

rCOMMc62d949459d0: [Keyserver] Use getCommConfig for tunnelbroker connection

Summary

Allow for the tunnelbroker endpoint to be configured. Necessary
for targeting production or staging instance during deployments.

https://linear.app/comm/issue/ENG-4706

Depends on D8956

Test Plan

cd keyserver
yarn dev # Should say defaulting to local instance
export COMM_JSONCONFIG_facts_tunnelbroker="{\"url\":\"ws://127.0.0.1:51001\"}"
yarn dev # Should omit default message, still connect to local instance

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

• jon created this revision.Aug 25 2023, 1:00 PM

Herald added subscribers: tomek, ashoat. · View Herald TranscriptAug 25 2023, 1:00 PM

Harbormaster returned this revision to the author for changes because remote builds failed.Aug 25 2023, 1:13 PM

Harbormaster failed remote builds in B22098: Diff 30332!

Rebase on prev diff fixes

Harbormaster completed remote builds in B22103: Diff 30337.Aug 25 2023, 3:58 PM

• jon requested review of this revision.Aug 25 2023, 3:58 PM

marcin accepted this revision.Aug 28 2023, 8:25 AM

This revision is now accepted and ready to land.Aug 28 2023, 8:25 AM

• jon added a reviewer: ashoat.Aug 30 2023, 1:01 PM

This revision now requires review to proceed.Aug 30 2023, 1:01 PM

ashoat accepted this revision.Sep 6 2023, 6:13 PM

ashoat added inline comments.

keyserver/src/socket/tunnelbroker.js
44 ↗	(On Diff #30337)	Can this be done in parallel instead of waiting for the `await` on line 42 to complete

This revision is now accepted and ready to land.Sep 6 2023, 6:13 PM

@kamil, would you mind taking over this diff, addressing my inline comment, and landing it?

In D8957#267890, @ashoat wrote:

@kamil, would you mind taking over this diff, addressing my inline comment, and landing it?

Sure, I'll address the comment before landing

kamil mentioned this in D9128: [Tunnelbroker] match JS naming convention.Sep 11 2023, 8:14 AM

kamil added a child revision: D9128: [Tunnelbroker] match JS naming convention.Sep 11 2023, 8:31 AM

address review
review before landing

Harbormaster completed remote builds in B22587: Diff 31045.Sep 13 2023, 7:20 AM

Closed by commit rCOMMc62d949459d0: [Keyserver] Use getCommConfig for tunnelbroker connection (authored by kamil). · Explain WhySep 13 2023, 7:21 AM

This revision was automatically updated to reflect the committed changes.

kamil added a commit: rCOMMc62d949459d0: [Keyserver] Use getCommConfig for tunnelbroker connection.

kamil mentioned this in rCOMMa5fbda1c676b: [Tunnelbroker] match JS naming convention.Sep 13 2023, 8:37 AM

Revision Contents
Changeset List

Path

Size

keyserver/

src/

socket/

tunnelbroker.js

31 lines

Diff 31046

View Options

keyserver/src/socket/tunnelbroker.js

#include "CreateNewBackupReactor.h"		#include "CreateNewBackupReactor.h"

#include "DatabaseManager.h"		#include "DatabaseManager.h"
#include "GlobalTools.h"		#include "GlobalTools.h"
#include "Tools.h"		#include "Tools.h"

		#include "blob_client/src/lib.rs.h"

namespace comm {		namespace comm {
namespace network {		namespace network {
namespace reactor {		namespace reactor {

std::string CreateNewBackupReactor::generateBackupID() {		std::string CreateNewBackupReactor::generateBackupID() {
if (this->deviceID.empty()) {		if (this->deviceID.empty()) {
throw std::runtime_error(		throw std::runtime_error(
"trying to generate a backup ID with an empty device ID");		"trying to generate a backup ID with an empty device ID");
▲ Show 20 Lines • Show All 44 Lines • ▼ Show 20 Lines	case State::DATA_HASH: {
if (database::DatabaseManager::getInstance().findBackupItem(		if (database::DatabaseManager::getInstance().findBackupItem(
this->userID, this->backupID) != nullptr) {		this->userID, this->backupID) != nullptr) {
throw std::runtime_error(		throw std::runtime_error(
"Backup with id [" + this->backupID + "] for user [" +		"Backup with id [" + this->backupID + "] for user [" +
this->userID + "] already exists, creation aborted");		this->userID + "] already exists, creation aborted");
}		}
response->set_backupid(this->backupID);		response->set_backupid(this->backupID);
this->holder = tools::generateHolder(this->dataHash, this->backupID);		this->holder = tools::generateHolder(this->dataHash, this->backupID);
// todo:blob perform put:initialize		try {
		put_client_initialize_cxx();
		put_client_write_cxx(
		tools::getBlobPutField(blob::PutRequest::DataCase::kHolder),
		this->holder.c_str());
		put_client_blocking_read_cxx(); // todo this should be avoided
		// (blocking); we should be able to
		// ignore responses; we probably want to
		// delegate performing ops to separate
		// threads in the base reactors
		put_client_write_cxx(
		tools::getBlobPutField(blob::PutRequest::DataCase::kBlobHash),
		this->dataHash.c_str());

		rust::String responseStr =
		put_client_blocking_read_cxx(); // todo this should be avoided
		// (blocking); we should be able to
		// ignore responses; we probably
		// want to delegate performing ops
		// to separate threads in the base
		// reactors
		// data exists?
		if ((bool)tools::charPtrToInt(responseStr.c_str())) {
		return std::make_unique<ServerBidiReactorStatus>(
		grpc::Status::OK, true);
		}
		} catch (std::exception &e) {
		throw std::runtime_error(
		e.what()); // todo in base reactors we can just handle std exception
		// instead of keep rethrowing here
		}
return nullptr;		return nullptr;
}		}
case State::DATA_CHUNKS: {		case State::DATA_CHUNKS: {
// todo:blob perform put:add chunk		if (request.mutable_newcompactionchunk()->empty()) {
// (std::move(*request.mutable_newcompactionchunk())		return std::make_unique<ServerBidiReactorStatus>(grpc::Status::OK);
		}
		try {
		put_client_write_cxx(
		tools::getBlobPutField(blob::PutRequest::DataCase::kDataChunk),
		std::string(std::move(*request.mutable_newcompactionchunk()))
		.c_str());
		put_client_blocking_read_cxx(); // todo this should be avoided
		// (blocking); we should be able to
		// ignore responses; we probably want to
		// delegate performing ops to separate
		// threads in the base reactors
		} catch (std::exception &e) {
		throw std::runtime_error(
		e.what()); // todo in base reactors we can just handle std exception
		// instead of keep rethrowing here
		}
return nullptr;		return nullptr;
}		}
}		}
throw std::runtime_error("new backup - invalid state");		throw std::runtime_error("new backup - invalid state");
}		}

void CreateNewBackupReactor::terminateCallback() {		void CreateNewBackupReactor::terminateCallback() {
const std::lock_guard<std::mutex> lock(this->reactorStateMutex);		const std::lock_guard<std::mutex> lock(this->reactorStateMutex);
// todo:blob perform put:add chunk ("")		try {
// todo:blob perform put:wait for completion		put_client_terminate_cxx();
		} catch (std::exception &e) {
		throw std::runtime_error(
		e.what()); // todo in base reactors we can just handle std exception
		// instead of keep rethrowing here
		}

// TODO add recovery data		// TODO add recovery data
// TODO handle attachments holders		// TODO handle attachments holders
database::BackupItem backupItem(		database::BackupItem backupItem(
this->userID,		this->userID,
this->backupID,		this->backupID,
tools::getCurrentTimestamp(),		tools::getCurrentTimestamp(),
tools::generateRandomString(),		tools::generateRandomString(),
this->holder,		this->holder,
{});		{});
database::DatabaseManager::getInstance().putBackupItem(backupItem);		database::DatabaseManager::getInstance().putBackupItem(backupItem);
}		}

} // namespace reactor		} // namespace reactor
} // namespace network		} // namespace network
} // namespace comm		} // namespace comm

[Keyserver] Use getCommConfig for tunnelbroker connectionClosedPublicActions