@balena/open-balena-api 35.0.4-build-joshbwlng-device-proxy-81986f961da11db63844414b5183f1b347357e7a-1 → 35.0.4-build-renovate-major-20-sinon-341ae438d15b4ebe28a3441232001a0ca277388b-2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -84,16 +84,7 @@ export const proxy = async (req, res) => {
|
|
|
84
84
|
if (_.isEmpty(filter)) {
|
|
85
85
|
throw new BadRequestError('At least one filter must be specified');
|
|
86
86
|
}
|
|
87
|
-
const responses = await requestDevices({
|
|
88
|
-
url,
|
|
89
|
-
req,
|
|
90
|
-
filter,
|
|
91
|
-
data,
|
|
92
|
-
method,
|
|
93
|
-
// Only pass appId if we're not filtering by deviceId or uuid
|
|
94
|
-
// This means we can check permissions on the application level only
|
|
95
|
-
...(deviceId == null && uuid == null ? { appId } : {}),
|
|
96
|
-
});
|
|
87
|
+
const responses = await requestDevices({ url, req, filter, data, method });
|
|
97
88
|
if (responses.length === 1) {
|
|
98
89
|
validateSupervisorResponse(responses[0], req, res, filter);
|
|
99
90
|
return;
|
|
@@ -108,48 +99,7 @@ export const proxy = async (req, res) => {
|
|
|
108
99
|
res.status(502).send(translateError(errorToReturn));
|
|
109
100
|
}
|
|
110
101
|
};
|
|
111
|
-
|
|
112
|
-
// Any new supervisor endpoints must be added to this list or they will be blocked
|
|
113
|
-
const permissionByRequest = {
|
|
114
|
-
purge: [
|
|
115
|
-
['POST', '/v1/purge'],
|
|
116
|
-
['POST', /\/v2\/applications\/\d+\/purge$/],
|
|
117
|
-
],
|
|
118
|
-
shutdown: [['POST', '/v1/shutdown']],
|
|
119
|
-
update: [
|
|
120
|
-
['POST', '/v2/local/target-state'],
|
|
121
|
-
['POST', '/v1/blink'],
|
|
122
|
-
['POST', '/v1/update'],
|
|
123
|
-
['POST', '/v1/reboot'],
|
|
124
|
-
['POST', '/v1/restart'],
|
|
125
|
-
['POST', '/v1/regenerate-api-key'],
|
|
126
|
-
['POST', '/v2/journal-logs'],
|
|
127
|
-
['PATCH', '/v1/device/host-config'],
|
|
128
|
-
['POST', /\/v1\/apps\/\d+\/stop$/],
|
|
129
|
-
['POST', /\/v1\/apps\/\d+\/start$/],
|
|
130
|
-
['POST', /\/v2\/applications\/\d+\/restart-service$/],
|
|
131
|
-
['POST', /\/v2\/applications\/\d+\/stop-service$/],
|
|
132
|
-
['POST', /\/v2\/applications\/\d+\/start-service$/],
|
|
133
|
-
['POST', /\/v2\/applications\/\d+\/restart$/],
|
|
134
|
-
],
|
|
135
|
-
};
|
|
136
|
-
// Find the permission required to access a given request
|
|
137
|
-
function getPermissionForRequest(method, url) {
|
|
138
|
-
return Object.entries(permissionByRequest).find(([_perm, requests]) => requests.some(([permMethod, permUrl]) => permMethod === method &&
|
|
139
|
-
(permUrl instanceof RegExp ? permUrl.test(url) : permUrl === url)))?.[0];
|
|
140
|
-
}
|
|
141
|
-
// Check user resource access
|
|
142
|
-
async function checkResourceAccess(client, resource, id, permission) {
|
|
143
|
-
const res = (await client.request({
|
|
144
|
-
method: 'POST',
|
|
145
|
-
url: `${resource}(${id})/canAccess`,
|
|
146
|
-
body: { action: permission },
|
|
147
|
-
}));
|
|
148
|
-
if (res?.d?.[0]?.id !== id) {
|
|
149
|
-
throw new errors.ForbiddenError();
|
|
150
|
-
}
|
|
151
|
-
}
|
|
152
|
-
async function requestDevices({ url, filter, data, req, wait = true, method = 'POST', appId, }) {
|
|
102
|
+
async function requestDevices({ url, filter, data, req, wait = true, method = 'POST', }) {
|
|
153
103
|
if (url == null) {
|
|
154
104
|
throw new BadRequestError('You must specify a url to request!');
|
|
155
105
|
}
|
|
@@ -183,23 +133,19 @@ async function requestDevices({ url, filter, data, req, wait = true, method = 'P
|
|
|
183
133
|
}
|
|
184
134
|
throw new NotFoundError('No online device(s) found');
|
|
185
135
|
}
|
|
186
|
-
// Check
|
|
136
|
+
// Check for device update permission, except for
|
|
137
|
+
// internal operation of the platform.
|
|
187
138
|
if (method !== 'GET' && req !== permissions.root) {
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
await checkResourceAccess(resinApi, 'application', appId, permission);
|
|
199
|
-
}
|
|
200
|
-
else {
|
|
201
|
-
await Promise.all(deviceIds.map((deviceId) => checkResourceAccess(resinApi, 'device', deviceId, permission)));
|
|
202
|
-
}
|
|
139
|
+
await Promise.all(deviceIds.map(async (deviceId) => {
|
|
140
|
+
const res = (await resinApi.request({
|
|
141
|
+
method: 'POST',
|
|
142
|
+
url: `device(${deviceId})/canAccess`,
|
|
143
|
+
body: { action: 'update' },
|
|
144
|
+
}));
|
|
145
|
+
if (res?.d?.[0]?.id !== deviceId) {
|
|
146
|
+
throw new errors.ForbiddenError();
|
|
147
|
+
}
|
|
148
|
+
}));
|
|
203
149
|
}
|
|
204
150
|
// And now fetch device data with full privs
|
|
205
151
|
return await api.resin.get({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device-proxy.js","sourceRoot":"","sources":["../../../src/features/device-proxy/device-proxy.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"device-proxy.js","sourceRoot":"","sources":["../../../src/features/device-proxy/device-proxy.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/auth.js
CHANGED
|
@@ -25,9 +25,6 @@ export const ROLES = {
|
|
|
25
25
|
'resin.actor.delete?id eq @__ACTOR_ID',
|
|
26
26
|
'resin.api_key.read?is_of__actor eq @__ACTOR_ID',
|
|
27
27
|
'resin.application.all',
|
|
28
|
-
// For the supervisor proxy
|
|
29
|
-
'resin.application.purge',
|
|
30
|
-
'resin.application.shutdown',
|
|
31
28
|
'resin.device_type.read',
|
|
32
29
|
'resin.device_type_alias.read',
|
|
33
30
|
'resin.cpu_architecture.read',
|
|
@@ -37,9 +34,6 @@ export const ROLES = {
|
|
|
37
34
|
'resin.application_type.all',
|
|
38
35
|
'resin.device.all',
|
|
39
36
|
'resin.device.tunnel-22222',
|
|
40
|
-
// For the supervisor proxy
|
|
41
|
-
'resin.device.purge',
|
|
42
|
-
'resin.device.shutdown',
|
|
43
37
|
'resin.device_config_variable.all',
|
|
44
38
|
'resin.device_environment_variable.all',
|
|
45
39
|
'resin.device_tag.all',
|
|
@@ -67,9 +61,6 @@ export const DEVICE_API_KEY_PERMISSIONS = [
|
|
|
67
61
|
'resin.device_type.read?describes__device/canAccess()',
|
|
68
62
|
`resin.device.read?${matchesNonFrozenDeviceActor()}`,
|
|
69
63
|
`resin.device.update?${matchesNonFrozenDeviceActor()}`,
|
|
70
|
-
// For the supervisor proxy
|
|
71
|
-
'resin.device.purge',
|
|
72
|
-
'resin.device.shutdown',
|
|
73
64
|
'resin.application.read?owns__device/canAccess() or (is_public eq true and is_for__device_type/any(dt:dt/describes__device/canAccess()))',
|
|
74
65
|
'resin.application_tag.read?application/canAccess()',
|
|
75
66
|
'resin.device_config_variable.read?device/canAccess()',
|
package/dist/lib/auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/lib/auth.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,8DAA8D;AAC9D,EAAE;AAIF,OAAO,EACN,uBAAuB,EACvB,gCAAgC,EAChC,iBAAiB,EACjB,mBAAmB,GACnB,MAAM,aAAa,CAAC;AAErB,MAAM,iBAAiB,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAU,CAAC;AAElE,MAAM,UAAU,GAAG,CAClB,QAAgB,EAChB,MAAc,EACd,SAA4D,iBAAiB,EAClE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,QAAQ,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC,CAAC;AAErE,MAAM,YAAY,GAAG,sBAAsB,CAAC;AAC5C,MAAM,WAAW,GAAG,gBAAgB,YAAY,GAAG,CAAC;AACpD,MAAM,2BAA2B,GAAG,CAAC,KAAK,GAAG,EAAE,EAAE,EAAE;IAClD,IAAI,KAAK,EAAE,CAAC;QACX,KAAK,IAAI,GAAG,CAAC;IACd,CAAC;IACD,MAAM,cAAc,GAAG,CAAC,gCAAgC;QACvD,CAAC,CAAC,QAAQ,KAAK,oBAAoB;QACnC,CAAC,CAAC,EAAE,CAAC;IACN,OAAO,GAAG,KAAK,GAAG,YAAY,GAAG,cAAc,EAAE,CAAC;AACnD,CAAC,CAAC;AACF,MAAM,UAAU,GAAG,wBAAwB,YAAY,GAAG,CAAC;AAE3D,MAAM,CAAC,MAAM,KAAK,GAEd;IACH,sBAAsB,EAAE;QACvB,uDAAuD,YAAY,GAAG;KACtE;IACD,gCAAgC;IAChC,oBAAoB,EAAE;QACrB,sCAAsC;QACtC,gDAAgD;QAChD,uBAAuB;
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/lib/auth.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@balena/open-balena-api",
|
|
3
3
|
"description": "Internet of things, Made Simple",
|
|
4
|
-
"version": "35.0.4-build-
|
|
4
|
+
"version": "35.0.4-build-renovate-major-20-sinon-341ae438d15b4ebe28a3441232001a0ca277388b-2",
|
|
5
5
|
"license": "AGPL-3.0",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -158,7 +158,7 @@
|
|
|
158
158
|
"p-timeout": "^6.1.4",
|
|
159
159
|
"pinejs-client-supertest": "^3.0.1",
|
|
160
160
|
"rimraf": "^6.0.1",
|
|
161
|
-
"sinon": "^
|
|
161
|
+
"sinon": "^20.0.0",
|
|
162
162
|
"supertest": "^7.0.0"
|
|
163
163
|
},
|
|
164
164
|
"engines": {
|
|
@@ -175,6 +175,6 @@
|
|
|
175
175
|
"import": "@swc-node/register/esm-register"
|
|
176
176
|
},
|
|
177
177
|
"versionist": {
|
|
178
|
-
"publishedAt": "2025-03-
|
|
178
|
+
"publishedAt": "2025-03-25T22:26:16.603Z"
|
|
179
179
|
}
|
|
180
180
|
}
|