IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Plugins: Validate root URLs when signing private plugins via grafana-toolkit (#51968)

Browse Source 
* validate URLs

* apply PR review feedback

* fix err msg
This commit is contained in:
Will Browne 2022-07-12 11:51:16 +02:00 committed by GitHub
parent e46ee78bed
commit b32ad993c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts
View File

@ -5,7 +5,7 @@ import rimrafCallback from 'rimraf';
import { promisify } from 'util'; import { promisify } from 'util';
import { getPluginId } from '../../config/utils/getPluginId'; import { getPluginId } from '../../config/utils/getPluginId';
import { getPluginJson } from '../../config/utils/pluginValidation'; import { assertRootUrlIsValid, getPluginJson } from '../../config/utils/pluginValidation';
import { import {
getJobFolder, getJobFolder,
writeJobStats, writeJobStats,
@ -141,6 +141,7 @@ const packagePluginRunner: TaskRunner<PluginCIOptions> = async ({ signatureType,
manifest.signatureType = signatureType; manifest.signatureType = signatureType;
} }
if (rootUrls) { if (rootUrls) {
rootUrls.forEach(assertRootUrlIsValid);
manifest.rootUrls = rootUrls; manifest.rootUrls = rootUrls;
} }
const signedManifest = await signManifest(manifest); const signedManifest = await signManifest(manifest);

2
packages/grafana-toolkit/src/cli/tasks/plugin.sign.ts
View File

@ -1,5 +1,6 @@
import path from 'path'; import path from 'path';
import { assertRootUrlIsValid } from '../../config/utils/pluginValidation';
import { buildManifest, signManifest, saveManifest } from '../../plugins/manifest'; import { buildManifest, signManifest, saveManifest } from '../../plugins/manifest';
import { getToolkitVersion } from './plugin.utils'; import { getToolkitVersion } from './plugin.utils';
@ -22,6 +23,7 @@ const pluginSignRunner: TaskRunner<PluginSignOptions> = async ({ signatureType,
manifest.signatureType = signatureType; manifest.signatureType = signatureType;
} }
if (rootUrls) { if (rootUrls) {
rootUrls.forEach(assertRootUrlIsValid);
manifest.rootUrls = rootUrls; manifest.rootUrls = rootUrls;
} }

8
packages/grafana-toolkit/src/config/utils/pluginValidation.ts
View File

@ -36,3 +36,11 @@ export const getPluginJson = (path: string): PluginMeta => {
return pluginJson as PluginMeta; return pluginJson as PluginMeta;
}; };
export const assertRootUrlIsValid = (rootUrl: string) => {
try {
new URL(rootUrl);
} catch (err) {
throw new Error(`${rootUrl} is not a valid URL`);
}
};