@balena/open-balena-api 30.0.6 → 30.0.7
Sign up to get free protection for your applications and to get access to all the features.
|
@@ -14,7 +14,12 @@ export const basicApiKeyAuthenticate = async (req, res, next) => {
|
|
|
14
14
|
const creds = BasicAuth.parse(authHeader);
|
|
15
15
|
if (creds) {
|
|
16
16
|
req.params.subject = creds.name;
|
|
17
|
+
// This will later be parsed as an api key
|
|
17
18
|
req.params.apikey = creds.pass;
|
|
19
|
+
// So we need to delete any other api key parsing that may already have happened
|
|
20
|
+
// TODO: Run this before any other api key parsing
|
|
21
|
+
delete req.prefetchApiKey;
|
|
22
|
+
delete req.apiKey;
|
|
18
23
|
}
|
|
19
24
|
}
|
|
20
25
|
if (req.params.apikey === TOKEN_AUTH_BUILDER_TOKEN) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/features/registry/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,YAAY,CAAC;AAGnC,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAE/D,MAAM,OAAO,mBAAoB,SAAQ,MAAM,CAAC,iBAAiB;CAAG;AAEpE,MAAM,OAAO,wBAAyB,SAAQ,MAAM,CAAC,iBAAiB;CAAG;AAEzE,iFAAiF;AACjF,gFAAgF;AAChF,MAAM,CAAC,MAAM,uBAAuB,GAAmB,KAAK,EAC3D,GAAG,EACH,GAAG,EACH,IAAI,EACH,EAAE;IACH,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IAChD,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC1C,IAAI,KAAK,EAAE,CAAC;YACX,GAAG,CAAC,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC;YAChC,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/features/registry/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,YAAY,CAAC;AAGnC,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAE/D,MAAM,OAAO,mBAAoB,SAAQ,MAAM,CAAC,iBAAiB;CAAG;AAEpE,MAAM,OAAO,wBAAyB,SAAQ,MAAM,CAAC,iBAAiB;CAAG;AAEzE,iFAAiF;AACjF,gFAAgF;AAChF,MAAM,CAAC,MAAM,uBAAuB,GAAmB,KAAK,EAC3D,GAAG,EACH,GAAG,EACH,IAAI,EACH,EAAE;IACH,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IAChD,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC1C,IAAI,KAAK,EAAE,CAAC;YACX,GAAG,CAAC,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC;YAChC,0CAA0C;YAC1C,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC;YAC/B,gFAAgF;YAChF,kDAAkD;YAClD,OAAO,GAAG,CAAC,cAAc,CAAC;YAC1B,OAAO,GAAG,CAAC,MAAM,CAAC;QACnB,CAAC;IACF,CAAC;IACD,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,KAAK,wBAAwB,EAAE,CAAC;QACpD,IAAI,EAAE,CAAC;QACP,OAAO;IACR,CAAC;IACD,IAAI,CAAC;QACJ,MAAM,cAAc,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAErC,iFAAiF;QACjF,mFAAmF;QACnF,cAAc;QACd,EAAE;QACF,6EAA6E;QAC7E,iFAAiF;QACjF,mBAAmB;QACnB,EAAE;QACF,+EAA+E;QAC/E,oFAAoF;QACpF,+EAA+E;QAC/E,IACC,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,IAAI,IAAI;YAC/B,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,CAAC;YACrC,GAAG,CAAC,IAAI,IAAI,IAAI,EACf,CAAC;YACF,IACC,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC;gBAC5B,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC;gBACpB,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;gBAClB,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,EAClB,CAAC;gBACF,MAAM,IAAI,wBAAwB,EAAE,CAAC;YACtC,CAAC;iBAAM,CAAC;gBACP,MAAM,IAAI,mBAAmB,EAAE,CAAC;YACjC,CAAC;QACF,CAAC;QAED,IAAI,EAAE,CAAC;IACR,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,IAAI,GAAG,YAAY,mBAAmB,EAAE,CAAC;YACxC,IAAI,EAAE,CAAC;QACR,CAAC;aAAM,IAAI,GAAG,YAAY,wBAAwB,EAAE,CAAC;YACpD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,GAAG,CAAC,CAAC;QACX,CAAC;IACF,CAAC;AACF,CAAC,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -278,6 +278,7 @@ function fixProtocolMiddleware(skipUrls = []) {
|
|
|
278
278
|
};
|
|
279
279
|
}
|
|
280
280
|
function setupMiddleware(app) {
|
|
281
|
+
app.use(authMiddleware.prefetchApiKey);
|
|
281
282
|
app.use(compression({
|
|
282
283
|
level: GZIP_COMPRESSION_QUALITY,
|
|
283
284
|
params: {
|
|
@@ -306,7 +307,6 @@ function setupMiddleware(app) {
|
|
|
306
307
|
app.use(passport.initialize());
|
|
307
308
|
app.use(AUTH_PATH, cookieSession({ secret: COOKIE_SESSION_SECRET }));
|
|
308
309
|
app.use(jwt.middleware);
|
|
309
|
-
app.use(authMiddleware.prefetchApiKey);
|
|
310
310
|
}
|
|
311
311
|
async function startServer(app, port) {
|
|
312
312
|
let server;
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,9 @@ import { isJWT } from './jwt-passport.js';
|
|
|
3
3
|
const isRequest = (req) => 'get' in req;
|
|
4
4
|
const getAPIKey = async (req, tx) => {
|
|
5
5
|
try {
|
|
6
|
-
const apiKey =
|
|
6
|
+
const apiKey = req.params.apikey ?? req.query.apikey;
|
|
7
7
|
if (apiKey != null) {
|
|
8
|
-
return apiKey;
|
|
8
|
+
return await permissions.checkApiKey(apiKey, tx);
|
|
9
9
|
}
|
|
10
10
|
}
|
|
11
11
|
catch {
|
|
@@ -32,12 +32,12 @@ const getAPIKey = async (req, tx) => {
|
|
|
32
32
|
*/
|
|
33
33
|
export const prefetchAPIKey = (req, tx) => {
|
|
34
34
|
if (req.apiKey) {
|
|
35
|
-
// If the api key is already set then we
|
|
36
|
-
req.prefetchApiKey
|
|
35
|
+
// If the api key is already set then we reuse/keep that
|
|
36
|
+
req.prefetchApiKey = req.apiKey;
|
|
37
37
|
}
|
|
38
38
|
else {
|
|
39
39
|
// Start the prefetch and let it run in the background - do not await it
|
|
40
|
-
req.prefetchApiKey
|
|
40
|
+
req.prefetchApiKey ??= getAPIKey(req, tx);
|
|
41
41
|
}
|
|
42
42
|
};
|
|
43
43
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-keys.js","sourceRoot":"","sources":["../../../src/infra/auth/api-keys.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,MAAM,SAAS,GAAG,CAAC,GAA4B,EAAkB,EAAE,CAClE,KAAK,IAAI,GAAG,CAAC;AAEd,MAAM,SAAS,GAAG,KAAK,EACtB,GAA4B,EAC5B,EAAkB,EACsB,EAAE;IAC1C,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"api-keys.js","sourceRoot":"","sources":["../../../src/infra/auth/api-keys.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,MAAM,SAAS,GAAG,CAAC,GAA4B,EAAkB,EAAE,CAClE,KAAK,IAAI,GAAG,CAAC;AAEd,MAAM,SAAS,GAAG,KAAK,EACtB,GAA4B,EAC5B,EAAkB,EACsB,EAAE;IAC1C,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC;QACrD,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;YACpB,OAAO,MAAM,WAAW,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAClD,CAAC;IACF,CAAC;IAAC,MAAM,CAAC;QACR,SAAS;IACV,CAAC;IAED,6DAA6D;IAC7D,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;QACrB,OAAO;IACR,CAAC;IAED,6EAA6E;IAC7E,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChE,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5B,IAAI,CAAC;YACJ,4EAA4E;YAC5E,OAAO,MAAM,WAAW,CAAC,iBAAiB,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC/D,CAAC;QAAC,MAAM,CAAC;YACR,SAAS;QACV,CAAC;IACF,CAAC;AACF,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAC7B,GAAgE,EAChE,EAAkB,EACX,EAAE;IACT,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;QAChB,wDAAwD;QACxD,GAAG,CAAC,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC;IACjC,CAAC;SAAM,CAAC;QACP,wEAAwE;QACxE,GAAG,CAAC,cAAc,KAAK,SAAS,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAC3C,CAAC;AACF,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAClC,GAAgE,EAChE,EAAkB,EACF,EAAE;IAClB,cAAc,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACxB,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;QAChB,OAAO;IACR,CAAC;IACD,GAAG,CAAC,MAAM,KAAK,MAAM,GAAG,CAAC,cAAc,CAAC;AACzC,CAAC,CAAC"}
|
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": "30.0.
|
|
4
|
+
"version": "30.0.7",
|
|
5
5
|
"license": "AGPL-3.0",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -167,6 +167,6 @@
|
|
|
167
167
|
"loader": "ts-node/esm/transpile-only"
|
|
168
168
|
},
|
|
169
169
|
"versionist": {
|
|
170
|
-
"publishedAt": "2024-10-
|
|
170
|
+
"publishedAt": "2024-10-18T19:35:42.250Z"
|
|
171
171
|
}
|
|
172
172
|
}
|