Page MenuHomePhabricator
Differential D9074

[client-backup] extract logic for getting primary identity public key
ClosedPublic
Actions

Authored by kamil on Sep 4 2023, 1:53 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Mar 16, 11:25 PM
Unknown Object (File)
Thu, Mar 6, 9:34 AM
Unknown Object (File)
Thu, Mar 6, 9:34 AM
Unknown Object (File)
Thu, Mar 6, 9:34 AM
Unknown Object (File)
Thu, Mar 6, 9:34 AM
Unknown Object (File)
Thu, Mar 6, 9:34 AM
Unknown Object (File)
Thu, Mar 6, 9:33 AM
Unknown Object (File)
Thu, Mar 6, 9:28 AM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
michal
marcin
bartek
Commits
rCOMM567c03b1e045: [client-backup] extract logic for getting primary identity public key
Summary

This code is duplicated and will be duplicated, so wrapping this in one function.

Depends on D9001

Test Plan

Verify function result is correct (SIWE login)

Diff Detail

Repository
rCOMM Comm
Branch
land-client-backup
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

kamil created this revision.Sep 4 2023, 1:53 AM
kamil held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptSep 4 2023, 1:53 AM
kamil updated this revision to Diff 30730.Sep 4 2023, 1:54 AM

remove await

kamil updated this revision to Diff 30731.Sep 4 2023, 1:55 AM

fix typo

Harbormaster failed remote builds in B22362: Diff 30729!Sep 4 2023, 2:04 AM
Harbormaster failed remote builds in B22363: Diff 30730!
Harbormaster completed remote builds in B22364: Diff 30731.Sep 4 2023, 2:12 AM
kamil added a child revision: D9002: [client-backup] implement initial restore backup protocol.Sep 4 2023, 3:00 AM
kamil published this revision for review.Sep 4 2023, 3:02 AM
kamil mentioned this in D9001: [client-backup] implement initial backup protocol.
marcin requested changes to this revision.Sep 5 2023, 1:48 AM
  1. Primary keyword is not valid when talking about the "main" olm account - the convention is to use Content keyword.
  2. Identity keyword refers to curve25519. ed25519 is signing key.

That said the correct name for this function is getContentSigningKey. This is not a nit - this is important to stick to this naming convention as those keys are used across different programming languages.

This revision now requires changes to proceed.Sep 5 2023, 1:48 AM
kamil updated this revision to Diff 30742.Sep 5 2023, 2:09 AM

rename to getContentSigningKey

