lib/utils/services-utils.js
38 ↗	(On Diff #45925)	Can we name this something more specific? Either `blobResponseIsInvalidCSAT` or `httpResponseIsInvalidCSAT` would be good, I think

This revision is now accepted and ready to land.Nov 25 2024, 5:33 AM

bartek added inline comments.Nov 25 2024, 7:08 AM

lib/utils/services-utils.js
38 ↗	(On Diff #45925)	Yes, I'll do that. `httpResponseIsInvalidCSAT` sounds good

Rebase. Rename function to httpResponseIsInvalidCSAT

Harbormaster completed remote builds in B32840: Diff 46055.Nov 26 2024, 4:48 AM

Closed by commit rCOMM39f3157f8ad7: [lib][keyserver] Handle invalid CSAT in BlobOperationResult (authored by bartek). · Explain WhyNov 29 2024, 5:03 AM

This revision was automatically updated to reflect the committed changes.

bartek added a commit: rCOMM39f3157f8ad7: [lib][keyserver] Handle invalid CSAT in BlobOperationResult.

Revision Contents
Changeset List

Path

Size

keyserver/

src/

services/

blob.js

22 lines

lib/

actions/

upload-actions.js

20 lines

utils/

blob-service-upload.js

5 lines

blob-service.js

32 lines

services-utils.js

13 lines

Diff 46136

View Options

keyserver/src/services/blob.js

// @flow		// @flow

import type { BlobHashAndHolder } from 'lib/types/holder-types.js';		import type { BlobHashAndHolder } from 'lib/types/holder-types.js';
import {		import {
downloadBlob,		downloadBlob,
removeBlobHolder,		removeBlobHolder,
assignBlobHolder,		assignBlobHolder,
} from 'lib/utils/blob-service.js';		} from 'lib/utils/blob-service.js';
import {		import {
uploadBlob,		uploadBlob,
removeMultipleHolders,		removeMultipleHolders,
type BlobOperationResult,		type BlobOperationResult,
} from 'lib/utils/blob-service.js';		} from 'lib/utils/blob-service.js';
import { createHTTPAuthorizationHeader } from 'lib/utils/services-utils.js';		import { createHTTPAuthorizationHeader } from 'lib/utils/services-utils.js';

		import { clearIdentityInfo } from '../user/identity.js';
import { verifyUserLoggedIn } from '../user/login.js';		import { verifyUserLoggedIn } from '../user/login.js';
import { getContentSigningKey } from '../utils/olm-utils.js';		import { getContentSigningKey } from '../utils/olm-utils.js';

async function createRequestHeaders(		async function createRequestHeaders(
includeContentType: boolean = true,		includeContentType: boolean = true,
): Promise<{ [string]: string }> {		): Promise<{ [string]: string }> {
const [{ userId: userID, accessToken }, deviceID] = await Promise.all([		const [{ userId: userID, accessToken }, deviceID] = await Promise.all([
verifyUserLoggedIn(),		verifyUserLoggedIn(),
Show All 17 Lines	type BlobDescriptor = {
+holder: string,		+holder: string,
};		};

async function assignHolder(		async function assignHolder(
params: BlobDescriptor,		params: BlobDescriptor,
): Promise<BlobOperationResult> {		): Promise<BlobOperationResult> {
const { hash: blobHash, holder } = params;		const { hash: blobHash, holder } = params;
const headers = await createRequestHeaders();		const headers = await createRequestHeaders();
return assignBlobHolder({ blobHash, holder }, headers);		const assignResult = await assignBlobHolder({ blobHash, holder }, headers);
		if (!assignResult.success && assignResult.reason === 'INVALID_CSAT') {
		await clearIdentityInfo();
		}
		return assignResult;
}		}

async function uploadBlobKeyserverWrapper(		async function uploadBlobKeyserverWrapper(
blob: Blob,		blob: Blob,
hash: string,		hash: string,
): Promise<BlobOperationResult> {		): Promise<BlobOperationResult> {
const authHeaders = await createRequestHeaders(false);		const authHeaders = await createRequestHeaders(false);
return uploadBlob(blob, hash, authHeaders);		const uploadResult = await uploadBlob(blob, hash, authHeaders);
		if (!uploadResult.success && uploadResult.reason === 'INVALID_CSAT') {
		await clearIdentityInfo();
		}
		return uploadResult;
}		}

async function upload(		async function upload(
blob: Blob,		blob: Blob,
params: BlobDescriptor,		params: BlobDescriptor,
): Promise<		): Promise<
\| {		\| {
+success: true,		+success: true,
Show All 37 Lines	async function download(hash: string): Promise<BlobDownloadResult> {
}		}
const blob = await blobResult.response.blob();		const blob = await blobResult.response.blob();
return { found: true, blob };		return { found: true, blob };
}		}

async function deleteBlob(params: BlobDescriptor, instant?: boolean) {		async function deleteBlob(params: BlobDescriptor, instant?: boolean) {
const { hash: blobHash, holder } = params;		const { hash: blobHash, holder } = params;
const headers = await createRequestHeaders();		const headers = await createRequestHeaders();
await removeBlobHolder({ blobHash, holder }, headers, instant);		const removeResult = await removeBlobHolder(
		{ blobHash, holder },
		headers,
		instant,
		);
		if (!removeResult.success && removeResult.reason === 'INVALID_CSAT') {
		await clearIdentityInfo();
		}
}		}

async function removeBlobHolders(holders: $ReadOnlyArray<BlobHashAndHolder>) {		async function removeBlobHolders(holders: $ReadOnlyArray<BlobHashAndHolder>) {
const headers = await createRequestHeaders(false);		const headers = await createRequestHeaders(false);
await removeMultipleHolders(holders, headers);		await removeMultipleHolders(holders, headers);
}		}

export {		export {
upload,		upload,
uploadBlob,		uploadBlob,
assignHolder,		assignHolder,
download,		download,
deleteBlob,		deleteBlob,
uploadBlobKeyserverWrapper,		uploadBlobKeyserverWrapper,
removeBlobHolders,		removeBlobHolders,
};		};

View Options

lib/actions/upload-actions.js

View Options

lib/utils/blob-service-upload.js

Show First 20 Lines • Show All 47 Lines • ▼ Show 20 Lines	): Promise<void> {
}		}

let failed = false;		let failed = false;
const responsePromise = new Promise<void>((resolve, reject) => {		const responsePromise = new Promise<void>((resolve, reject) => {
xhr.onload = () => {		xhr.onload = () => {
if (failed) {		if (failed) {
return;		return;
}		}
		if (xhr.status === 401 \|\| xhr.status === 403) {
		failed = true;
		reject(new Error('invalid_csat'));
		return;
		}
resolve();		resolve();
};		};
xhr.onabort = () => {		xhr.onabort = () => {
failed = true;		failed = true;
reject(new Error('request aborted'));		reject(new Error('request aborted'));
};		};
xhr.onerror = event => {		xhr.onerror = event => {
failed = true;		failed = true;
Show All 27 Lines

View Options

lib/utils/blob-service.js

View Options

lib/utils/services-utils.js

[lib][keyserver] Handle invalid CSAT in BlobOperationResultClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 46136

keyserver/src/services/blob.js

lib/actions/upload-actions.js

lib/utils/blob-service-upload.js

lib/utils/blob-service.js

lib/utils/services-utils.js

[lib][keyserver] Handle invalid CSAT in BlobOperationResult
ClosedPublic
Actions

Revision Contents
Changeset List