Skip to content
This repository has been archived by the owner on Dec 7, 2021. It is now read-only.

Validate export file name #989

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
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
28 changes: 27 additions & 1 deletion src/services/assetService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,27 @@ export class AssetService {
return metadata;
}

/**
* Validate export file name
* @param asset - asset to process
*/
public validateFileName(asset: IAsset) {
try {
let validFileName = asset.name.replace(/[*\\\/:?<>|&]/g, (c) => "%" + c.charCodeAt(0).toString(16));

if (!validFileName.endsWith(asset.format)) {
validFileName = validFileName + "." + asset.format;
}

if (validFileName !== asset.name) {
// console.log(`convert invalid file name '${asset.name}' to '${validFileName}'`);
asset.name = validFileName;
}
} catch (err) {
console.log(err);
}
}

/**
* Get metadata for asset
* @param asset - Asset for which to retrieve metadata
Expand All @@ -184,9 +205,14 @@ export class AssetService {
Guard.null(asset);

const fileName = `${asset.id}${constants.assetMetadataFileExtension}`;

this.validateFileName(asset);

try {
const json = await this.storageProvider.readText(fileName);
return JSON.parse(json) as IAssetMetadata;
const iAssetMetadata = JSON.parse(json) as IAssetMetadata;
this.validateFileName(iAssetMetadata.asset);
return iAssetMetadata;
} catch (err) {
if (asset.type === AssetType.TFRecord) {
return {
Expand Down