ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2025-01-18 02:39:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix device UUID parsing for 'balena tunnel'

Browse Source 
Change-type: patch
This commit is contained in:
Alexis Svinartchouk 2020-08-25 13:45:39 +02:00
parent fb879d3020
commit 99a478ee39
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/actions-oclif/tunnel.ts
View File

@ -28,7 +28,6 @@ import { getOnlineTargetUuid } from '../utils/patterns';
import * as _ from 'lodash';
import { tunnelConnectionToDevice } from '../utils/tunnel';
import { createServer, Server, Socket } from 'net';
import { tryAsInteger } from '../utils/validation';
import { IArg } from '@oclif/parser/lib/args';
interface FlagsDef {
@ -78,7 +77,6 @@ export default class TunnelCmd extends Command {
{
name: 'deviceOrApplication',
description: 'device uuid or application name/id',
parse: (x) => tryAsInteger(x),
required: true,
},
];

25
lib/utils/patterns.ts
View File

@ -359,10 +359,31 @@ export function inferOrSelectDevice(preferredUuid: string) {
});
}
async function getApplicationByIdOrName(
sdk: BalenaSdk.BalenaSDK,
idOrName: string,
) {
if (validation.looksLikeInteger(idOrName)) {
try {
return await sdk.models.application.get(Number(idOrName));
} catch (error) {
const { BalenaApplicationNotFound } = await import('balena-errors');
if (!instanceOf(error, BalenaApplicationNotFound)) {
throw error;
}
}
}
return await sdk.models.application.get(idOrName);
}
export async function getOnlineTargetUuid(
sdk: BalenaSdk.BalenaSDK,
applicationOrDevice: string,
) {
// applicationOrDevice can be:
// * an application name
// * an application ID (integer)
// * a device uuid
const Logger = await import('../utils/logger');
const logger = Logger.getLogger();
const appTest = validation.validateApplicationName(applicationOrDevice);
@ -390,9 +411,9 @@ export async function getOnlineTargetUuid(
// otherwise, it may be a device OR an application...
try {
logger.logDebug(
`Fetching application by name ${applicationOrDevice} (${typeof applicationOrDevice})`,
`Fetching application by ID or name ${applicationOrDevice} (${typeof applicationOrDevice})`,
);
const app = await sdk.models.application.get(applicationOrDevice);
const app = await getApplicationByIdOrName(sdk, applicationOrDevice);
const devices = await sdk.models.device.getAllByApplication(app.id, {
$filter: { is_online: true },
});

8
lib/utils/validation.ts
View File

@ -75,9 +75,13 @@ export function validateUuid(input: string): boolean {
return validateLongUuid(input) || validateShortUuid(input);
}
export function parseAsInteger(input: string, paramName?: string) {
export function looksLikeInteger(input: string) {
// Allow only digits, no leading 0
if (!/^(0|[1-9][0-9]*)$/.test(input)) {
return /^(?:0|[1-9][0-9]*)$/.test(input);
}
export function parseAsInteger(input: string, paramName?: string) {
if (!looksLikeInteger(input)) {
const message =
paramName == null
? 'The parameter must be an integer.'