Skip to content

device-proxy: Use $filter based canAccess checks #777

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

Draft
thgreasi wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

device-proxy: Use $filter based canAccess checks #777

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8c7aea
device-proxy: Use $filter based canAccess checks
thgreasi Jul 4, 2023
0a9cd92
wip
thgreasi Jul 4, 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
25 changes: 13 additions & 12 deletions src/features/device-proxy/device-proxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ async function requestDevices({
filter,
],
},
$orderby: { id: 'asc' },
},
})) as Array<Pick<Device, 'id'>>
).map(({ id }) => id);
Expand All @@ -214,18 +215,18 @@ async function requestDevices({
// Check for device update permission, except for
// internal operation of the platform.
if (method !== 'GET' && req !== permissions.root) {
await Promise.all(
deviceIds.map(async (deviceId) => {
const res = (await resinApi.post({
url: `device(${deviceId})/canAccess`,
body: { action: 'update' },
})) as { d?: Array<{ id: number }> };

if (res?.d?.[0]?.id !== deviceId) {
throw new errors.ForbiddenError();
}
}),
);
console.log('*** device-proxy');
// npm run fasttest 20 to test this
const res = (await resinApi.post({
url: `device(action='update')/canAccess?$filter=id in (${deviceIds.join(
',',
)})`,
body: {},
})) as { d?: Array<{ id: number }> };
console.log('*** device-proxy', { res: res?.d?.[0], deviceIds });
if (_.isEqual(res?.d?.[0], deviceIds)) {
throw new errors.ForbiddenError();
}
}
// And now fetch device data with full privs
return await api.resin.get({
Expand Down