bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 08:13:42 +00:00
Code Issues Releases Wiki Activity

[PM-686] [CLI] Add proxy support for file downloads (#7345)

Browse Source 
* Add proxy support for file downloads

Instead of using node's native fetch we extend ApiService with NodeApiService to add support for proxies using `node-fetch`

* Add comments to the DownloadCommand

---------

Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
This commit is contained in:
Daniel James Smith
2024-12-10 15:36:53 +01:00
committed by GitHub
parent 99008267e6
commit 065725df7a
6 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
apps/cli/src/commands/download.command.ts
View File

@@ -1,7 +1,6 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
import * as fet from "node-fetch";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
import { EncArrayBuffer } from "@bitwarden/common/platform/models/domain/enc-array-buffer";
import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
@@ -10,16 +9,36 @@ import { Response } from "../models/response";
import { FileResponse } from "../models/response/file.response";
import { CliUtils } from "../utils";
/**
* Used to download and save attachments
*/
export abstract class DownloadCommand {
constructor(protected encryptService: EncryptService) {}
/**
* @param encryptService - Needed for decryption of the retrieved attachment
* @param apiService - Needed to override the existing nativeFetch which is available as of Node 18, to support proxies
*/
constructor(
protected encryptService: EncryptService,
protected apiService: ApiService,
) {}
/**
* Fetches an attachment via the url, decrypts it's content and saves it to a file
* @param url - url used to retrieve the attachment
* @param key - SymmetricCryptoKey to decrypt the file contents
* @param fileName - filename used when written to disk
* @param output - If output is empty or `--raw` was passed to the initial command the content is output onto stdout
* @returns Promise<FileResponse>
*/
protected async saveAttachmentToFile(
url: string,
key: SymmetricCryptoKey,
fileName: string,
output?: string,
) {
const response = await fet.default(new fet.Request(url, { headers: { cache: "no-cache" } }));
const response = await this.apiService.nativeFetch(
new Request(url, { headers: { cache: "no-cache" } }),
);
if (response.status !== 200) {
return Response.error(
"A " + response.status + " error occurred while downloading the attachment.",

4
apps/cli/src/commands/get.command.ts
View File

@@ -60,13 +60,13 @@ export class GetCommand extends DownloadCommand {
private keyService: KeyService,
encryptService: EncryptService,
private searchService: SearchService,
private apiService: ApiService,
protected apiService: ApiService,
private organizationService: OrganizationService,
private eventCollectionService: EventCollectionService,
private accountProfileService: BillingAccountProfileStateService,
private accountService: AccountService,
) {
super(encryptService);
super(encryptService, apiService);
}
async run(object: string, id: string, cmdOptions: Record<string, any>): Promise<Response> {