@rancher/shell 3.0.5-rc.7 → 3.0.5-rc.9

package/utils/validators/formRules/__tests__/index.test.ts

@@ -97,32 +97,57 @@ describe('formRules', () => {
   });
 
   describe('urlRepository', () => {
-    const message = JSON.stringify({ message: 'validation.git.url' });
+    const message = JSON.stringify({ message: 'validation.repository.url' });
     const testCases = [
       // Valid HTTP(s)
       ['https://github.com/rancher/dashboard.git', undefined],
       ['http://github.com/rancher/dashboard.git', undefined],
       ['https://github.com/rancher/dashboard', undefined],
       ['https://github.com/rancher/dashboard/', undefined],
+      ['https://github.com/rancher/%20dashboard/', undefined],
+      ['https://github.com/rancher/dashboard/%20', undefined],
+      ['https://localhost:8005', undefined],
 
       // Valid SSH
       ['git@github.com:rancher/dashboard.git', undefined],
       ['git@github.com:rancher/dashboard', undefined],
       ['git@github.com:rancher/dashboard/', undefined],
+      ['git@github.com:rancher/%20dashboard/', undefined],
+      ['git@github.com:rancher/dashboard/%20', undefined],
+      ['git@git.apps.local:fleet/fleet-local.git', undefined],
+      ['git@git.apps.local:33333/fleet/fleet-local.git', undefined],
 
       // Not valid HTTP(s)
       ['https://github.com/rancher/  dashboard.git', message],
       ['http://github.com/rancher/  dashboard.git', message],
+      ['http://github.com/ rancher/dashboard.git', message],
+      ['http://github.com /rancher/dashboard.git', message],
       ['https://github.com/rancher/dashboard ', message],
+      ['https%20://github.com/rancher/dashboard ', message],
+      ['ht%20tps://github.com/rancher/dashboard ', message],
+      ['https://git%20hub.com/rancher/dashboard/%20', message],
+      ['https://https://', message],
+      ['http:/ww.abc.com', message],
+      ['http:ww.abc.com', message],
       ['foo://github.com/rancher/dashboard/', message],
       ['github.com/rancher/dashboard/', message],
 
       // Not valid SSH
       ['git@github.com:rancher/  dashboard.git', message],
       ['git@github.com:rancher/dashboard  ', message],
+      ['git@github.com:rancher/  dashboard', message],
+      ['git @github.com:rancher/dashboard', message],
+      ['git@github.com:  rancher/dashboard', message],
       ['git@github.comrancher/dashboard', message],
+      ['git@githubcomrancher/dashboard', message],
+      ['%20git@github.comrancher/dashboard', message],
+      ['git@git%20hub.comrancher/dashboard', message],
+      ['git@git.apps.local:/fleet/fleet-local.git', message],
+      ['git@.git', message],
+      ['git@', message],
 
-      [undefined, undefined]
+      [undefined, message],
+      ['', message]
     ];
 
     it.each(testCases)(
@@ -139,20 +164,26 @@ describe('formRules', () => {
     const message = JSON.stringify({ message: 'validation.oci.url' });
     const testCases = [
       // Valid
-      ['oci://bucket/object', undefined],
+      ['oci://registry.example.com', undefined],
+      ['oci://myregistry.dev:5000', undefined],
+      ['oci://192.168.1.100', undefined],
+      ['oci://my.domain.com/my/image:tag', undefined],
+      ['oci://localhost:5000', undefined],
       ['oci://region.objectstorage.example.com/n', undefined],
-      ['oci://a', undefined],
-      ['oci://UPPERCASE/path', undefined],
 
       // Invalid
       ['http://example.com/oci', message],
       ['https://oci.cloud.com', message],
       ['ftp://oci.server.net', message],
-      ['/path/to/oci', message],
+      ['path/to/oci', message],
+      ['oci://a', message],
       ['oci:/missing/slash', message],
       ['oci:', message],
       ['oci://', message],
-      ['oci://space between', message],
+      ['oci://oci://duplicate/protocol', message],
+      ['oci  ://registry.example.com/foo/bar', message],
+      ['oci://registry.example.  com/foo/bar', message],
+      ['oci://registry.example.com/  foo/bar', message],
       ['oci://resource multiple spaces', message],
       ['', message],
       [undefined, message],
@@ -168,6 +199,59 @@ describe('formRules', () => {
     );
   });
 
+  describe('version', () => {
+    const message = JSON.stringify({ message: 'validation.version' });
+    const testCases: (null | string | undefined)[][] = [
+      // Valid
+      ['1.2.3', undefined],
+      ['', undefined],
+      [null, undefined],
+
+      // Invalid
+      ['1.2.x', message],
+      ['foo', message],
+      ['1.2', message],
+      ['1.2.', message],
+      ['.', message],
+    ];
+
+    it.each(testCases)(
+      'should return undefined or correct message based on the provided Version: %p',
+      (version, expected) => {
+        const formRuleResult = formRules.version(version);
+
+        expect(formRuleResult).toStrictEqual(expected);
+      }
+    );
+  });
+
+  describe('semanticVersion', () => {
+    const message = JSON.stringify({ message: 'validation.semanticVersion' });
+    const testCases: (null | string | undefined)[][] = [
+      // Valid
+      ['1.2.x', undefined],
+      ['1.2.3', undefined],
+      ['1.2', undefined],
+      ['> 1', undefined],
+      ['', undefined],
+      [null, undefined],
+
+      // Invalid
+      ['foo', message],
+      ['1.2.', message],
+      ['.', message],
+    ];
+
+    it.each(testCases)(
+      'should return undefined or correct message based on the provided Semantic Version: %p',
+      (version, expected) => {
+        const formRuleResult = formRules.semanticVersion(version);
+
+        expect(formRuleResult).toStrictEqual(expected);
+      }
+    );
+  });
+
   describe('alphanumeric', () => {
     const message = JSON.stringify({ message: 'validation.alphanumeric', key: 'testDisplayKey' });
     const testCases = [

package/utils/validators/formRules/index.ts

@@ -1,3 +1,5 @@
+import semver from 'semver';
+import { parse } from '@shell/utils/url';
 import { RBAC } from '@shell/config/types';
 import { HCI } from '@shell/config/labels-annotations';
 import isEmpty from 'lodash/isEmpty';
@@ -5,7 +7,7 @@ import has from 'lodash/has';
 import isUrl from 'is-url';
 // import uniq from 'lodash/uniq';
 import { Translation } from '@shell/types/t';
-import { isHttps, isLocalhost, hasTrailingForwardSlash } from '@shell/utils/validators/setting';
+import { isHttps, isLocalhost, hasTrailingForwardSlash, isDomainWithoutProtocol } from '@shell/utils/validators/setting';
 import { cronScheduleRule } from '@shell/utils/validators/cron-schedule';
 
 // import uniq from 'lodash/uniq';
@@ -164,6 +166,8 @@ export default function(
 
   const https: Validator = (val: string) => val && !isHttps(val) ? t('validation.setting.serverUrl.https') : undefined;
 
+  const awsStyleEndpoint: Validator = (val: string) => val && !isDomainWithoutProtocol(val) ? t('validation.setting.serverUrl.awsStyleEndpoint') : undefined;
+
   const localhost: Validator = (val: string) => isLocalhost(val) ? t('validation.setting.serverUrl.localhost') : undefined;
 
   const trailingForwardSlash: Validator = (val: string) => hasTrailingForwardSlash(val) ? t('validation.setting.serverUrl.trailingForwardSlash') : undefined;
@@ -173,22 +177,91 @@ export default function(
   const genericUrl: Validator = (val: string) => val && !isUrl(val) ? t('validation.genericUrl') : undefined;
 
   const urlRepository: Validator = (url: string) => {
-    const regexPart1 = /^((http|git|ssh|http(s)|file|\/?)|(git@[\w\.]+))(:(\/\/)?)/gm;
-    const regexPart2 = /^([\w\.@\:\/\-]+)([\d\/\w.-]+?)(.git){0,1}(\/)?$/gm;
+    const message = t('validation.repository.url');
+
+    if (!url) {
+      return message;
+    }
+
+    if (url.includes(' ')) {
+      return message;
+    }
+
+    const {
+      protocol,
+      authority,
+      host,
+      port,
+      path
+    } = parse(url);
+
+    // Test duplicate protocol
+    if (!host || protocol === host) {
+      return message;
+    }
+
+    // Test http(s) protocol
+    if (protocol && (!/^(http|http(s))/gm.test(protocol) || (!url.startsWith('https://') && !url.startsWith('http://')))) {
+      return message;
+    }
+
+    // Test ssh, authority must be valid (SSH user + host)
+    if (!protocol && !port && (!authority.endsWith(':') || path.startsWith('/'))) {
+      return message;
+    }
 
-    if (url) {
-      const urlPart2 = url.replaceAll(regexPart1, '');
+    // Encoded space characters (%20) are allowed only in the path
+    const hostAndPath = `${ host }${ path.replaceAll('%20', '') }`;
 
-      return !urlPart2 || url === urlPart2 || !regexPart2.test(urlPart2.replaceAll('%20', '')) ? t('validation.git.url') : undefined;
+    // Test host/path
+    if (!/^([\w\.@\:\/\-]+)([\d\/\w.-]+?)(.git){0,1}(\/)?$/gm.test(hostAndPath)) {
+      return message;
     }
 
     return undefined;
   };
 
   const ociRegistry: Validator = (url: string) => {
-    const regex = /^oci:\/\/\S+$/gm;
+    const message = t('validation.oci.url');
+
+    if (!url) {
+      return message;
+    }
+
+    if (url.includes(' ')) {
+      return message;
+    }
+
+    const {
+      protocol,
+      host,
+      path
+    } = parse(url);
+
+    // Test duplicate protocol
+    if (!host || protocol === host) {
+      return message;
+    }
+
+    // Test oci protocol
+    if (!url.startsWith('oci://')) {
+      return message;
+    }
+
+    // Test host/path
+    if (!/^([\w\.@\:\/\-]+)([\d\/\w.-]+?)(\/)?$/gm.test(`${ host }${ path }`)) {
+      return message;
+    }
+
+    return undefined;
+  };
+
+  const version: Validator = (value: string) => {
+    return value && !semver.valid(value) ? t('validation.version') : undefined;
+  };
 
-    return !regex.test(url) ? t('validation.oci.url') : undefined;
+  const semanticVersion: Validator = (value: string) => {
+    return value && !semver.validRange(value) ? t('validation.semanticVersion') : undefined;
   };
 
   const alphanumeric: Validator = (val: string) => val && !/^[a-zA-Z0-9]+$/.test(val) ? t('validation.alphanumeric', { key }) : undefined;
@@ -541,6 +614,7 @@ export default function(
     imageUrl,
     interval,
     https,
+    awsStyleEndpoint,
     localhost,
     trailingForwardSlash,
     url,
@@ -561,9 +635,11 @@ export default function(
     isOctal,
     roleTemplateRules,
     ruleGroups,
+    semanticVersion,
     servicePort,
     subDomain,
     testRule,
+    version,
     wildcardHostname
   };
 }

package/utils/validators/setting.js

@@ -1,9 +1,26 @@
 import isUrl from 'is-url';
 
+// Note that these function cover specific use cases and you need to make sure it works for your use case before using them.
+// ie they would consider empty values as valid, not all endpoint formatting is enforced
+
 export const isServerUrl = (value) => value === 'server-url';
 
 export const isHttps = (value) => value.toLowerCase().startsWith('https://');
 
+/**
+ * Checks that provided string is a domain without protocol (case insensitive):
+ * - Cannot start with any protocol, such as http://, https://, ftp://, ftps://, udp://
+ * - Must only use the letters a to z, the numbers 0 to 9, and the dot (.) and hyphen (-) characters.
+ * - if the hyphen character is used in a domain name, it cannot be the first or the last character in the name.
+ * - The length of each label can be 2-63 characters
+ * - TLD is at least 2 characters
+ * - The total length of a domain name, including the dot at the end, cannot exceed 254 characters.
+ * - Allows for optional port and path
+ * @param {*} value
+ * @returns boolean indicating if the value is a domain without protocol
+ */
+export const isDomainWithoutProtocol = (value) => (/^(?=.{1,254}$)(?![a-z][a-z0-9+.-]*:\/\/)(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z]{2,}(?::\d{1,5})?(?:\/\S*)?$/i).test(value);
+
 export const isLocalhost = (value) => (/^(?:https?:\/\/)?(?:localhost|127\.0\.0\.1)/i).test(value);
 
 export const hasTrailingForwardSlash = (value) => isUrl(value) && value?.toLowerCase().endsWith('/');

package/vue.config.js

@@ -546,7 +546,7 @@ module.exports = function(dir, appConfig = {}) {
       config.plugins.push(getVirtualModulesAutoImport(dir));
       config.plugins.push(getPackageImport(dir));
       config.plugins.push(createEnvVariablesPlugin(routerBasePath, rancherEnv));
-      config.plugins.push(new NodePolyfillPlugin()); // required from Webpack 5 to polyfill node modules
+      config.plugins.push(new NodePolyfillPlugin({ additionalAliases: ['process'] })); // required from Webpack 5 to polyfill node modules
 
       // The static assets need to be in the built assets directory in order to get served (primarily the favicon)
       config.plugins.push(new CopyWebpackPlugin({ patterns: [{ from: path.join(SHELL_ABS, 'static'), to: '.' }] }));

package/cloud-credential/__tests__/harvester.test.ts

@@ -1,18 +0,0 @@
-import { mount } from '@vue/test-utils';
-import HarvesterCloudCreds from '@shell/cloud-credential/harvester.vue';
-
-const mockStore = { getters: { 'i18n/t': jest.fn() } };
-
-describe('cloud credentials: Harvester', () => {
-  const wrapper = mount(HarvesterCloudCreds, {
-    props:  { value: {} },
-    global: { mocks: { $store: mockStore } }
-  });
-
-  it('should display the warning banner for token expiration', async() => {
-    const warningBanner = wrapper.find('[data-testid="harvester-token-expiration-warning-banner"]');
-
-    expect(warningBanner.exists()).toBe(true);
-    expect(warningBanner.isVisible()).toBe(true);
-  });
-});

package/components/Resource/Detail/Metadata/Rectangle.vue

@@ -1,34 +0,0 @@
-<script setup lang="ts">
-export interface RectangleProps {
-    outline?: boolean;
-}
-
-const props = withDefaults(
-  defineProps<RectangleProps>(),
-  { outline: false }
-);
-
-</script>
-
-<template>
-  <div
-    class="rectangle"
-    :class="{outline: props.outline}"
-  >
-    <slot />
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.rectangle {
-    border: 1px solid var(--tag-bg);
-    border-radius: 4px;
-    padding: 0 8px;
-    height: 23px;
-    line-height: 23px;
-
-    &:not(.outline) {
-        background-color: var(--tag-bg);
-    }
-}
-</style>

package/components/Resource/Detail/Metadata/__tests__/Rectangle.test.ts

@@ -1,24 +0,0 @@
-import { mount } from '@vue/test-utils';
-import Rectangle from '@shell/components/Resource/Detail/Metadata/Rectangle.vue';
-
-describe('component: Rectangle', () => {
-  it('should render container with class title and missing outline when passed outline:false', async() => {
-    const wrapper = mount(Rectangle, { props: { outline: false } });
-
-    expect(wrapper.find('.rectangle').exists()).toBeTruthy();
-    expect(wrapper.find('.rectangle.outline').exists()).toBeFalsy();
-  });
-
-  it('should render outline class when passed outline:true', async() => {
-    const wrapper = mount(Rectangle, { props: { outline: true } });
-
-    expect(wrapper.find('.rectangle.outline').exists()).toBeTruthy();
-  });
-
-  it('should render default slot', async() => {
-    const content = 'CONTENT';
-    const wrapper = mount(Rectangle, { slots: { default: content } });
-
-    expect(wrapper.find('.rectangle').element.innerHTML).toStrictEqual(content);
-  });
-});

package/components/ResourceDetail/Masthead/__tests__/legacy.test.ts

@@ -1,65 +0,0 @@
-import { mount, RouterLinkStub } from '@vue/test-utils';
-import { _VIEW } from '@shell/config/query-params';
-import Legacy from '@shell/components/ResourceDetail/Masthead/legacy.vue';
-import { createStore } from 'vuex';
-
-const mockedStore = () => {
-  return {
-    getters: {
-      currentStore:              () => 'current_store',
-      currentProduct:            { inStore: 'cluster' },
-      isExplorer:                false,
-      currentCluster:            {},
-      'type-map/labelFor':       jest.fn(),
-      'type-map/optionsFor':     jest.fn(),
-      'current_store/schemaFor': jest.fn(),
-    },
-  };
-};
-
-const requiredSetup = () => {
-  const store = createStore({ getters: { 'management/byId': () => jest.fn() } });
-
-  return {
-    stubs: {
-      'router-link': RouterLinkStub,
-      LiveDate:      true
-    },
-    provide: { store },
-    mocks:   { $store: mockedStore() }
-  };
-};
-
-describe('component: Masthead/legacy', () => {
-  it.each([
-    ['hidden', '', false, { displayName: 'admin', location: { id: 'resource-id' } }, false, false],
-    ['plain-text', 'admin', true, { displayName: 'admin', location: null }, false, true],
-    ['link', 'foo', true, { displayName: 'foo', location: { id: 'resource-id' } }, true, false],
-  ])('"Created By" should be %p, with text: %p', (
-    _,
-    text,
-    showCreatedBy,
-    createdBy,
-    showLink,
-    showPlainText,
-  ) => {
-    const wrapper = mount(Legacy, {
-      props: {
-        mode:  _VIEW,
-        value: {
-          showCreatedBy,
-          createdBy,
-        },
-      },
-      global: { ...requiredSetup() }
-    });
-
-    const container = wrapper.find('[data-testid="masthead-subheader-createdBy"]');
-    const link = wrapper.find('[data-testid="masthead-subheader-createdBy-link"]');
-    const plainText = wrapper.find('[data-testid="masthead-subheader-createdBy_plain-text"]');
-
-    expect(link.exists()).toBe(showLink);
-    expect(plainText.exists()).toBe(showPlainText);
-    expect(showLink || showPlainText ? container.element.textContent : '').toContain(text);
-  });
-});

package/components/ResourceDetail/__tests__/index.test.ts

@@ -1,135 +0,0 @@
-import { mount } from '@vue/test-utils';
-import ResourceDetail from '@shell/components/ResourceDetail/index.vue';
-import { _EDIT, _VIEW, LEGACY, MODE } from '@shell/config/query-params';
-import * as pageEnabled from '@shell/composables/useIsNewDetailPageEnabled';
-import flushPromises from 'flush-promises';
-import { computed } from 'vue';
-
-const mockQuery: any = {};
-const mockParams: any = {};
-
-jest.mock('@shell/components/ResourceDetail/legacy.vue', () => ({
-  template: '<div class="legacy">Legacy</div>',
-  name:     'Legacy',
-  props:    ['flexContent', 'componentTestId', 'storeOverride', 'resourceOverride', 'parentRouteOverride', 'errorsMap']
-}));
-
-jest.mock('@shell/components/Loading.vue', () => ({
-  template: '<div class="loading">Loading</div>',
-  name:     'Loading'
-}));
-
-jest.mock('@shell/pages/explorer/resource/detail/configmap.vue', () => ({
-  template: '<div class="configmap">configmap</div>',
-  name:     'configmap',
-}));
-
-jest.mock('vue-router', () => ({
-  useRoute: () => ({
-    query:  mockQuery,
-    params: mockParams
-  })
-}));
-
-jest.mock('@shell/composables/useIsNewDetailPageEnabled');
-
-describe('component: ResourceDetail/index', () => {
-  const resourceName = 'configmap';
-  const useIsNewDetailPageEnabledSpy = jest.spyOn(pageEnabled, 'useIsNewDetailPageEnabled');
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('should render legacy component with default props if useIsNewDetailPageEnabledSpy is false', async() => {
-    mockParams.resource = resourceName;
-    mockQuery[MODE] = _VIEW;
-
-    useIsNewDetailPageEnabledSpy.mockReturnValue(computed(() => false));
-
-    const wrapper = mount(ResourceDetail, { });
-    const legacyComponent = wrapper.findComponent<any>({ name: 'Legacy' });
-
-    expect(legacyComponent.props('flexContent')).toStrictEqual(false);
-    expect(legacyComponent.props('componentTestId')).toStrictEqual('resource-details');
-    expect(legacyComponent.props('storeOverride')).toBeUndefined();
-    expect(legacyComponent.props('resourceOverride')).toBeUndefined();
-    expect(legacyComponent.props('parentRouteOverride')).toBeUndefined();
-    expect(legacyComponent.props('errorsMap')).toBeUndefined();
-    expect(useIsNewDetailPageEnabledSpy).toHaveBeenCalledTimes(1);
-  });
-
-  it('should render legacy component with default props if useIsNewDetailPageEnabledSpy is false but resourceName has not been added to our mapping', async() => {
-    mockParams.resource = 'notMapped';
-    mockQuery[MODE] = _VIEW;
-
-    useIsNewDetailPageEnabledSpy.mockReturnValue(computed(() => false));
-
-    const wrapper = mount(ResourceDetail, {});
-    const legacyComponent = wrapper.findComponent<any>({ name: 'Legacy' });
-
-    expect(legacyComponent.exists()).toBeTruthy();
-    expect(useIsNewDetailPageEnabledSpy).toHaveBeenCalledTimes(1);
-  });
-
-  it('should render legacy component with default props if useIsNewDetailPageEnabledSpy is false but mode is not VIEW', async() => {
-    mockParams.resource = resourceName;
-    mockQuery[MODE] = _EDIT;
-
-    useIsNewDetailPageEnabledSpy.mockReturnValue(computed(() => false));
-
-    const wrapper = mount(ResourceDetail, {});
-    const legacyComponent = wrapper.findComponent<any>({ name: 'Legacy' });
-
-    expect(legacyComponent.exists()).toBeTruthy();
-    expect(useIsNewDetailPageEnabledSpy).toHaveBeenCalledTimes(1);
-  });
-
-  it('should render legacy component while forwarding props', async() => {
-    mockParams.resource = resourceName;
-    mockQuery[MODE] = _VIEW;
-
-    const flexContent = true;
-    const componentTestId = 'componentTestId';
-    const storeOverride = 'storeOverride';
-    const resourceOverride = 'resourceOverride';
-    const parentRouteOverride = 'parentRouteOverride';
-    const errorsMap = { error: 'test' };
-
-    const wrapper = mount(ResourceDetail, {
-      props: {
-        flexContent,
-        componentTestId,
-        storeOverride,
-        resourceOverride,
-        parentRouteOverride,
-        errorsMap,
-      }
-    });
-    const legacyComponent = wrapper.findComponent<any>({ name: 'Legacy' });
-
-    expect(legacyComponent.props('flexContent')).toStrictEqual(flexContent);
-    expect(legacyComponent.props('componentTestId')).toStrictEqual(componentTestId);
-    expect(legacyComponent.props('storeOverride')).toStrictEqual(storeOverride);
-    expect(legacyComponent.props('resourceOverride')).toStrictEqual(resourceOverride);
-    expect(legacyComponent.props('parentRouteOverride')).toStrictEqual(parentRouteOverride);
-    expect(legacyComponent.props('errorsMap')).toStrictEqual(errorsMap);
-  });
-
-  it('should render new component if useIsNewDetailPageEnabledSpy is true', async() => {
-    mockParams.resource = resourceName;
-    mockParams.id = 'ID';
-    mockQuery[MODE] = _VIEW;
-    mockQuery[LEGACY] = 'false';
-
-    useIsNewDetailPageEnabledSpy.mockReturnValue(computed(() => true));
-
-    const wrapper = mount(ResourceDetail);
-
-    await flushPromises();
-    const configmapComponent = wrapper.findComponent<any>({ name: 'configmap' });
-
-    expect(configmapComponent.exists()).toBeTruthy();
-    expect(useIsNewDetailPageEnabledSpy).toHaveBeenCalledTimes(1);
-  });
-});