Page MenuHomePhabricator
Differential D14467

[backup] Return keyserver device ID in latest backup info endpoint
ClosedPublic
Actions

Authored by bartek on Mar 20 2025, 4:02 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Apr 11, 4:19 AM
Unknown Object (File)
Fri, Apr 11, 3:48 AM
Unknown Object (File)
Thu, Apr 10, 2:32 PM
Unknown Object (File)
Thu, Apr 10, 9:15 AM
Unknown Object (File)
Mon, Apr 7, 11:15 AM
Unknown Object (File)
Sun, Apr 6, 3:33 PM
Unknown Object (File)
Fri, Apr 4, 6:34 PM
Unknown Object (File)
Wed, Apr 2, 4:43 AM
View All 33 Files
Subscribers
ashoat
tomek

Details

Reviewers
kamil
Commits
rCOMMbefb888d494e: [backup] Return keyserver device ID in latest backup info endpoint
Summary

Address server-side of ENG-10236. Implemented approach 2 from task comments.

Depends on D14466

Test Plan

Using Postman, called the endpoint for user with- and without keyserver. Verified that returned device ID matches my keyserver device ID.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

bartek created this revision.Mar 20 2025, 4:02 AM
bartek held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptMar 20 2025, 4:02 AM
bartek updated this revision to Diff 47478.Mar 20 2025, 4:10 AM

Add missing reference