marcin accepted this revision.Sep 5 2023, 2:22 AM
marcin added inline comments.
native/account/siwe-panel.react.js
83 ↗(On Diff #30742)

If it doesn't takie to much effort it would be nice to rename this function as well as it looks like naming discrepancy from the first sight.

This revision is now accepted and ready to land.Sep 5 2023, 2:22 AM
Harbormaster completed remote builds in B22375: Diff 30742.Sep 5 2023, 2:27 AM
Closed by commit rCOMM567c03b1e045: [client-backup] extract logic for getting primary identity public key (authored by kamil). · Explain WhySep 5 2023, 5:13 AM
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMM567c03b1e045: [client-backup] extract logic for getting primary identity public key.

Revision Contents
Changeset List

PathSize
native/
account/
7 lines
backup/
15 lines
utils/
10 lines

Diff 30731

View Options

native/account/siwe-panel.react.js

Show First 20 Lines • Show All 74 Lines • ▼ Show 20 Linesif(
CMAKE_ANDROID_ARCH_ABI STREQUAL arm64-v8a OR CMAKE_ANDROID_ARCH_ABI STREQUAL arm64-v8a OR
CMAKE_ANDROID_ARCH_ABI STREQUAL armeabi-v7a CMAKE_ANDROID_ARCH_ABI STREQUAL armeabi-v7a
) )
set(HAVE_EXECINFO_H OFF CACHE BOOL "Whether platform has execinfo.h") set(HAVE_EXECINFO_H OFF CACHE BOOL "Whether platform has execinfo.h")
endif() endif()
add_subdirectory(${_third_party_dir}/glog/glog-${GLOG_VERSION}/) add_subdirectory(${_third_party_dir}/glog/glog-${GLOG_VERSION}/)
file(GLOB LIBRN_DIR "${REACT_NATIVE_SO_DIR}/${ANDROID_ABI}")
if (NOT LIBRN_DIR)
# If /${ANDROID_ABI} dir not found, then ${REACT_NATIVE_SO_DIR} is probably:
# ReactAndroid/build/react-ndk/exported
file(GLOB LIBRN_DIR "${REACT_NATIVE_SO_DIR}")
endif ()
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/folly-target.cmake)
add_subdirectory(../../node_modules/olm ./build) add_subdirectory(../../node_modules/olm ./build)
set(_node_modules_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../node_modules) set(_node_modules_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../node_modules)
set(_react_native_dir ${_node_modules_dir}/react-native) set(_react_native_dir ${_node_modules_dir}/react-native)
file(GLOB SQLCIPHER file(GLOB SQLCIPHER
"${_node_modules_dir}/@commapp/sqlcipher-amalgamation/src/*.c" "${_node_modules_dir}/@commapp/sqlcipher-amalgamation/src/*.c"
) )
▲ Show 20 Lines • Show All 57 Lines • ▼ Show 20 Linestarget_include_directories(
# SQLite ORM # SQLite ORM
../../cpp/third-party/sqlite_orm ../../cpp/third-party/sqlite_orm
# symlinked React Native headers # symlinked React Native headers
../headers ../headers
# external libs # external libs
${_third_party_dir}/folly
${_third_party_dir}/boost/boost_${BOOST_VERSION} ${_third_party_dir}/boost/boost_${BOOST_VERSION}
${_third_party_dir}/double-conversion ${_third_party_dir}/double-conversion
# comm android specific code # comm android specific code
./src/cpp ./src/cpp
# comm native mutual code # comm native mutual code
../../cpp/CommonCpp/ ../../cpp/CommonCpp/
../../cpp/CommonCpp/NativeModules ../../cpp/CommonCpp/NativeModules
../../cpp/CommonCpp/NativeModules/InternalModules ../../cpp/CommonCpp/NativeModules/InternalModules
../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities ../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities
../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/ThreadOperationsUtilities ../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/ThreadOperationsUtilities
../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities ../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities
../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities/MessageSpecs ../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities/MessageSpecs
../../cpp/CommonCpp/DatabaseManagers ../../cpp/CommonCpp/DatabaseManagers
../../cpp/CommonCpp/Tools ../../cpp/CommonCpp/Tools
# native rust library # native rust library
${native_rust_library_include_dir} ${native_rust_library_include_dir}
) )
file(GLOB LIBRN_DIR "${REACT_NATIVE_SO_DIR}/${ANDROID_ABI}")
if (NOT LIBRN_DIR)
# If /${ANDROID_ABI} dir not found, then ${REACT_NATIVE_SO_DIR} is probably:
# ReactAndroid/build/react-ndk/exported
file(GLOB LIBRN_DIR "${REACT_NATIVE_SO_DIR}")
endif ()
find_library(
folly-lib
folly_runtime
PATHS ${LIBRN_DIR}
NO_CMAKE_FIND_ROOT_PATH
)
target_compile_options(
${PACKAGE_NAME}
PRIVATE -DFOLLY_NO_CONFIG=1
-DFOLLY_HAVE_CLOCK_GETTIME=1
-DFOLLY_HAVE_MEMRCHR=1
-DFOLLY_USE_LIBCPP=1
-DFOLLY_MOBILE=1
)
add_definitions( add_definitions(
# SQLCipher # SQLCipher
-DSQLITE_THREADSAFE=0 -DSQLITE_THREADSAFE=0
-DSQLITE_HAS_CODEC -DSQLITE_HAS_CODEC
-DSQLITE_TEMP_STORE=2 -DSQLITE_TEMP_STORE=2
-DSQLCIPHER_CRYPTO_OPENSSL -DSQLCIPHER_CRYPTO_OPENSSL
) )
Show All 27 Linesset_target_properties(
"${_third_party_dir}/openssl/openssl-${OPENSSL_VERSION}/build/${CMAKE_ANDROID_ARCH_ABI}/lib/libssl.a" "${_third_party_dir}/openssl/openssl-${OPENSSL_VERSION}/build/${CMAKE_ANDROID_ARCH_ABI}/lib/libssl.a"
) )
target_link_libraries( target_link_libraries(
${PACKAGE_NAME} ${PACKAGE_NAME}
fbjni::fbjni fbjni::fbjni
android android
${log-lib} ${log-lib}
${folly-lib} Folly::folly
glog::glog glog::glog
olm olm
openssl-crypto openssl-crypto
openssl-ssl openssl-ssl
comm::native_rust_library comm::native_rust_library
) )
# add a dummy library which is required by CallInvokerHolderImpl.java # add a dummy library which is required by CallInvokerHolderImpl.java
add_library( add_library(
turbomodulejsijni turbomodulejsijni
# Sets the library as a shared library. # Sets the library as a shared library.
SHARED SHARED
# Provides a relative path to your source file(s). # Provides a relative path to your source file(s).
./src/cpp/dummy.cpp ./src/cpp/dummy.cpp
) )
View Options

