ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2024-12-19 13:47:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1866 from balena-os/fix-token-memoization

Browse Source 
Fix memoization of registry token request
This commit is contained in:
bulldozer-balena[bot] 2022-01-17 21:28:12 +00:00 committed by GitHub
commit 4cbef6046b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/lib/docker-utils.ts
View File

@ -367,13 +367,27 @@ export async function isV2DeltaImage(imageName: string): Promise<boolean> {
return inspect.Size < 40 && inspect.VirtualSize < 40;
}
const getAuthToken = memoizee(
async (
const getAuthToken = (() => {
const memoizedGetToken = memoizee(
async (tokenUrl: string, tokenOpts) => {
const tokenResponseBody = (
await (await request.getRequestInstance()).getAsync(tokenUrl, tokenOpts)
)[1];
const token = tokenResponseBody?.token;
if (token == null) {
throw new ImageAuthenticationError('Authentication error');
}
return token;
},
{ maxAge: DELTA_TOKEN_TIMEOUT, promise: true, primitive: true },
);
return async (
srcInfo: ImageNameParts,
dstInfo: ImageNameParts,
deltaOpts: DeltaFetchOptions,
): Promise<string> => {
const tokenEndpoint = `${deltaOpts.apiEndpoint}/auth/v1/token`;
const tokenOpts: request.requestLib.CoreOptions = {
auth: {
user: `d_${deltaOpts.uuid}`,
@ -382,18 +396,7 @@ const getAuthToken = memoizee(
},
json: true,
};
const tokenUrl = `${tokenEndpoint}?service=${dstInfo.registry}&scope=repository:${dstInfo.imageName}:pull&scope=repository:${srcInfo.imageName}:pull`;
const tokenResponseBody = (
await (await request.getRequestInstance()).getAsync(tokenUrl, tokenOpts)
)[1];
const token = tokenResponseBody != null ? tokenResponseBody.token : null;
if (token == null) {
throw new ImageAuthenticationError('Authentication error');
}
return token;
},
{ maxAge: DELTA_TOKEN_TIMEOUT, promise: true },
);
const tokenUrl = `${deltaOpts.apiEndpoint}/auth/v1/token?service=${dstInfo.registry}&scope=repository:${dstInfo.imageName}:pull&scope=repository:${srcInfo.imageName}:pull`;
return memoizedGetToken(tokenUrl, tokenOpts);
};
})();