Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-24 10:51:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update libsignal to 0.65.0

Browse Source
This commit is contained in:
Greyson Parrelli
2025-01-09 11:39:34 -05:00
parent ef71410eaf
commit 6487fbe687
415 changed files with 181 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

204
libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV3.kt
View File

@@ -9,15 +9,8 @@ import com.fasterxml.jackson.annotation.JsonProperty
import com.fasterxml.jackson.databind.annotation.JsonDeserialize
import com.fasterxml.jackson.databind.annotation.JsonSerialize
import org.signal.core.util.logging.Log
import org.signal.libsignal.attest.AttestationFailedException
import org.signal.libsignal.net.EnclaveAuth
import org.signal.libsignal.net.Network
import org.signal.libsignal.net.NetworkException
import org.signal.libsignal.sgxsession.SgxCommunicationFailureException
import org.signal.libsignal.svr.DataMissingException
import org.signal.libsignal.svr.RestoreFailedException
import org.whispersystems.signalservice.api.kbs.MasterKey
import org.whispersystems.signalservice.api.kbs.PinHashUtil
import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException
import org.whispersystems.signalservice.api.svr.SecureValueRecovery.BackupResponse
import org.whispersystems.signalservice.api.svr.SecureValueRecovery.DeleteResponse
@@ -30,8 +23,6 @@ import org.whispersystems.signalservice.internal.push.ByteArraySerializerBase64N
import org.whispersystems.signalservice.internal.push.PushServiceSocket
import org.whispersystems.signalservice.internal.util.JsonUtil
import java.io.IOException
import java.util.concurrent.CancellationException
import java.util.concurrent.ExecutionException
/**
* An interface for working with V3 of the Secure Value Recovery service.
@@ -86,34 +77,35 @@ class SecureValueRecoveryV3(
* There's no concept of "deleting" data with SVR3.
*/
override fun deleteData(): DeleteResponse {
val authorization: Svr3Credentials = try {
pushServiceSocket.svr3Authorization
} catch (e: NonSuccessfulResponseCodeException) {
return DeleteResponse.ApplicationError(e)
} catch (e: IOException) {
return DeleteResponse.NetworkError(e)
} catch (e: Exception) {
return DeleteResponse.ApplicationError(e)
}
val enclaveAuth = EnclaveAuth(authorization.username, authorization.password)
return try {
network.svr3().remove(enclaveAuth).get()
DeleteResponse.Success
} catch (e: ExecutionException) {
when (val cause = e.cause) {
is NetworkException -> DeleteResponse.NetworkError(cause)
is AttestationFailedException -> DeleteResponse.ApplicationError(cause)
is SgxCommunicationFailureException -> DeleteResponse.ApplicationError(cause)
is IOException -> DeleteResponse.NetworkError(cause)
else -> DeleteResponse.ApplicationError(cause ?: RuntimeException("Unknown!"))
}
} catch (e: InterruptedException) {
DeleteResponse.ApplicationError(e)
} catch (e: CancellationException) {
DeleteResponse.ApplicationError(e)
}
throw UnsupportedOperationException("SVR3 disabled for now")
// val authorization: Svr3Credentials = try {
// pushServiceSocket.svr3Authorization
// } catch (e: NonSuccessfulResponseCodeException) {
// return DeleteResponse.ApplicationError(e)
// } catch (e: IOException) {
// return DeleteResponse.NetworkError(e)
// } catch (e: Exception) {
// return DeleteResponse.ApplicationError(e)
// }
//
// val enclaveAuth = EnclaveAuth(authorization.username, authorization.password)
//
// return try {
// network.svr3().remove(enclaveAuth).get()
// DeleteResponse.Success
// } catch (e: ExecutionException) {
// when (val cause = e.cause) {
// is NetworkException -> DeleteResponse.NetworkError(cause)
// is AttestationFailedException -> DeleteResponse.ApplicationError(cause)
// is SgxCommunicationFailureException -> DeleteResponse.ApplicationError(cause)
// is IOException -> DeleteResponse.NetworkError(cause)
// else -> DeleteResponse.ApplicationError(cause ?: RuntimeException("Unknown!"))
// }
// } catch (e: InterruptedException) {
// DeleteResponse.ApplicationError(e)
// } catch (e: CancellationException) {
// DeleteResponse.ApplicationError(e)
// }
}
@Throws(IOException::class)
@@ -126,33 +118,34 @@ class SecureValueRecoveryV3(
}
private fun restoreData(authorization: AuthCredentials, shareSet: ByteArray?, userPin: String): RestoreResponse {
if (shareSet == null) {
Log.w(TAG, "No share set provided! Assuming no data to restore.")
return RestoreResponse.Missing
}
val normalizedPin: String = PinHashUtil.normalizeToString(userPin)
val enclaveAuth = EnclaveAuth(authorization.username(), authorization.password())
return try {
val result = network.svr3().restore(normalizedPin, shareSet, enclaveAuth).get()
val masterKey = MasterKey(result.value)
RestoreResponse.Success(masterKey, authorization)
} catch (e: ExecutionException) {
when (val cause = e.cause) {
is NetworkException -> RestoreResponse.NetworkError(cause)
is DataMissingException -> RestoreResponse.Missing
is RestoreFailedException -> RestoreResponse.PinMismatch(cause.triesRemaining)
is AttestationFailedException -> RestoreResponse.ApplicationError(cause)
is SgxCommunicationFailureException -> RestoreResponse.ApplicationError(cause)
is IOException -> RestoreResponse.NetworkError(cause)
else -> RestoreResponse.ApplicationError(cause ?: RuntimeException("Unknown!"))
}
} catch (e: InterruptedException) {
return RestoreResponse.ApplicationError(e)
} catch (e: CancellationException) {
return RestoreResponse.ApplicationError(e)
}
throw UnsupportedOperationException("SVR3 disabled for now")
// if (shareSet == null) {
// Log.w(TAG, "No share set provided! Assuming no data to restore.")
// return RestoreResponse.Missing
// }
//
// val normalizedPin: String = PinHashUtil.normalizeToString(userPin)
// val enclaveAuth = EnclaveAuth(authorization.username(), authorization.password())
//
// return try {
// val result = network.svr3().restore(normalizedPin, shareSet, enclaveAuth).get()
// val masterKey = MasterKey(result.value)
// RestoreResponse.Success(masterKey, authorization)
// } catch (e: ExecutionException) {
// when (val cause = e.cause) {
// is NetworkException -> RestoreResponse.NetworkError(cause)
// is DataMissingException -> RestoreResponse.Missing
// is RestoreFailedException -> RestoreResponse.PinMismatch(cause.triesRemaining)
// is AttestationFailedException -> RestoreResponse.ApplicationError(cause)
// is SgxCommunicationFailureException -> RestoreResponse.ApplicationError(cause)
// is IOException -> RestoreResponse.NetworkError(cause)
// else -> RestoreResponse.ApplicationError(cause ?: RuntimeException("Unknown!"))
// }
// } catch (e: InterruptedException) {
// return RestoreResponse.ApplicationError(e)
// } catch (e: CancellationException) {
// return RestoreResponse.ApplicationError(e)
// }
}
private fun Svr3Credentials.toAuthCredential(): AuthCredentials {
@@ -169,47 +162,48 @@ class SecureValueRecoveryV3(
* Performs the PIN change operation. This is safe to call repeatedly if you get back a retryable error.
*/
override fun execute(): BackupResponse {
val rawAuth: Svr3Credentials = try {
pushServiceSocket.svr3Authorization
} catch (e: NonSuccessfulResponseCodeException) {
return BackupResponse.ApplicationError(e)
} catch (e: IOException) {
return BackupResponse.NetworkError(e)
} catch (e: Exception) {
return BackupResponse.ApplicationError(e)
}
if (shareSet == null) {
val normalizedPin: String = PinHashUtil.normalizeToString(userPin)
val enclaveAuth = EnclaveAuth(rawAuth.username, rawAuth.password)
try {
shareSet = network.svr3().backup(masterKey.serialize(), normalizedPin, 10, enclaveAuth).get()
} catch (e: ExecutionException) {
when (val cause = e.cause) {
is NetworkException -> BackupResponse.NetworkError(cause)
is AttestationFailedException -> BackupResponse.ApplicationError(cause)
is SgxCommunicationFailureException -> BackupResponse.ApplicationError(cause)
is IOException -> BackupResponse.NetworkError(cause)
else -> BackupResponse.ApplicationError(cause ?: RuntimeException("Unknown!"))
}
} catch (e: InterruptedException) {
BackupResponse.ApplicationError(e)
} catch (e: CancellationException) {
BackupResponse.ApplicationError(e)
}
}
return try {
pushServiceSocket.setShareSet(shareSet)
BackupResponse.Success(masterKey, pushServiceSocket.svr3Authorization.toAuthCredential(), SvrVersion.SVR3)
} catch (e: NonSuccessfulResponseCodeException) {
BackupResponse.ApplicationError(e)
} catch (e: IOException) {
BackupResponse.NetworkError(e)
} catch (e: Exception) {
return BackupResponse.ApplicationError(e)
}
throw UnsupportedOperationException("SVR3 disabled for now")
// val rawAuth: Svr3Credentials = try {
// pushServiceSocket.svr3Authorization
// } catch (e: NonSuccessfulResponseCodeException) {
// return BackupResponse.ApplicationError(e)
// } catch (e: IOException) {
// return BackupResponse.NetworkError(e)
// } catch (e: Exception) {
// return BackupResponse.ApplicationError(e)
// }
//
// if (shareSet == null) {
// val normalizedPin: String = PinHashUtil.normalizeToString(userPin)
// val enclaveAuth = EnclaveAuth(rawAuth.username, rawAuth.password)
//
// try {
// shareSet = network.svr3().backup(masterKey.serialize(), normalizedPin, 10, enclaveAuth).get()
// } catch (e: ExecutionException) {
// when (val cause = e.cause) {
// is NetworkException -> BackupResponse.NetworkError(cause)
// is AttestationFailedException -> BackupResponse.ApplicationError(cause)
// is SgxCommunicationFailureException -> BackupResponse.ApplicationError(cause)
// is IOException -> BackupResponse.NetworkError(cause)
// else -> BackupResponse.ApplicationError(cause ?: RuntimeException("Unknown!"))
// }
// } catch (e: InterruptedException) {
// BackupResponse.ApplicationError(e)
// } catch (e: CancellationException) {
// BackupResponse.ApplicationError(e)
// }
// }
//
// return try {
// pushServiceSocket.setShareSet(shareSet)
// BackupResponse.Success(masterKey, pushServiceSocket.svr3Authorization.toAuthCredential(), SvrVersion.SVR3)
// } catch (e: NonSuccessfulResponseCodeException) {
// BackupResponse.ApplicationError(e)
// } catch (e: IOException) {
// BackupResponse.NetworkError(e)
// } catch (e: Exception) {
// return BackupResponse.ApplicationError(e)
// }
}
override fun serialize(): String {