native/backup/use-client-backup.js

Show First 20 Lines • Show All 74 Lines • ▼ Show 20 Linesif(
CMAKE_ANDROID_ARCH_ABI STREQUAL arm64-v8a OR CMAKE_ANDROID_ARCH_ABI STREQUAL arm64-v8a OR
CMAKE_ANDROID_ARCH_ABI STREQUAL armeabi-v7a CMAKE_ANDROID_ARCH_ABI STREQUAL armeabi-v7a
) )
set(HAVE_EXECINFO_H OFF CACHE BOOL "Whether platform has execinfo.h") set(HAVE_EXECINFO_H OFF CACHE BOOL "Whether platform has execinfo.h")
endif() endif()
add_subdirectory(${_third_party_dir}/glog/glog-${GLOG_VERSION}/) add_subdirectory(${_third_party_dir}/glog/glog-${GLOG_VERSION}/)
file(GLOB LIBRN_DIR "${REACT_NATIVE_SO_DIR}/${ANDROID_ABI}")
if (NOT LIBRN_DIR)
# If /${ANDROID_ABI} dir not found, then ${REACT_NATIVE_SO_DIR} is probably:
# ReactAndroid/build/react-ndk/exported
file(GLOB LIBRN_DIR "${REACT_NATIVE_SO_DIR}")
endif ()
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/folly-target.cmake)
add_subdirectory(../../node_modules/olm ./build) add_subdirectory(../../node_modules/olm ./build)
set(_node_modules_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../node_modules) set(_node_modules_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../node_modules)
set(_react_native_dir ${_node_modules_dir}/react-native) set(_react_native_dir ${_node_modules_dir}/react-native)
file(GLOB SQLCIPHER file(GLOB SQLCIPHER
"${_node_modules_dir}/@commapp/sqlcipher-amalgamation/src/*.c" "${_node_modules_dir}/@commapp/sqlcipher-amalgamation/src/*.c"
) )
▲ Show 20 Lines • Show All 57 Lines • ▼ Show 20 Linestarget_include_directories(
# SQLite ORM # SQLite ORM
../../cpp/third-party/sqlite_orm ../../cpp/third-party/sqlite_orm
# symlinked React Native headers # symlinked React Native headers
../headers ../headers
# external libs # external libs
${_third_party_dir}/folly
${_third_party_dir}/boost/boost_${BOOST_VERSION} ${_third_party_dir}/boost/boost_${BOOST_VERSION}
${_third_party_dir}/double-conversion ${_third_party_dir}/double-conversion
# comm android specific code # comm android specific code
./src/cpp ./src/cpp
# comm native mutual code # comm native mutual code
../../cpp/CommonCpp/ ../../cpp/CommonCpp/
../../cpp/CommonCpp/NativeModules ../../cpp/CommonCpp/NativeModules
../../cpp/CommonCpp/NativeModules/InternalModules ../../cpp/CommonCpp/NativeModules/InternalModules
../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities ../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities
../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/ThreadOperationsUtilities ../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/ThreadOperationsUtilities
../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities ../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities
../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities/MessageSpecs ../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities/MessageSpecs
../../cpp/CommonCpp/DatabaseManagers ../../cpp/CommonCpp/DatabaseManagers
../../cpp/CommonCpp/Tools ../../cpp/CommonCpp/Tools
# native rust library # native rust library
${native_rust_library_include_dir} ${native_rust_library_include_dir}
) )
file(GLOB LIBRN_DIR "${REACT_NATIVE_SO_DIR}/${ANDROID_ABI}")
if (NOT LIBRN_DIR)
# If /${ANDROID_ABI} dir not found, then ${REACT_NATIVE_SO_DIR} is probably:
# ReactAndroid/build/react-ndk/exported
file(GLOB LIBRN_DIR "${REACT_NATIVE_SO_DIR}")
endif ()
find_library(
folly-lib
folly_runtime
PATHS ${LIBRN_DIR}
NO_CMAKE_FIND_ROOT_PATH
)
target_compile_options(
${PACKAGE_NAME}
PRIVATE -DFOLLY_NO_CONFIG=1
-DFOLLY_HAVE_CLOCK_GETTIME=1
-DFOLLY_HAVE_MEMRCHR=1
-DFOLLY_USE_LIBCPP=1
-DFOLLY_MOBILE=1
)
add_definitions( add_definitions(
# SQLCipher # SQLCipher
-DSQLITE_THREADSAFE=0 -DSQLITE_THREADSAFE=0
-DSQLITE_HAS_CODEC -DSQLITE_HAS_CODEC
-DSQLITE_TEMP_STORE=2 -DSQLITE_TEMP_STORE=2
-DSQLCIPHER_CRYPTO_OPENSSL -DSQLCIPHER_CRYPTO_OPENSSL
) )
Show All 27 Linesset_target_properties(
"${_third_party_dir}/openssl/openssl-${OPENSSL_VERSION}/build/${CMAKE_ANDROID_ARCH_ABI}/lib/libssl.a" "${_third_party_dir}/openssl/openssl-${OPENSSL_VERSION}/build/${CMAKE_ANDROID_ARCH_ABI}/lib/libssl.a"
) )
target_link_libraries( target_link_libraries(
${PACKAGE_NAME} ${PACKAGE_NAME}
fbjni::fbjni fbjni::fbjni
android android
${log-lib} ${log-lib}
${folly-lib} Folly::folly
glog::glog glog::glog
olm olm
openssl-crypto openssl-crypto
openssl-ssl openssl-ssl
comm::native_rust_library comm::native_rust_library
) )
# add a dummy library which is required by CallInvokerHolderImpl.java # add a dummy library which is required by CallInvokerHolderImpl.java
add_library( add_library(
turbomodulejsijni turbomodulejsijni
# Sets the library as a shared library. # Sets the library as a shared library.
SHARED SHARED
# Provides a relative path to your source file(s). # Provides a relative path to your source file(s).
./src/cpp/dummy.cpp ./src/cpp/dummy.cpp
) )
View Options

