Page MenuHomePhabricator
Differential D7298

[Identity] Handle key payload
ClosedPublic
Actions

Authored by • jon on Apr 4 2023, 8:02 AM.
Tags
None
Referenced Files
F6294447: D7298.id24598.diff
Sat, Apr 26, 3:25 AM
F6273097: D7298.id24864.diff
Fri, Apr 25, 4:20 PM
Unknown Object (File)
Wed, Apr 23, 2:57 PM
Unknown Object (File)
Wed, Apr 23, 2:56 PM
Unknown Object (File)
Wed, Apr 23, 12:00 PM
Unknown Object (File)
Wed, Apr 23, 8:59 AM
Unknown Object (File)
Wed, Apr 23, 4:54 AM
Unknown Object (File)
Wed, Apr 23, 3:32 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 93 Lines • ▼ Show 20 Lines if (filter?.accessibleToUserID) {
primaryFetchClause = SQL` primaryFetchClause = SQL`
FROM threads t FROM threads t
`; `;
} }
const whereClause = filter ? constructWhereClause(filter) : ''; const whereClause = filter ? constructWhereClause(filter) : '';
const rolesQuery = SQL` const rolesQuery = SQL`
SELECT t.id, r.id AS role, r.name, r.permissions, SELECT t.id, r.id AS role, r.name, r.permissions, r.special_role,
r.special_role = ${specialRoles.DEFAULT_ROLE} AS is_default r.special_role = ${specialRoles.DEFAULT_ROLE} AS is_default
` `
.append(primaryFetchClause) .append(primaryFetchClause)
.append( .append(
SQL` SQL`
LEFT JOIN roles r ON r.thread = t.id LEFT JOIN roles r ON r.thread = t.id
`, `,
) )
▲ Show 20 Lines • Show All 121 Lines • ▼ Show 20 Lines for (const rolesRow of rolesResult) {
} }
const role = rolesRow.role.toString(); const role = rolesRow.role.toString();
if (!threadInfos[threadID].roles[role]) { if (!threadInfos[threadID].roles[role]) {
threadInfos[threadID].roles[role] = { threadInfos[threadID].roles[role] = {
id: role, id: role,
name: rolesRow.name, name: rolesRow.name,
permissions: JSON.parse(rolesRow.permissions), permissions: JSON.parse(rolesRow.permissions),
isDefault: Boolean(rolesRow.is_default), isDefault: Boolean(rolesRow.is_default),
specialRole: rolesRow.special_role,
}; };
} }
} }
return { threadInfos }; return { threadInfos };
} }
export type FetchThreadInfosResult = { export type FetchThreadInfosResult = {
▲ Show 20 Lines • Show All 168 Lines • Show Last 20 Lines
View Options

services/identity/Cargo.toml

Show First 20 Lines • Show All 93 Lines • ▼ Show 20 Lines if (filter?.accessibleToUserID) {
primaryFetchClause = SQL` primaryFetchClause = SQL`
FROM threads t FROM threads t
`; `;
} }
const whereClause = filter ? constructWhereClause(filter) : ''; const whereClause = filter ? constructWhereClause(filter) : '';
const rolesQuery = SQL` const rolesQuery = SQL`
SELECT t.id, r.id AS role, r.name, r.permissions, SELECT t.id, r.id AS role, r.name, r.permissions, r.special_role,
r.special_role = ${specialRoles.DEFAULT_ROLE} AS is_default r.special_role = ${specialRoles.DEFAULT_ROLE} AS is_default
` `
.append(primaryFetchClause) .append(primaryFetchClause)
.append( .append(
SQL` SQL`
LEFT JOIN roles r ON r.thread = t.id LEFT JOIN roles r ON r.thread = t.id
`, `,
) )
▲ Show 20 Lines • Show All 121 Lines • ▼ Show 20 Lines for (const rolesRow of rolesResult) {
} }
const role = rolesRow.role.toString(); const role = rolesRow.role.toString();
if (!threadInfos[threadID].roles[role]) { if (!threadInfos[threadID].roles[role]) {
threadInfos[threadID].roles[role] = { threadInfos[threadID].roles[role] = {
id: role, id: role,
name: rolesRow.name, name: rolesRow.name,
permissions: JSON.parse(rolesRow.permissions), permissions: JSON.parse(rolesRow.permissions),
isDefault: Boolean(rolesRow.is_default), isDefault: Boolean(rolesRow.is_default),
specialRole: rolesRow.special_role,
}; };
} }
} }
return { threadInfos }; return { threadInfos };
} }
export type FetchThreadInfosResult = { export type FetchThreadInfosResult = {
▲ Show 20 Lines • Show All 168 Lines • Show Last 20 Lines
View Options

services/identity/src/database.rs

Show First 20 Lines • Show All 93 Lines • ▼ Show 20 Lines if (filter?.accessibleToUserID) {
primaryFetchClause = SQL` primaryFetchClause = SQL`
FROM threads t FROM threads t
`; `;
} }
const whereClause = filter ? constructWhereClause(filter) : ''; const whereClause = filter ? constructWhereClause(filter) : '';
const rolesQuery = SQL` const rolesQuery = SQL`
SELECT t.id, r.id AS role, r.name, r.permissions, SELECT t.id, r.id AS role, r.name, r.permissions, r.special_role,
r.special_role = ${specialRoles.DEFAULT_ROLE} AS is_default r.special_role = ${specialRoles.DEFAULT_ROLE} AS is_default
` `
.append(primaryFetchClause) .append(primaryFetchClause)
.append( .append(
SQL` SQL`
LEFT JOIN roles r ON r.thread = t.id LEFT JOIN roles r ON r.thread = t.id
`, `,
) )
▲ Show 20 Lines • Show All 121 Lines • ▼ Show 20 Lines for (const rolesRow of rolesResult) {
} }
const role = rolesRow.role.toString(); const role = rolesRow.role.toString();
if (!threadInfos[threadID].roles[role]) { if (!threadInfos[threadID].roles[role]) {
threadInfos[threadID].roles[role] = { threadInfos[threadID].roles[role] = {
id: role, id: role,
name: rolesRow.name, name: rolesRow.name,
permissions: JSON.parse(rolesRow.permissions), permissions: JSON.parse(rolesRow.permissions),
isDefault: Boolean(rolesRow.is_default), isDefault: Boolean(rolesRow.is_default),
specialRole: rolesRow.special_role,
}; };
} }
} }
return { threadInfos }; return { threadInfos };
} }
export type FetchThreadInfosResult = { export type FetchThreadInfosResult = {
▲ Show 20 Lines • Show All 168 Lines • Show Last 20 Lines