Merge pull request #1583 from oxen-io/feature/blinded-version
Feature/blinded versionpull/1588/head
ThomasSession
8 months ago
committed by
GitHub
commit
fc4bf6ff27
@ -0,0 +1,68 @@
|
||||
package org.thoughtcrime.securesms.util
|
||||
|
||||
import android.os.Handler
|
||||
import android.os.Looper
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.Job
|
||||
import kotlinx.coroutines.launch
|
||||
import org.session.libsession.messaging.file_server.FileServerApi
|
||||
import org.session.libsession.utilities.TextSecurePreferences
|
||||
import org.session.libsignal.utilities.Log
|
||||
import java.util.concurrent.TimeUnit
|
||||
|
||||
class VersionUtil(
|
||||
private val prefs: TextSecurePreferences
|
||||
) {
|
||||
private val TAG: String = VersionUtil::class.java.simpleName
|
||||
private val FOUR_HOURS: Long = TimeUnit.HOURS.toMillis(4)
|
||||
|
||||
private val handler = Handler(Looper.getMainLooper())
|
||||
private val runnable: Runnable
|
||||
|
||||
private val scope = CoroutineScope(Dispatchers.Default)
|
||||
private var job: Job? = null
|
||||
|
||||
init {
|
||||
runnable = Runnable {
|
||||
fetchAndScheduleNextVersionCheck()
|
||||
}
|
||||
}
|
||||
|
||||
fun startTimedVersionCheck() {
|
||||
handler.post(runnable)
|
||||
}
|
||||
|
||||
fun stopTimedVersionCheck() {
|
||||
handler.removeCallbacks(runnable)
|
||||
}
|
||||
|
||||
fun clear() {
|
||||
job?.cancel()
|
||||
stopTimedVersionCheck()
|
||||
}
|
||||
|
||||
private fun fetchAndScheduleNextVersionCheck() {
|
||||
fetchVersionData()
|
||||
handler.postDelayed(runnable, FOUR_HOURS)
|
||||
}
|
||||
|
||||
private fun fetchVersionData() {
|
||||
// only perform this if at least 4h has elapsed since th last successful check
|
||||
val lastCheck = System.currentTimeMillis() - prefs.getLastVersionCheck()
|
||||
if (lastCheck < FOUR_HOURS) return
|
||||
|
||||
job?.cancel()
|
||||
job = scope.launch {
|
||||
try {
|
||||
// perform the version check
|
||||
val clientVersion = FileServerApi.getClientVersion()
|
||||
Log.i(TAG, "Fetched version data: $clientVersion")
|
||||
prefs.setLastVersionCheck()
|
||||
} catch (e: Exception) {
|
||||
// we can silently ignore the error
|
||||
Log.e(TAG, "Error fetching version data: $e")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
#include <jni.h>
|
||||
#include <session/blinding.hpp>
|
||||
|
||||
#include "util.h"
|
||||
#include "jni_utils.h"
|
||||
|
||||
//
|
||||
// Created by Thomas Ruffie on 29/7/2024.
|
||||
//
|
||||
|
||||
extern "C"
|
||||
JNIEXPORT jobject JNICALL
|
||||
Java_network_loki_messenger_libsession_1util_util_BlindKeyAPI_blindVersionKeyPair(JNIEnv *env,
|
||||
jobject thiz,
|
||||
jbyteArray ed25519_secret_key) {
|
||||
return jni_utils::run_catching_cxx_exception_or_throws<jobject>(env, [=] {
|
||||
const auto [pk, sk] = session::blind_version_key_pair(util::ustring_from_bytes(env, ed25519_secret_key));
|
||||
|
||||
jclass kp_class = env->FindClass("network/loki/messenger/libsession_util/util/KeyPair");
|
||||
jmethodID kp_constructor = env->GetMethodID(kp_class, "<init>", "([B[B)V");
|
||||
return env->NewObject(kp_class, kp_constructor, util::bytes_from_ustring(env, {pk.data(), pk.size()}), util::bytes_from_ustring(env, {sk.data(), sk.size()}));
|
||||
});
|
||||
}
|
||||
extern "C"
|
||||
JNIEXPORT jbyteArray JNICALL
|
||||
Java_network_loki_messenger_libsession_1util_util_BlindKeyAPI_blindVersionSign(JNIEnv *env,
|
||||
jobject thiz,
|
||||
jbyteArray ed25519_secret_key,
|
||||
jlong timestamp) {
|
||||
return jni_utils::run_catching_cxx_exception_or_throws<jbyteArray>(env, [=] {
|
||||
auto bytes = session::blind_version_sign(util::ustring_from_bytes(env, ed25519_secret_key), session::Platform::android, timestamp);
|
||||
return util::bytes_from_ustring(env, bytes);
|
||||
});
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package network.loki.messenger.libsession_util.util
|
||||
|
||||
object BlindKeyAPI {
|
||||
private val loadLibrary by lazy {
|
||||
System.loadLibrary("session_util")
|
||||
}
|
||||
|
||||
init {
|
||||
// Ensure the library is loaded at initialization
|
||||
loadLibrary
|
||||
}
|
||||
|
||||
external fun blindVersionKeyPair(ed25519SecretKey: ByteArray): KeyPair
|
||||
external fun blindVersionSign(ed25519SecretKey: ByteArray, timestamp: Long): ByteArray
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
package org.session.libsession.messaging.file_server
|
||||
|
||||
data class VersionData(
|
||||
val statusCode: Int, // The value 200. Included for backwards compatibility, and may be removed someday.
|
||||
val version: String, // The Session version.
|
||||
val updated: Double // The unix timestamp when this version was retrieved from Github; this can be up to 24 hours ago in case of consistent fetch errors, though normally will be within the last 30 minutes.
|
||||
)
|
||||
@ -0,0 +1,13 @@
|
||||
package org.session.libsession.snode.utilities
|
||||
|
||||
import nl.komponents.kovenant.Promise
|
||||
import kotlin.coroutines.resume
|
||||
import kotlin.coroutines.resumeWithException
|
||||
import kotlin.coroutines.suspendCoroutine
|
||||
|
||||
suspend fun <T, E: Throwable> Promise<T, E>.await(): T {
|
||||
return suspendCoroutine { cont ->
|
||||
success(cont::resume)
|
||||
fail(cont::resumeWithException)
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue