Skip to content

[stable-25.0.x] fix(notifications): abort NotificationWorker when user init fails #6580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mahibi merged 2 commits into from
Aug 26, 2026
Merged

[stable-25.0.x] fix(notifications): abort NotificationWorker when user init fails #6580

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d83833
fix(notifications): abort NotificationWorker when user init fails
mahibi Aug 25, 2026
d23f9d7
fix(detekt): Split initDecryptedData to keep the detekt score at 110
AndyScherzinger Aug 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 54 additions & 36 deletions app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,10 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor

logger.d(TAG, "NotificationWorker::doWork")

initDecryptedData(inputData)
if (!initDecryptedData(inputData)) {
logger.e(TAG, "Aborting NotificationWorker::doWork because user/pushMessage could not be initialized")
return Result.failure()
}
initNcApiAndCredentials()

notificationManager = NotificationManagerCompat.from(context!!)
Expand Down Expand Up @@ -422,47 +425,62 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor
)
}

@Suppress("TooGenericExceptionCaught", "NestedBlockDepth", "ComplexMethod", "LongMethod")
private fun initDecryptedData(inputData: Data) {
@Suppress("TooGenericExceptionCaught")
private fun initDecryptedData(inputData: Data): Boolean =
try {
if (inputData.hasKeyWithValueOfType(BundleKeys.KEY_NOTIFICATION_CLEARTEXT_SUBJECT, String::class.java)) {
val subject = inputData.getString(BundleKeys.KEY_NOTIFICATION_CLEARTEXT_SUBJECT)
val id = inputData.getLong(BundleKeys.KEY_NOTIFICATION_USER_ID, -1)
user = userManager.getUserWithId(id).blockingGet()
pushMessage = LoganSquare.parse(subject, DecryptedPushMessage::class.java)
return
initFromCleartextSubject(inputData)
} else {
initFromEncryptedSubject(inputData)
}
} catch (e: Exception) {
logger.e(TAG, "Error occurred while initializing decoded data ", e)
false
}

val subject = inputData.getString(BundleKeys.KEY_NOTIFICATION_SUBJECT)
val signature = inputData.getString(BundleKeys.KEY_NOTIFICATION_SIGNATURE)

val base64DecodedSubject = Base64.decode(subject, Base64.DEFAULT)
val base64DecodedSignature = Base64.decode(signature, Base64.DEFAULT)
val pushUtils = PushUtils()
val privateKey = pushUtils.readKeyFromFile(false) as PrivateKey
try {
val signatureVerification = pushUtils.verifySignature(
base64DecodedSignature,
base64DecodedSubject
)
if (signatureVerification.signatureValid) {
val decryptedSubject = decryptSubject(privateKey, base64DecodedSubject)
private fun initFromCleartextSubject(inputData: Data): Boolean {
val subject = inputData.getString(BundleKeys.KEY_NOTIFICATION_CLEARTEXT_SUBJECT)
val id = inputData.getLong(BundleKeys.KEY_NOTIFICATION_USER_ID, -1)
user = userManager.getUserWithId(id).blockingGet()
pushMessage = LoganSquare.parse(subject, DecryptedPushMessage::class.java)
return true
}

pushMessage = LoganSquare.parse(
String(decryptedSubject),
DecryptedPushMessage::class.java
)
user = signatureVerification.user!!
}
} catch (e: NoSuchAlgorithmException) {
Log.e(TAG, "No proper algorithm to decrypt the message ", e)
} catch (e: NoSuchPaddingException) {
Log.e(TAG, "No proper padding to decrypt the message ", e)
} catch (e: InvalidKeyException) {
Log.e(TAG, "Invalid private key ", e)
private fun initFromEncryptedSubject(inputData: Data): Boolean {
val subject = inputData.getString(BundleKeys.KEY_NOTIFICATION_SUBJECT)
val signature = inputData.getString(BundleKeys.KEY_NOTIFICATION_SIGNATURE)

val base64DecodedSubject = Base64.decode(subject, Base64.DEFAULT)
val base64DecodedSignature = Base64.decode(signature, Base64.DEFAULT)
val pushUtils = PushUtils()
val privateKey = pushUtils.readKeyFromFile(false) as PrivateKey
return try {
val signatureVerification = pushUtils.verifySignature(
base64DecodedSignature,
base64DecodedSubject
)
if (signatureVerification.signatureValid) {
val decryptedSubject = decryptSubject(privateKey, base64DecodedSubject)

pushMessage = LoganSquare.parse(
String(decryptedSubject),
DecryptedPushMessage::class.java
)
user = signatureVerification.user!!
true
} else {
logger.e(TAG, "Signature verification failed, discarding push message")
false
}
} catch (e: Exception) {
Log.e(TAG, "Error occurred while initializing decoded data ", e)
} catch (e: NoSuchAlgorithmException) {
logger.e(TAG, "No proper algorithm to decrypt the message ", e)
false
} catch (e: NoSuchPaddingException) {
logger.e(TAG, "No proper padding to decrypt the message ", e)
false
} catch (e: InvalidKeyException) {
logger.e(TAG, "Invalid private key ", e)
false
}
}

Expand Down
Loading