Page MenuHomePhabricator
Differential D7298

[Identity] Handle key payload
ClosedPublic
Actions

Authored by • jon on Apr 4 2023, 8:02 AM.
Tags
None
Referenced Files
Unknown Object (File)
Feb 28 2025, 3:38 PM
Unknown Object (File)
Feb 27 2025, 7:42 AM
Unknown Object (File)
Feb 24 2025, 4:50 PM
Unknown Object (File)
Feb 24 2025, 12:32 AM
Unknown Object (File)
Feb 24 2025, 12:31 AM
Unknown Object (File)
Feb 24 2025, 12:31 AM
Unknown Object (File)
Feb 24 2025, 12:31 AM
Unknown Object (File)
Feb 24 2025, 12:31 AM
View All Files
Subscribers
ashoat
atul
tomek

Details

Reviewers
varun
bartek
Commits
rCOMM68bbaa297a06: [Identity] Handle key payload
Summary

Allow for the key payload to be serialized and deserialized.

This is needed later for verifying that the payload is correctly
structured and a device is also identified by the identity public key.

Test Plan
cd services/identity
cargo test

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

• jon created this revision.Apr 4 2023, 8:02 AM
Herald added subscribers: atul, tomek, ashoat. · View Herald TranscriptApr 4 2023, 8:02 AM
• jon updated this revision to Diff 24599.Apr 4 2023, 8:08 AM

Clean up accidental additions

