jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-20 09:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow http/https only for Flash from URL

Browse Source 
Change-type: patch
Changelog-entry: Allow http/https only for Flash from URL
Signed-off-by: Lorenzo Alberto Maria Ambrosi <lorenzothunder.ambrosi@gmail.com>
This commit is contained in:
Lorenzo Alberto Maria Ambrosi 2020-04-24 15:04:24 +02:00
parent ac2e973cb0
commit 39ed67d667
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/gui/app/components/source-selector/source-selector.tsx
View File

@ -47,7 +47,7 @@ import { SVGIcon } from '../svg-icon/svg-icon';
const recentUrlImagesKey = 'recentUrlImages'; const recentUrlImagesKey = 'recentUrlImages';
function normalizeRecentUrlImages(urls: any[]): string[] { function normalizeRecentUrlImages(urls: any): string[] {
if (!Array.isArray(urls)) { if (!Array.isArray(urls)) {
urls = []; urls = [];
} }
@ -362,6 +362,19 @@ export class SourceSelector extends React.Component<
path: imagePath, path: imagePath,
}); });
} else { } else {
if (
!_.startsWith(imagePath, 'https://') &&
!_.startsWith(imagePath, 'http://')
) {
const invalidImageError = errors.createUserError({
title: 'Unsupported protocol',
description: messages.error.unsupportedProtocol(),
});
osDialog.showError(invalidImageError);
analytics.logEvent('Unsupported protocol', { path: imagePath });
return;
}
source = new sourceDestination.Http(imagePath); source = new sourceDestination.Http(imagePath);
} }

4
lib/shared/messages.ts
View File

@ -191,4 +191,8 @@ export const error = {
'Please try again, and contact the Etcher team if the problem persists.', 'Please try again, and contact the Etcher team if the problem persists.',
].join(' '); ].join(' ');
}, },
unsupportedProtocol: () => {
return 'Only http:// and https:// URLs are supported.';
},
}; };