Harbormaster failed remote builds in B33774: Diff 47478!Mar 20 2025, 4:22 AM
Harbormaster failed remote builds in B33773: Diff 47477!Mar 20 2025, 4:28 AM
bartek published this revision for review.Sun, Mar 23, 11:51 PM
bartek added inline comments.
shared/comm-lib/src/backup/mod.rs
15 ↗(On Diff #47477)

I missed committing this

bartek added a child revision: D14489: [lib][native] Add keyserverDeviceID to LatestBackupInfo.Mon, Mar 24, 3:30 AM
kamil accepted this revision.Mon, Mar 24, 3:56 AM
kamil added inline comments.
services/backup/src/identity/mod.rs
59 ↗(On Diff #47478)

If this is easy I would add tests for it, in e.g. identity_integration_tests.rs

This revision is now accepted and ready to land.Mon, Mar 24, 3:56 AM
bartek added inline comments.Mon, Mar 24, 6:07 AM
services/backup/src/identity/mod.rs
59 ↗(On Diff #47478)

We have test_device_list_multifetch which tests this RPC call

bartek updated this revision to Diff 47527.Mon, Mar 24, 6:08 AM

Add serde rename directive

Harbormaster failed remote builds in B33816: Diff 47527!Mon, Mar 24, 6:20 AM
This revision was landed with ongoing or failed builds.Mon, Mar 24, 6:55 AM
Closed by commit rCOMMbefb888d494e: [backup] Return keyserver device ID in latest backup info endpoint (authored by bartek). · Explain Why
This revision was automatically updated to reflect the committed changes.
bartek added a commit: rCOMMbefb888d494e: [backup] Return keyserver device ID in latest backup info endpoint.

Revision Contents
Changeset List

PathSize
native/
native_rust_library/
src/
3 lines
services/
backup/
src/
http/
handlers/
7 lines
identity/
52 lines
shared/
comm-lib/
src/
backup/
2 lines

Diff 47530

View Options

native/native_rust_library/src/backup.rs

#pragma once #pragma once
#include "../CryptoTools/Persist.h" #include "../CryptoTools/Persist.h"
#include "DatabaseQueryExecutor.h" #include "DatabaseQueryExecutor.h"
#include "entities/Draft.h" #include "entities/Draft.h"
#include "entities/KeyserverInfo.h" #include "entities/KeyserverInfo.h"
#include "entities/UserInfo.h" #include "entities/UserInfo.h"
#include "sqlite_orm.h"
#include <mutex> #include <mutex>
#include <string> #include <string>
namespace comm { namespace comm {
class SQLiteQueryExecutor : public DatabaseQueryExecutor { class SQLiteQueryExecutor : public DatabaseQueryExecutor {
static void migrate(); static void migrate();
static auto &getStorage(); static auto &getStorage();
static sqlite3 *getConnection();
static void closeConnection();
static std::once_flag initialized; static std::once_flag initialized;
static int sqlcipherEncryptionKeySize; static int sqlcipherEncryptionKeySize;
static std::string secureStoreEncryptionKeyID; static std::string secureStoreEncryptionKeyID;
static sqlite3 *dbConnection;
#ifndef EMSCRIPTEN #ifndef EMSCRIPTEN
static void assign_encryption_key(); static void assign_encryption_key();
#endif #endif
public: public:
static std::string sqliteFilePath; static std::string sqliteFilePath;
static std::string encryptionKey; static std::string encryptionKey;
SQLiteQueryExecutor(); SQLiteQueryExecutor();
~SQLiteQueryExecutor();
SQLiteQueryExecutor(std::string sqliteFilePath); SQLiteQueryExecutor(std::string sqliteFilePath);
std::unique_ptr<Thread> getThread(std::string threadID) const override; std::unique_ptr<Thread> getThread(std::string threadID) const override;
std::string getDraft(std::string key) const override; std::string getDraft(std::string key) const override;
void updateDraft(std::string key, std::string text) const override; void updateDraft(std::string key, std::string text) const override;
bool moveDraft(std::string oldKey, std::string newKey) const override; bool moveDraft(std::string oldKey, std::string newKey) const override;
std::vector<Draft> getAllDrafts() const override; std::vector<Draft> getAllDrafts() const override;
void removeAllDrafts() const override; void removeAllDrafts() const override;
void removeDrafts(const std::vector<std::string> &ids) const override; void removeDrafts(const std::vector<std::string> &ids) const override;
▲ Show 20 Lines • Show All 69 Lines • Show Last 20 Lines
View Options

services/backup/src/http/handlers/backup.rs

#pragma once #pragma once
#include "../CryptoTools/Persist.h" #include "../CryptoTools/Persist.h"
#include "DatabaseQueryExecutor.h" #include "DatabaseQueryExecutor.h"
#include "entities/Draft.h" #include "entities/Draft.h"
#include "entities/KeyserverInfo.h" #include "entities/KeyserverInfo.h"
#include "entities/UserInfo.h" #include "entities/UserInfo.h"
#include "sqlite_orm.h"
#include <mutex> #include <mutex>
#include <string> #include <string>
namespace comm { namespace comm {
class SQLiteQueryExecutor : public DatabaseQueryExecutor { class SQLiteQueryExecutor : public DatabaseQueryExecutor {
static void migrate(); static void migrate();
static auto &getStorage(); static auto &getStorage();
static sqlite3 *getConnection();
static void closeConnection();
static std::once_flag initialized; static std::once_flag initialized;
static int sqlcipherEncryptionKeySize; static int sqlcipherEncryptionKeySize;
static std::string secureStoreEncryptionKeyID; static std::string secureStoreEncryptionKeyID;
static sqlite3 *dbConnection;
#ifndef EMSCRIPTEN #ifndef EMSCRIPTEN
static void assign_encryption_key(); static void assign_encryption_key();
#endif #endif
public: public:
static std::string sqliteFilePath; static std::string sqliteFilePath;
static std::string encryptionKey; static std::string encryptionKey;
SQLiteQueryExecutor(); SQLiteQueryExecutor();
~SQLiteQueryExecutor();
SQLiteQueryExecutor(std::string sqliteFilePath); SQLiteQueryExecutor(std::string sqliteFilePath);
std::unique_ptr<Thread> getThread(std::string threadID) const override; std::unique_ptr<Thread> getThread(std::string threadID) const override;
std::string getDraft(std::string key) const override; std::string getDraft(std::string key) const override;
void updateDraft(std::string key, std::string text) const override; void updateDraft(std::string key, std::string text) const override;
bool moveDraft(std::string oldKey, std::string newKey) const override; bool moveDraft(std::string oldKey, std::string newKey) const override;
std::vector<Draft> getAllDrafts() const override; std::vector<Draft> getAllDrafts() const override;
void removeAllDrafts() const override; void removeAllDrafts() const override;
void removeDrafts(const std::vector<std::string> &ids) const override; void removeDrafts(const std::vector<std::string> &ids) const override;
▲ Show 20 Lines • Show All 69 Lines • Show Last 20 Lines
View Options

services/backup/src/identity/mod.rs

#pragma once #pragma once
#include "../CryptoTools/Persist.h" #include "../CryptoTools/Persist.h"
#include "DatabaseQueryExecutor.h" #include "DatabaseQueryExecutor.h"
#include "entities/Draft.h" #include "entities/Draft.h"
#include "entities/KeyserverInfo.h" #include "entities/KeyserverInfo.h"
#include "entities/UserInfo.h" #include "entities/UserInfo.h"
#include "sqlite_orm.h"
#include <mutex> #include <mutex>
#include <string> #include <string>
namespace comm { namespace comm {
class SQLiteQueryExecutor : public DatabaseQueryExecutor { class SQLiteQueryExecutor : public DatabaseQueryExecutor {
static void migrate(); static void migrate();
static auto &getStorage(); static auto &getStorage();
static sqlite3 *getConnection();
static void closeConnection();
static std::once_flag initialized; static std::once_flag initialized;
static int sqlcipherEncryptionKeySize; static int sqlcipherEncryptionKeySize;
static std::string secureStoreEncryptionKeyID; static std::string secureStoreEncryptionKeyID;
static sqlite3 *dbConnection;
#ifndef EMSCRIPTEN #ifndef EMSCRIPTEN
static void assign_encryption_key(); static void assign_encryption_key();
#endif #endif
public: public:
static std::string sqliteFilePath; static std::string sqliteFilePath;
static std::string encryptionKey; static std::string encryptionKey;
SQLiteQueryExecutor(); SQLiteQueryExecutor();
~SQLiteQueryExecutor();
SQLiteQueryExecutor(std::string sqliteFilePath); SQLiteQueryExecutor(std::string sqliteFilePath);
std::unique_ptr<Thread> getThread(std::string threadID) const override; std::unique_ptr<Thread> getThread(std::string threadID) const override;
std::string getDraft(std::string key) const override; std::string getDraft(std::string key) const override;
void updateDraft(std::string key, std::string text) const override; void updateDraft(std::string key, std::string text) const override;
bool moveDraft(std::string oldKey, std::string newKey) const override; bool moveDraft(std::string oldKey, std::string newKey) const override;
std::vector<Draft> getAllDrafts() const override; std::vector<Draft> getAllDrafts() const override;
void removeAllDrafts() const override; void removeAllDrafts() const override;
void removeDrafts(const std::vector<std::string> &ids) const override; void removeDrafts(const std::vector<std::string> &ids) const override;
▲ Show 20 Lines • Show All 69 Lines • Show Last 20 Lines
View Options

shared/comm-lib/src/backup/mod.rs

#pragma once #pragma once
#include "../CryptoTools/Persist.h" #include "../CryptoTools/Persist.h"
#include "DatabaseQueryExecutor.h" #include "DatabaseQueryExecutor.h"
#include "entities/Draft.h" #include "entities/Draft.h"
#include "entities/KeyserverInfo.h" #include "entities/KeyserverInfo.h"
#include "entities/UserInfo.h" #include "entities/UserInfo.h"
#include "sqlite_orm.h"
#include <mutex> #include <mutex>
#include <string> #include <string>
namespace comm { namespace comm {
class SQLiteQueryExecutor : public DatabaseQueryExecutor { class SQLiteQueryExecutor : public DatabaseQueryExecutor {
static void migrate(); static void migrate();
static auto &getStorage(); static auto &getStorage();
static sqlite3 *getConnection();
static void closeConnection();
static std::once_flag initialized; static std::once_flag initialized;
static int sqlcipherEncryptionKeySize; static int sqlcipherEncryptionKeySize;
static std::string secureStoreEncryptionKeyID; static std::string secureStoreEncryptionKeyID;
static sqlite3 *dbConnection;
#ifndef EMSCRIPTEN #ifndef EMSCRIPTEN
static void assign_encryption_key(); static void assign_encryption_key();
#endif #endif
public: public:
static std::string sqliteFilePath; static std::string sqliteFilePath;
static std::string encryptionKey; static std::string encryptionKey;
SQLiteQueryExecutor(); SQLiteQueryExecutor();
~SQLiteQueryExecutor();
SQLiteQueryExecutor(std::string sqliteFilePath); SQLiteQueryExecutor(std::string sqliteFilePath);
std::unique_ptr<Thread> getThread(std::string threadID) const override; std::unique_ptr<Thread> getThread(std::string threadID) const override;
std::string getDraft(std::string key) const override; std::string getDraft(std::string key) const override;
void updateDraft(std::string key, std::string text) const override; void updateDraft(std::string key, std::string text) const override;
bool moveDraft(std::string oldKey, std::string newKey) const override; bool moveDraft(std::string oldKey, std::string newKey) const override;
std::vector<Draft> getAllDrafts() const override; std::vector<Draft> getAllDrafts() const override;
void removeAllDrafts() const override; void removeAllDrafts() const override;
void removeDrafts(const std::vector<std::string> &ids) const override; void removeDrafts(const std::vector<std::string> &ids) const override;
▲ Show 20 Lines • Show All 69 Lines • Show Last 20 Lines