Skip to content

fix: incorrect certificate flashing command string #2181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 20, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix: incorrect certificate flashing command string
Use a `string` array of command flags instead of the concatenated final
`string` command.

Ref: #2067

Closes #2179

Signed-off-by: Akos Kitta <a.kitta@arduino.cc>
  • Loading branch information
Akos Kitta committed Aug 20, 2023
commit ab9490d4355e7f8c23649aa569934c5323cdb97c
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ import {
import { ArduinoFirmwareUploader } from '../../common/protocol/arduino-firmware-uploader';
import { nls } from '@theia/core/lib/common';

interface UploadCertificateParams {
readonly fqbn: string;
readonly address: string;
readonly urls: readonly string[];
}

@injectable()
export class UploadCertificate extends Contribution {
@inject(UploadCertificateDialog)
Expand Down Expand Up @@ -74,12 +80,17 @@ export class UploadCertificate extends Contribution {
});

registry.registerCommand(UploadCertificate.Commands.UPLOAD_CERT, {
execute: async ({ fqbn, address, urls }) => {
return this.arduinoFirmwareUploader.uploadCertificates(
`-b ${fqbn} -a ${address} ${urls
.map((url: string) => `-u ${url}`)
.join(' ')}`
);
execute: async (params: UploadCertificateParams) => {
const { fqbn, address, urls } = params;
return this.arduinoFirmwareUploader.uploadCertificates({
flags: [
'-b',
fqbn,
'-a',
address,
...urls.flatMap((url) => ['-u', url]),
],
});
},
});

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Port } from "./boards-service";
import type { Port } from './boards-service';

export const ArduinoFirmwareUploaderPath =
'/services/arduino-firmware-uploader';
Expand All @@ -13,7 +13,7 @@ export type FirmwareInfo = {
export interface ArduinoFirmwareUploader {
list(fqbn?: string): Promise<FirmwareInfo[]>;
flash(firmware: FirmwareInfo, port: Port): Promise<string>;
uploadCertificates(command: string): Promise<any>;
uploadCertificates(params: { flags: string[] }): Promise<any>;
updatableBoards(): Promise<string[]>;
availableFirmwares(fqbn: string): Promise<FirmwareInfo[]>;
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ export class ArduinoFirmwareUploaderImpl implements ArduinoFirmwareUploader {
@inject(MonitorManager)
private readonly monitorManager: MonitorManager;

async uploadCertificates(command: string): Promise<string> {
return await this.runCommand(['certificates', 'flash', command]);
async uploadCertificates(params: { flags: string[] }): Promise<string> {
return await this.runCommand(['certificates', 'flash', ...params.flags]);
}

async list(fqbn?: string): Promise<FirmwareInfo[]> {
Expand Down