Harbormaster completed remote builds in B17962: Diff 24599.Apr 4 2023, 8:25 AM
• jon requested review of this revision.Apr 4 2023, 8:25 AM
Harbormaster completed remote builds in B17961: Diff 24598.Apr 4 2023, 8:33 AM
varun requested changes to this revision.Apr 5 2023, 11:22 AM
varun added inline comments.
services/identity/src/database.rs
40–46 ↗(On Diff #24599)
49 ↗(On Diff #24599)

DDB complains if we don't escape the payload?

51 ↗(On Diff #24599)

How about

impl FromStr for KeyPayload {
  type Err = serde_json::Error;

  fn from_str(s: &str) -> Result<Self, Self::Err> {
    serde_json::from_str(&s.replace(r#"\""#, r#"""#))
  }
}
This revision now requires changes to proceed.Apr 5 2023, 11:22 AM
• jon updated this revision to Diff 24725.Apr 6 2023, 7:22 AM
• jon marked 3 inline comments as done.

Address feedback

services/identity/src/database.rs
49 ↗(On Diff #24599)

no, that's just what is currently in DDB. I'm assuming how we create the payload on the JS side is creating an escaped payload

51 ↗(On Diff #24599)

sure

Harbormaster completed remote builds in B18044: Diff 24725.Apr 6 2023, 7:39 AM
varun accepted this revision.Apr 6 2023, 12:32 PM
varun added inline comments.
services/identity/src/database.rs
52
57–59

we're intentionally leaving this commented? we probably won't ever need this method since the payload is created on the client, right?

This revision is now accepted and ready to land.Apr 6 2023, 12:32 PM
• jon marked 2 inline comments as done.Apr 7 2023, 1:31 PM
• jon added inline comments.
services/identity/src/database.rs
57–59

no, looks like I forgot about this.

we probably won't ever need this method since the payload is created on the client, right?

Did it because of it felt "right" for serialize/deserialize, but yea, this should be pretty much immutable, so there's no need to "serialize" it.

• jon updated this revision to Diff 24841.Apr 7 2023, 1:31 PM
• jon marked an inline comment as done.

Address feedback

• jon added a comment.Apr 7 2023, 1:32 PM

Address feedback

• jon added a child revision: D7299: [Identity] Support keygen and server setup for opaque 2.0.Apr 7 2023, 1:33 PM
Harbormaster completed remote builds in B18139: Diff 24841.Apr 7 2023, 1:45 PM
• jon updated this revision to Diff 24843.Apr 7 2023, 2:18 PM

Rebase on master

Harbormaster completed remote builds in B18141: Diff 24843.Apr 7 2023, 2:34 PM
Closed by commit rCOMM68bbaa297a06: [Identity] Handle key payload (authored by • jon). · Explain WhyApr 7 2023, 2:53 PM
This revision was automatically updated to reflect the committed changes.
• jon added a commit: rCOMM68bbaa297a06: [Identity] Handle key payload.

Revision Contents
Changeset List

PathSize
services/
identity/
2 lines
src/
43 lines

Diff 24725

View Options

services/identity/Cargo.lock

Show First 20 Lines • Show All 98 Lines • ▼ Show 20 Linesconst bindCallKeyserverEndpointSelector = createSelector(
( (
dispatch: Dispatch, dispatch: Dispatch,
currentUserInfo: ?CurrentUserInfo, currentUserInfo: ?CurrentUserInfo,
keyserverInfos: { +[keyserverID: string]: KeyserverInfo }, keyserverInfos: { +[keyserverID: string]: KeyserverInfo },
) => { ) => {
return _memoize( return _memoize(
<Args: $ReadOnlyArray<mixed>, Return>( <Args: $ReadOnlyArray<mixed>, Return>(
keyserverCall: KeyserverCall<Args, Return>, keyserverCall: KeyserverCall<Args, Return>,
): ((...Args) => Promise<Return>) => { ): ((...Args) => Promise<Return>) => {
michalUnsubmitted
Not Done
Inline Actions

I meant that this Return is wrong, because in case of fanout it returns [Return]

michal: I meant that this `Return` is wrong, because in case of `fanout` it returns `[Return]`
const callKeyserverEndpoint = ( const callKeyserverEndpoint = (
endpoint: Endpoint, endpoint: Endpoint,
data: Object, data: Object,
args: Args, args: Args,
options?: ?CallServerEndpointOptions, options?: ?CallServerEndpointOptions,
) => { ) => {
// TODO const bindCallKeyserverEndpoint = (keyserverID: string) => {
if (keyserverCall.config.keyserverSelection === 'fanout') {
return Promise.resolve(undefined);
}
const keyserverID = keyserverCall.config.keyserverIDExtractor(
...args,
);
const { const {
cookie, cookie,
urlPrefix, urlPrefix,
sessionID, sessionID,
connection, connection,
lastCommunicatedPlatformDetails, lastCommunicatedPlatformDetails,
} = keyserverInfos[keyserverID]; } = keyserverInfos[keyserverID];
const boundCallServerEndpoint = createBoundServerCallsSelector( const boundCallServerEndpoint = createBoundServerCallsSelector(
keyserverID, keyserverID,
)({ )({
dispatch, dispatch,
currentUserInfo, currentUserInfo,
cookie, cookie,
urlPrefix, urlPrefix,
sessionID, sessionID,
connectionStatus: connection.status, connectionStatus: connection.status,
lastCommunicatedPlatformDetails, lastCommunicatedPlatformDetails,
}); });
return boundCallServerEndpoint(endpoint, data, options); return boundCallServerEndpoint(endpoint, data, options);
}; };
if (keyserverCall.config.keyserverSelection === 'fanout') {
const promises = [];
for (const keyserverID in keyserverInfos) {
promises.push(bindCallKeyserverEndpoint(keyserverID));
}
return Promise.all(promises);
}
const keyserverID = keyserverCall.config.keyserverIDExtractor(
...args,
);
return bindCallKeyserverEndpoint(keyserverID);
};
return keyserverCall.actionFunc(callKeyserverEndpoint); return keyserverCall.actionFunc(callKeyserverEndpoint);
}, },
); );
}, },
); );
function useKeyserverCall<Args: $ReadOnlyArray<mixed>, Return>( function useKeyserverCall<Args: $ReadOnlyArray<mixed>, Return>(
Show All 21 Lines
View Options

services/identity/Cargo.toml

Show First 20 Lines • Show All 98 Lines • ▼ Show 20 Linesconst bindCallKeyserverEndpointSelector = createSelector(
( (
dispatch: Dispatch, dispatch: Dispatch,
currentUserInfo: ?CurrentUserInfo, currentUserInfo: ?CurrentUserInfo,
keyserverInfos: { +[keyserverID: string]: KeyserverInfo }, keyserverInfos: { +[keyserverID: string]: KeyserverInfo },
) => { ) => {
return _memoize( return _memoize(
<Args: $ReadOnlyArray<mixed>, Return>( <Args: $ReadOnlyArray<mixed>, Return>(
keyserverCall: KeyserverCall<Args, Return>, keyserverCall: KeyserverCall<Args, Return>,
): ((...Args) => Promise<Return>) => { ): ((...Args) => Promise<Return>) => {
michalUnsubmitted
Not Done
Inline Actions

I meant that this Return is wrong, because in case of fanout it returns [Return]

michal: I meant that this `Return` is wrong, because in case of `fanout` it returns `[Return]`
const callKeyserverEndpoint = ( const callKeyserverEndpoint = (
endpoint: Endpoint, endpoint: Endpoint,
data: Object, data: Object,
args: Args, args: Args,
options?: ?CallServerEndpointOptions, options?: ?CallServerEndpointOptions,
) => { ) => {
// TODO const bindCallKeyserverEndpoint = (keyserverID: string) => {
if (keyserverCall.config.keyserverSelection === 'fanout') {
return Promise.resolve(undefined);
}
const keyserverID = keyserverCall.config.keyserverIDExtractor(
...args,
);
const { const {
cookie, cookie,
urlPrefix, urlPrefix,
sessionID, sessionID,
connection, connection,
lastCommunicatedPlatformDetails, lastCommunicatedPlatformDetails,
} = keyserverInfos[keyserverID]; } = keyserverInfos[keyserverID];
const boundCallServerEndpoint = createBoundServerCallsSelector( const boundCallServerEndpoint = createBoundServerCallsSelector(
keyserverID, keyserverID,
)({ )({
dispatch, dispatch,
currentUserInfo, currentUserInfo,
cookie, cookie,
urlPrefix, urlPrefix,
sessionID, sessionID,
connectionStatus: connection.status, connectionStatus: connection.status,
lastCommunicatedPlatformDetails, lastCommunicatedPlatformDetails,
}); });
return boundCallServerEndpoint(endpoint, data, options); return boundCallServerEndpoint(endpoint, data, options);
}; };
if (keyserverCall.config.keyserverSelection === 'fanout') {
const promises = [];
for (const keyserverID in keyserverInfos) {
promises.push(bindCallKeyserverEndpoint(keyserverID));
}
return Promise.all(promises);
}
const keyserverID = keyserverCall.config.keyserverIDExtractor(
...args,
);
return bindCallKeyserverEndpoint(keyserverID);
};
return keyserverCall.actionFunc(callKeyserverEndpoint); return keyserverCall.actionFunc(callKeyserverEndpoint);
}, },
); );
}, },
); );
function useKeyserverCall<Args: $ReadOnlyArray<mixed>, Return>( function useKeyserverCall<Args: $ReadOnlyArray<mixed>, Return>(
Show All 21 Lines
View Options

services/identity/src/database.rs

Show First 20 Lines • Show All 98 Lines • ▼ Show 20 Linesconst bindCallKeyserverEndpointSelector = createSelector(
( (
dispatch: Dispatch, dispatch: Dispatch,
currentUserInfo: ?CurrentUserInfo, currentUserInfo: ?CurrentUserInfo,
keyserverInfos: { +[keyserverID: string]: KeyserverInfo }, keyserverInfos: { +[keyserverID: string]: KeyserverInfo },
) => { ) => {
return _memoize( return _memoize(
<Args: $ReadOnlyArray<mixed>, Return>( <Args: $ReadOnlyArray<mixed>, Return>(
keyserverCall: KeyserverCall<Args, Return>, keyserverCall: KeyserverCall<Args, Return>,
): ((...Args) => Promise<Return>) => { ): ((...Args) => Promise<Return>) => {
michalUnsubmitted
Not Done
Inline Actions

I meant that this Return is wrong, because in case of fanout it returns [Return]

michal: I meant that this `Return` is wrong, because in case of `fanout` it returns `[Return]`
const callKeyserverEndpoint = ( const callKeyserverEndpoint = (
endpoint: Endpoint, endpoint: Endpoint,
data: Object, data: Object,
args: Args, args: Args,
options?: ?CallServerEndpointOptions, options?: ?CallServerEndpointOptions,
) => { ) => {
// TODO const bindCallKeyserverEndpoint = (keyserverID: string) => {
if (keyserverCall.config.keyserverSelection === 'fanout') {
return Promise.resolve(undefined);
}
const keyserverID = keyserverCall.config.keyserverIDExtractor(
...args,
);
const { const {
cookie, cookie,
urlPrefix, urlPrefix,
sessionID, sessionID,
connection, connection,
lastCommunicatedPlatformDetails, lastCommunicatedPlatformDetails,
} = keyserverInfos[keyserverID]; } = keyserverInfos[keyserverID];
const boundCallServerEndpoint = createBoundServerCallsSelector( const boundCallServerEndpoint = createBoundServerCallsSelector(
keyserverID, keyserverID,
)({ )({
dispatch, dispatch,
currentUserInfo, currentUserInfo,
cookie, cookie,
urlPrefix, urlPrefix,
sessionID, sessionID,
connectionStatus: connection.status, connectionStatus: connection.status,
lastCommunicatedPlatformDetails, lastCommunicatedPlatformDetails,
}); });
return boundCallServerEndpoint(endpoint, data, options); return boundCallServerEndpoint(endpoint, data, options);
}; };
if (keyserverCall.config.keyserverSelection === 'fanout') {
const promises = [];
for (const keyserverID in keyserverInfos) {
promises.push(bindCallKeyserverEndpoint(keyserverID));
}
return Promise.all(promises);
}
const keyserverID = keyserverCall.config.keyserverIDExtractor(
...args,
);
return bindCallKeyserverEndpoint(keyserverID);
};
return keyserverCall.actionFunc(callKeyserverEndpoint); return keyserverCall.actionFunc(callKeyserverEndpoint);
}, },
); );
}, },
); );
function useKeyserverCall<Args: $ReadOnlyArray<mixed>, Return>( function useKeyserverCall<Args: $ReadOnlyArray<mixed>, Return>(
Show All 21 Lines