Page MenuHomePhabricator
Differential D9480

[services] move eth address validation to siwe.rs
ClosedPublic
Actions

Authored by varun on Oct 12 2023, 10:34 PM.
Tags
None
Referenced Files
F5881568: D9480.id32168.diff
Thu, Apr 17, 2:38 AM
F5880334: D9480.id31986.diff
Thu, Apr 17, 2:12 AM
F5872766: D9480.id.diff
Wed, Apr 16, 10:05 PM
Unknown Object (File)
Tue, Apr 15, 10:19 PM
Unknown Object (File)
Mon, Apr 14, 4:57 AM
Unknown Object (File)
Tue, Mar 18, 7:59 PM
Unknown Object (File)
Mar 15 2025, 8:12 AM
Unknown Object (File)
Mar 10 2025, 3:58 AM
View All 90 Files
Subscribers
ashoat
tomek
will

Details

Reviewers
bartek
michal
• jon
Commits
rCOMMe69d48581e7a: [services] move eth address validation to siwe.rs
Summary

just moving this to the right location...

Depends on D9479

Test Plan

cargo build

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
services/
identity/
src/
4 lines
50 lines
50 lines

Diff 32168

View Options

services/identity/src/client_service.rs

Show All 29 Linesimport {
threadPermissions, threadPermissions,
threadTypes, threadTypes,
} from 'lib/types/thread-types.js'; } from 'lib/types/thread-types.js';
import { updateTypes } from 'lib/types/update-types.js'; import { updateTypes } from 'lib/types/update-types.js';
import { ServerError } from 'lib/utils/errors.js'; import { ServerError } from 'lib/utils/errors.js';
import { promiseAll } from 'lib/utils/promises.js'; import { promiseAll } from 'lib/utils/promises.js';
import { firstLine } from 'lib/utils/string-utils.js'; import { firstLine } from 'lib/utils/string-utils.js';
import { reportLinkUsage } from './link-updaters.js';
import { updateRoles } from './role-updaters.js'; import { updateRoles } from './role-updaters.js';
import { import {
changeRole, changeRole,
recalculateThreadPermissions, recalculateThreadPermissions,
commitMembershipChangeset, commitMembershipChangeset,
} from './thread-permission-updaters.js'; } from './thread-permission-updaters.js';
import createMessages from '../creators/message-creator.js'; import createMessages from '../creators/message-creator.js';
import { createUpdates } from '../creators/update-creator.js'; import { createUpdates } from '../creators/update-creator.js';
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import { fetchEntryInfos } from '../fetchers/entry-fetchers.js'; import { fetchEntryInfos } from '../fetchers/entry-fetchers.js';
import { checkIfInviteLinkIsValid } from '../fetchers/link-fetchers.js';
import { import {
fetchMessageInfos, fetchMessageInfos,
fetchMessageInfoByID, fetchMessageInfoByID,
} from '../fetchers/message-fetchers.js'; } from '../fetchers/message-fetchers.js';
import { import {
fetchThreadInfos, fetchThreadInfos,
fetchServerThreadInfos, fetchServerThreadInfos,
determineThreadAncestry, determineThreadAncestry,
} from '../fetchers/thread-fetchers.js'; } from '../fetchers/thread-fetchers.js';
import { import {
checkThreadPermission, checkThreadPermission,
viewerIsMember as fetchViewerIsMember, viewerIsMember as fetchViewerIsMember,
checkThread, checkThread,
validateCandidateMembers, validateCandidateMembers,
} from '../fetchers/thread-permission-fetchers.js'; } from '../fetchers/thread-permission-fetchers.js';
import { import {
verifyUserIDs, verifyUserIDs,
verifyUserOrCookieIDs, verifyUserOrCookieIDs,
} from '../fetchers/user-fetchers.js'; } from '../fetchers/user-fetchers.js';
import { handleAsyncPromise } from '../responders/handlers.js';
import type { Viewer } from '../session/viewer.js'; import type { Viewer } from '../session/viewer.js';
import RelationshipChangeset from '../utils/relationship-changeset.js'; import RelationshipChangeset from '../utils/relationship-changeset.js';
async function updateRole( async function updateRole(
viewer: Viewer, viewer: Viewer,
request: RoleChangeRequest, request: RoleChangeRequest,
): Promise<ChangeThreadSettingsResult> { ): Promise<ChangeThreadSettingsResult> {
if (!viewer.loggedIn) { if (!viewer.loggedIn) {
▲ Show 20 Lines • Show All 729 Lines • ▼ Show 20 Lines
async function joinThread( async function joinThread(
viewer: Viewer, viewer: Viewer,
request: ServerThreadJoinRequest, request: ServerThreadJoinRequest,
): Promise<ThreadJoinResult> { ): Promise<ThreadJoinResult> {
if (!viewer.loggedIn) { if (!viewer.loggedIn) {
throw new ServerError('not_logged_in'); throw new ServerError('not_logged_in');
} }
const [isMember, hasPermission] = await Promise.all([ const permissionCheck = request.inviteLinkSecret
fetchViewerIsMember(viewer, request.threadID), ? checkIfInviteLinkIsValid(request.inviteLinkSecret, request.threadID)
checkThreadPermission( : checkThreadPermission(
viewer, viewer,
request.threadID, request.threadID,
threadPermissions.JOIN_THREAD, threadPermissions.JOIN_THREAD,
), );
const [isMember, hasPermission] = await Promise.all([
fetchViewerIsMember(viewer, request.threadID),
permissionCheck,
]); ]);
if (!hasPermission) { if (!hasPermission) {
throw new ServerError('invalid_parameters'); throw new ServerError('invalid_parameters');
} }
// TODO: determine code version // TODO: determine code version
const hasCodeVersionBelow87 = !hasMinCodeVersion(viewer.platformDetails, 87); const hasCodeVersionBelow87 = !hasMinCodeVersion(viewer.platformDetails, 87);
const hasCodeVersionBelow62 = !hasMinCodeVersion(viewer.platformDetails, 62); const hasCodeVersionBelow62 = !hasMinCodeVersion(viewer.platformDetails, 62);
Show All 29 Lines): Promise<ThreadJoinResult> {
} }
const changeset = await changeRole(request.threadID, [viewer.userID], null); const changeset = await changeRole(request.threadID, [viewer.userID], null);
const membershipResult = await commitMembershipChangeset(viewer, changeset, { const membershipResult = await commitMembershipChangeset(viewer, changeset, {
calendarQuery, calendarQuery,
}); });
if (request.inviteLinkSecret) {
handleAsyncPromise(reportLinkUsage(request.inviteLinkSecret));
}
const messageData = { const messageData = {
type: messageTypes.JOIN_THREAD, type: messageTypes.JOIN_THREAD,
threadID: request.threadID, threadID: request.threadID,
creatorID: viewer.userID, creatorID: viewer.userID,
time: Date.now(), time: Date.now(),
}; };
const newMessages = await createMessages(viewer, [messageData]); const newMessages = await createMessages(viewer, [messageData]);
▲ Show 20 Lines • Show All 150 Lines • Show Last 20 Lines
View Options

services/identity/src/reserved_users.rs

Show All 29 Linesimport {
threadPermissions, threadPermissions,
threadTypes, threadTypes,
} from 'lib/types/thread-types.js'; } from 'lib/types/thread-types.js';
import { updateTypes } from 'lib/types/update-types.js'; import { updateTypes } from 'lib/types/update-types.js';
import { ServerError } from 'lib/utils/errors.js'; import { ServerError } from 'lib/utils/errors.js';
import { promiseAll } from 'lib/utils/promises.js'; import { promiseAll } from 'lib/utils/promises.js';
import { firstLine } from 'lib/utils/string-utils.js'; import { firstLine } from 'lib/utils/string-utils.js';
import { reportLinkUsage } from './link-updaters.js';
import { updateRoles } from './role-updaters.js'; import { updateRoles } from './role-updaters.js';
import { import {
changeRole, changeRole,
recalculateThreadPermissions, recalculateThreadPermissions,
commitMembershipChangeset, commitMembershipChangeset,
} from './thread-permission-updaters.js'; } from './thread-permission-updaters.js';
import createMessages from '../creators/message-creator.js'; import createMessages from '../creators/message-creator.js';
import { createUpdates } from '../creators/update-creator.js'; import { createUpdates } from '../creators/update-creator.js';
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import { fetchEntryInfos } from '../fetchers/entry-fetchers.js'; import { fetchEntryInfos } from '../fetchers/entry-fetchers.js';
import { checkIfInviteLinkIsValid } from '../fetchers/link-fetchers.js';
import { import {
fetchMessageInfos, fetchMessageInfos,
fetchMessageInfoByID, fetchMessageInfoByID,
} from '../fetchers/message-fetchers.js'; } from '../fetchers/message-fetchers.js';
import { import {
fetchThreadInfos, fetchThreadInfos,
fetchServerThreadInfos, fetchServerThreadInfos,
determineThreadAncestry, determineThreadAncestry,
} from '../fetchers/thread-fetchers.js'; } from '../fetchers/thread-fetchers.js';
import { import {
checkThreadPermission, checkThreadPermission,
viewerIsMember as fetchViewerIsMember, viewerIsMember as fetchViewerIsMember,
checkThread, checkThread,
validateCandidateMembers, validateCandidateMembers,
} from '../fetchers/thread-permission-fetchers.js'; } from '../fetchers/thread-permission-fetchers.js';
import { import {
verifyUserIDs, verifyUserIDs,
verifyUserOrCookieIDs, verifyUserOrCookieIDs,
} from '../fetchers/user-fetchers.js'; } from '../fetchers/user-fetchers.js';
import { handleAsyncPromise } from '../responders/handlers.js';
import type { Viewer } from '../session/viewer.js'; import type { Viewer } from '../session/viewer.js';
import RelationshipChangeset from '../utils/relationship-changeset.js'; import RelationshipChangeset from '../utils/relationship-changeset.js';
async function updateRole( async function updateRole(
viewer: Viewer, viewer: Viewer,
request: RoleChangeRequest, request: RoleChangeRequest,
): Promise<ChangeThreadSettingsResult> { ): Promise<ChangeThreadSettingsResult> {
if (!viewer.loggedIn) { if (!viewer.loggedIn) {
▲ Show 20 Lines • Show All 729 Lines • ▼ Show 20 Lines
async function joinThread( async function joinThread(
viewer: Viewer, viewer: Viewer,
request: ServerThreadJoinRequest, request: ServerThreadJoinRequest,
): Promise<ThreadJoinResult> { ): Promise<ThreadJoinResult> {
if (!viewer.loggedIn) { if (!viewer.loggedIn) {
throw new ServerError('not_logged_in'); throw new ServerError('not_logged_in');
} }
const [isMember, hasPermission] = await Promise.all([ const permissionCheck = request.inviteLinkSecret
fetchViewerIsMember(viewer, request.threadID), ? checkIfInviteLinkIsValid(request.inviteLinkSecret, request.threadID)
checkThreadPermission( : checkThreadPermission(
viewer, viewer,
request.threadID, request.threadID,
threadPermissions.JOIN_THREAD, threadPermissions.JOIN_THREAD,
), );
const [isMember, hasPermission] = await Promise.all([
fetchViewerIsMember(viewer, request.threadID),
permissionCheck,
]); ]);
if (!hasPermission) { if (!hasPermission) {
throw new ServerError('invalid_parameters'); throw new ServerError('invalid_parameters');
} }
// TODO: determine code version // TODO: determine code version
const hasCodeVersionBelow87 = !hasMinCodeVersion(viewer.platformDetails, 87); const hasCodeVersionBelow87 = !hasMinCodeVersion(viewer.platformDetails, 87);
const hasCodeVersionBelow62 = !hasMinCodeVersion(viewer.platformDetails, 62); const hasCodeVersionBelow62 = !hasMinCodeVersion(viewer.platformDetails, 62);
Show All 29 Lines): Promise<ThreadJoinResult> {
} }
const changeset = await changeRole(request.threadID, [viewer.userID], null); const changeset = await changeRole(request.threadID, [viewer.userID], null);
const membershipResult = await commitMembershipChangeset(viewer, changeset, { const membershipResult = await commitMembershipChangeset(viewer, changeset, {
calendarQuery, calendarQuery,
}); });
if (request.inviteLinkSecret) {
handleAsyncPromise(reportLinkUsage(request.inviteLinkSecret));
}
const messageData = { const messageData = {
type: messageTypes.JOIN_THREAD, type: messageTypes.JOIN_THREAD,
threadID: request.threadID, threadID: request.threadID,
creatorID: viewer.userID, creatorID: viewer.userID,
time: Date.now(), time: Date.now(),
}; };
const newMessages = await createMessages(viewer, [messageData]); const newMessages = await createMessages(viewer, [messageData]);
▲ Show 20 Lines • Show All 150 Lines • Show Last 20 Lines
View Options

services/identity/src/siwe.rs

Show All 29 Linesimport {
threadPermissions, threadPermissions,
threadTypes, threadTypes,
} from 'lib/types/thread-types.js'; } from 'lib/types/thread-types.js';
import { updateTypes } from 'lib/types/update-types.js'; import { updateTypes } from 'lib/types/update-types.js';
import { ServerError } from 'lib/utils/errors.js'; import { ServerError } from 'lib/utils/errors.js';
import { promiseAll } from 'lib/utils/promises.js'; import { promiseAll } from 'lib/utils/promises.js';
import { firstLine } from 'lib/utils/string-utils.js'; import { firstLine } from 'lib/utils/string-utils.js';
import { reportLinkUsage } from './link-updaters.js';
import { updateRoles } from './role-updaters.js'; import { updateRoles } from './role-updaters.js';
import { import {
changeRole, changeRole,
recalculateThreadPermissions, recalculateThreadPermissions,
commitMembershipChangeset, commitMembershipChangeset,
} from './thread-permission-updaters.js'; } from './thread-permission-updaters.js';
import createMessages from '../creators/message-creator.js'; import createMessages from '../creators/message-creator.js';
import { createUpdates } from '../creators/update-creator.js'; import { createUpdates } from '../creators/update-creator.js';
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import { fetchEntryInfos } from '../fetchers/entry-fetchers.js'; import { fetchEntryInfos } from '../fetchers/entry-fetchers.js';
import { checkIfInviteLinkIsValid } from '../fetchers/link-fetchers.js';
import { import {
fetchMessageInfos, fetchMessageInfos,
fetchMessageInfoByID, fetchMessageInfoByID,
} from '../fetchers/message-fetchers.js'; } from '../fetchers/message-fetchers.js';
import { import {
fetchThreadInfos, fetchThreadInfos,
fetchServerThreadInfos, fetchServerThreadInfos,
determineThreadAncestry, determineThreadAncestry,
} from '../fetchers/thread-fetchers.js'; } from '../fetchers/thread-fetchers.js';
import { import {
checkThreadPermission, checkThreadPermission,
viewerIsMember as fetchViewerIsMember, viewerIsMember as fetchViewerIsMember,
checkThread, checkThread,
validateCandidateMembers, validateCandidateMembers,
} from '../fetchers/thread-permission-fetchers.js'; } from '../fetchers/thread-permission-fetchers.js';
import { import {
verifyUserIDs, verifyUserIDs,
verifyUserOrCookieIDs, verifyUserOrCookieIDs,
} from '../fetchers/user-fetchers.js'; } from '../fetchers/user-fetchers.js';
import { handleAsyncPromise } from '../responders/handlers.js';
import type { Viewer } from '../session/viewer.js'; import type { Viewer } from '../session/viewer.js';
import RelationshipChangeset from '../utils/relationship-changeset.js'; import RelationshipChangeset from '../utils/relationship-changeset.js';
async function updateRole( async function updateRole(
viewer: Viewer, viewer: Viewer,
request: RoleChangeRequest, request: RoleChangeRequest,
): Promise<ChangeThreadSettingsResult> { ): Promise<ChangeThreadSettingsResult> {
if (!viewer.loggedIn) { if (!viewer.loggedIn) {
▲ Show 20 Lines • Show All 729 Lines • ▼ Show 20 Lines
async function joinThread( async function joinThread(
viewer: Viewer, viewer: Viewer,
request: ServerThreadJoinRequest, request: ServerThreadJoinRequest,
): Promise<ThreadJoinResult> { ): Promise<ThreadJoinResult> {
if (!viewer.loggedIn) { if (!viewer.loggedIn) {
throw new ServerError('not_logged_in'); throw new ServerError('not_logged_in');
} }
const [isMember, hasPermission] = await Promise.all([ const permissionCheck = request.inviteLinkSecret
fetchViewerIsMember(viewer, request.threadID), ? checkIfInviteLinkIsValid(request.inviteLinkSecret, request.threadID)
checkThreadPermission( : checkThreadPermission(
viewer, viewer,
request.threadID, request.threadID,
threadPermissions.JOIN_THREAD, threadPermissions.JOIN_THREAD,
), );
const [isMember, hasPermission] = await Promise.all([
fetchViewerIsMember(viewer, request.threadID),
permissionCheck,
]); ]);
if (!hasPermission) { if (!hasPermission) {
throw new ServerError('invalid_parameters'); throw new ServerError('invalid_parameters');
} }
// TODO: determine code version // TODO: determine code version
const hasCodeVersionBelow87 = !hasMinCodeVersion(viewer.platformDetails, 87); const hasCodeVersionBelow87 = !hasMinCodeVersion(viewer.platformDetails, 87);
const hasCodeVersionBelow62 = !hasMinCodeVersion(viewer.platformDetails, 62); const hasCodeVersionBelow62 = !hasMinCodeVersion(viewer.platformDetails, 62);
Show All 29 Lines): Promise<ThreadJoinResult> {
} }
const changeset = await changeRole(request.threadID, [viewer.userID], null); const changeset = await changeRole(request.threadID, [viewer.userID], null);
const membershipResult = await commitMembershipChangeset(viewer, changeset, { const membershipResult = await commitMembershipChangeset(viewer, changeset, {
calendarQuery, calendarQuery,
}); });
if (request.inviteLinkSecret) {
handleAsyncPromise(reportLinkUsage(request.inviteLinkSecret));
}
const messageData = { const messageData = {
type: messageTypes.JOIN_THREAD, type: messageTypes.JOIN_THREAD,
threadID: request.threadID, threadID: request.threadID,
creatorID: viewer.userID, creatorID: viewer.userID,
time: Date.now(), time: Date.now(),
}; };
const newMessages = await createMessages(viewer, [messageData]); const newMessages = await createMessages(viewer, [messageData]);
▲ Show 20 Lines • Show All 150 Lines • Show Last 20 Lines