native/utils/crypto-utils.js

Show First 20 Lines • Show All 74 Lines • ▼ Show 20 Linesif(
CMAKE_ANDROID_ARCH_ABI STREQUAL arm64-v8a OR CMAKE_ANDROID_ARCH_ABI STREQUAL arm64-v8a OR
CMAKE_ANDROID_ARCH_ABI STREQUAL armeabi-v7a CMAKE_ANDROID_ARCH_ABI STREQUAL armeabi-v7a
) )
set(HAVE_EXECINFO_H OFF CACHE BOOL "Whether platform has execinfo.h") set(HAVE_EXECINFO_H OFF CACHE BOOL "Whether platform has execinfo.h")
endif() endif()
add_subdirectory(${_third_party_dir}/glog/glog-${GLOG_VERSION}/) add_subdirectory(${_third_party_dir}/glog/glog-${GLOG_VERSION}/)
file(GLOB LIBRN_DIR "${REACT_NATIVE_SO_DIR}/${ANDROID_ABI}")
if (NOT LIBRN_DIR)
# If /${ANDROID_ABI} dir not found, then ${REACT_NATIVE_SO_DIR} is probably:
# ReactAndroid/build/react-ndk/exported
file(GLOB LIBRN_DIR "${REACT_NATIVE_SO_DIR}")
endif ()
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/folly-target.cmake)
add_subdirectory(../../node_modules/olm ./build) add_subdirectory(../../node_modules/olm ./build)
set(_node_modules_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../node_modules) set(_node_modules_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../node_modules)
set(_react_native_dir ${_node_modules_dir}/react-native) set(_react_native_dir ${_node_modules_dir}/react-native)
file(GLOB SQLCIPHER file(GLOB SQLCIPHER
"${_node_modules_dir}/@commapp/sqlcipher-amalgamation/src/*.c" "${_node_modules_dir}/@commapp/sqlcipher-amalgamation/src/*.c"
) )
▲ Show 20 Lines • Show All 57 Lines • ▼ Show 20 Linestarget_include_directories(
# SQLite ORM # SQLite ORM
../../cpp/third-party/sqlite_orm ../../cpp/third-party/sqlite_orm
# symlinked React Native headers # symlinked React Native headers
../headers ../headers
# external libs # external libs
${_third_party_dir}/folly
${_third_party_dir}/boost/boost_${BOOST_VERSION} ${_third_party_dir}/boost/boost_${BOOST_VERSION}
${_third_party_dir}/double-conversion ${_third_party_dir}/double-conversion
# comm android specific code # comm android specific code
./src/cpp ./src/cpp
# comm native mutual code # comm native mutual code
../../cpp/CommonCpp/ ../../cpp/CommonCpp/
../../cpp/CommonCpp/NativeModules ../../cpp/CommonCpp/NativeModules
../../cpp/CommonCpp/NativeModules/InternalModules ../../cpp/CommonCpp/NativeModules/InternalModules
../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities ../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities
../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/ThreadOperationsUtilities ../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/ThreadOperationsUtilities
../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities ../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities
../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities/MessageSpecs ../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities/MessageSpecs
../../cpp/CommonCpp/DatabaseManagers ../../cpp/CommonCpp/DatabaseManagers
../../cpp/CommonCpp/Tools ../../cpp/CommonCpp/Tools
# native rust library # native rust library
${native_rust_library_include_dir} ${native_rust_library_include_dir}
) )
file(GLOB LIBRN_DIR "${REACT_NATIVE_SO_DIR}/${ANDROID_ABI}")
if (NOT LIBRN_DIR)
# If /${ANDROID_ABI} dir not found, then ${REACT_NATIVE_SO_DIR} is probably:
# ReactAndroid/build/react-ndk/exported
file(GLOB LIBRN_DIR "${REACT_NATIVE_SO_DIR}")
endif ()
find_library(
folly-lib
folly_runtime
PATHS ${LIBRN_DIR}
NO_CMAKE_FIND_ROOT_PATH
)
target_compile_options(
${PACKAGE_NAME}
PRIVATE -DFOLLY_NO_CONFIG=1
-DFOLLY_HAVE_CLOCK_GETTIME=1
-DFOLLY_HAVE_MEMRCHR=1
-DFOLLY_USE_LIBCPP=1
-DFOLLY_MOBILE=1
)
add_definitions( add_definitions(
# SQLCipher # SQLCipher
-DSQLITE_THREADSAFE=0 -DSQLITE_THREADSAFE=0
-DSQLITE_HAS_CODEC -DSQLITE_HAS_CODEC
-DSQLITE_TEMP_STORE=2 -DSQLITE_TEMP_STORE=2
-DSQLCIPHER_CRYPTO_OPENSSL -DSQLCIPHER_CRYPTO_OPENSSL
) )
Show All 27 Linesset_target_properties(
"${_third_party_dir}/openssl/openssl-${OPENSSL_VERSION}/build/${CMAKE_ANDROID_ARCH_ABI}/lib/libssl.a" "${_third_party_dir}/openssl/openssl-${OPENSSL_VERSION}/build/${CMAKE_ANDROID_ARCH_ABI}/lib/libssl.a"
) )
target_link_libraries( target_link_libraries(
${PACKAGE_NAME} ${PACKAGE_NAME}
fbjni::fbjni fbjni::fbjni
android android
${log-lib} ${log-lib}
${folly-lib} Folly::folly
glog::glog glog::glog
olm olm
openssl-crypto openssl-crypto
openssl-ssl openssl-ssl
comm::native_rust_library comm::native_rust_library
) )
# add a dummy library which is required by CallInvokerHolderImpl.java # add a dummy library which is required by CallInvokerHolderImpl.java
add_library( add_library(
turbomodulejsijni turbomodulejsijni
# Sets the library as a shared library. # Sets the library as a shared library.
SHARED SHARED
# Provides a relative path to your source file(s). # Provides a relative path to your source file(s).
./src/cpp/dummy.cpp ./src/cpp/dummy.cpp
) )