MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve metrics around spam report tokens.

This commit is contained in:
erik-signal 2023-02-22 15:43:44 -05:00 committed by GitHub
parent d2f723de12
commit 71c0fc8d4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
View File

@ -637,9 +637,11 @@ public class MessageController {
UUID spamReporterUuid = auth.getAccount().getUuid(); UUID spamReporterUuid = auth.getAccount().getUuid();
// spam report token is optional, but if provided ensure it is valid base64. // spam report token is optional, but if provided ensure it is valid base64 and non-empty.
final Optional<byte[]> maybeSpamReportToken = final Optional<byte[]> maybeSpamReportToken =
spamReport != null ? Optional.ofNullable(spamReport.token()) : Optional.empty(); Optional.ofNullable(spamReport)
.flatMap(r -> Optional.ofNullable(r.token()))
.filter(t -> t.length > 0);
reportMessageManager.report(sourceNumber, sourceAci, sourcePni, messageGuid, spamReporterUuid, maybeSpamReportToken, userAgent); reportMessageManager.report(sourceNumber, sourceAci, sourcePni, messageGuid, spamReporterUuid, maybeSpamReportToken, userAgent);