fix: remove double regex use

glasskube · Mar 4, 2024 · 1e3b76b · 1e3b76b
1 parent 0e29a94
commit 1e3b76b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/utils/url-parser.spec.ts b/src/utils/url-parser.spec.ts
@@ -2,7 +2,7 @@ import * as assert from 'node:assert';
 
 import {parseArtifactHubReferenceUrl, parseManifestUrl} from './url-parser.js';
 
-describe('utils/manifest/parse', () => {
+describe('utils/manifest/parseManifestUrl', () => {
   it('should parse version from GitHub release manifest url', () => {
     const manifest = parseManifestUrl(
       'https://raw.githubusercontent.com/username/repository/v0.0.1-alpha.10/path/to/file.yaml',
@@ -21,6 +21,11 @@ describe('utils/manifest/parse', () => {
     assert.equal(manifest.semVer.raw, 'v0.0.1-alpha.10');
     assert.equal(manifest.path, '/install/cyclops-install.yaml');
   });
+  it('should throw for invalid manifest url', () => {
+    assert.throws(() => {
+      parseManifestUrl('https://raw.githubusercontent.com/kosmoz/malicious/not-a-package/run.exe');
+    });
+  });
 });
 
 describe('utils/manifest/parseArtifactHubReference', () => {

diff --git a/src/utils/url-parser.ts b/src/utils/url-parser.ts
@@ -5,8 +5,8 @@ const MANIFEST_REGEX =
   /^https:\/\/raw.githubusercontent.com\/(?<owner>[\da-z-]+)\/(?<repo>[\da-z-]+)\/(?<version>[\d.a-z-]+)(?<path>\/.*)/;
 
 export function parseManifestUrl(manifestUrl: string): ManifestUrl {
-  if (MANIFEST_REGEX.test(manifestUrl)) {
-    const group = MANIFEST_REGEX.exec(manifestUrl)?.groups ?? {};
+  const group = MANIFEST_REGEX.exec(manifestUrl)?.groups;
+  if (group !== undefined) {
     return new ManifestUrl(manifestUrl, group.owner, group.repo, group.version, group.path);
   }
 
@@ -16,8 +16,8 @@ export function parseManifestUrl(manifestUrl: string): ManifestUrl {
 const ARTIFACT_HUB_URL_REGEX = /^https:\/\/artifacthub.io\/packages\/helm\/(?<owner>[\da-z-]+)\/(?<repo>[\da-z-]+)/;
 
 export function parseArtifactHubReferenceUrl(referenceUrl: string): ArtifactHubReference {
-  if (ARTIFACT_HUB_URL_REGEX.test(referenceUrl)) {
-    const group = ARTIFACT_HUB_URL_REGEX.exec(referenceUrl)?.groups ?? {};
+  const group = ARTIFACT_HUB_URL_REGEX.exec(referenceUrl)?.groups;
+  if (group !== undefined) {
     return new ArtifactHubReference(referenceUrl, group.owner, group.repo);
   }