Skip to content

Avoid generating client IDs with leading zeros #3709

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

Closed
pcapriotti wants to merge 2 commits into from
Closed

Avoid generating client IDs with leading zeros #3709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7a7da7
Avoid generating client IDs with leading zeros
pcapriotti Nov 13, 2023
3cb394b
Add comment
pcapriotti Nov 13, 2023
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
1 change: 1 addition & 0 deletions changelog.d/3-bug-fixes/client-id-leading-zeros
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Prevent client IDs with leading zeros from being generated. This works around a type mismatch in the protobuf API, where client IDs are represented as uint64.
4 changes: 4 additions & 0 deletions libs/wire-api/src/Wire/API/User/Client/Prekey.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import Data.ByteString.Conversion (toByteString')
import Data.Id
import Data.OpenApi qualified as S
import Data.Schema
import Data.Text qualified as T
import Data.Text.Ascii (encodeBase16)
import Data.Text.Encoding (decodeUtf8, encodeUtf8)
import Imports
Expand Down Expand Up @@ -70,6 +71,9 @@ instance ToSchema Prekey where
clientIdFromPrekey :: Prekey -> ClientId
clientIdFromPrekey =
ClientId
-- FIXME the clients expect UInts on the protobufs,
-- We will eventually not need this change anymore
. T.dropWhile (== '0')
. decodeUtf8
. toByteString'
. encodeBase16
Expand Down