@rancher/shell 0.3.14 → 0.3.15

package/store/auth.js

@@ -160,7 +160,10 @@ export const actions = {
     return findBy(authConfigs, 'id', id);
   },
 
-  setNonce({ dispatch }, opt) {
+  /**
+   * Create the basic json object used for the nonce (this includes the random nonce/state)
+   */
+  createNonce(ctx, opt) {
     const out = { nonce: randomStr(16), to: 'vue' };
 
     if ( opt.test ) {
@@ -171,7 +174,15 @@ export const actions = {
       out.provider = opt.provider;
     }
 
-    const strung = JSON.stringify(out);
+    return out;
+  },
+
+  /**
+   * Save nonce details. Information it contains will be used to validate auth requests/responses
+   * Note - this may be structurally different than the nonce we encode and send
+   */
+  saveNonce(ctx, opt) {
+    const strung = JSON.stringify(opt);
 
     this.$cookies.set(KEY, strung, {
       path:     '/',
@@ -182,6 +193,15 @@ export const actions = {
     return strung;
   },
 
+  /**
+   * Convert the nonce into something we can send
+   */
+  encodeNonce(ctx, nonce) {
+    const stringify = JSON.stringify(nonce);
+
+    return base64Encode(stringify, 'url');
+  },
+
   async redirectTo({ state, commit, dispatch }, opt = {}) {
     const provider = opt.provider;
     let redirectUrl = opt.redirectUrl;
@@ -200,10 +220,16 @@ export const actions = {
       returnToUrl = `${ window.location.origin }/verify-auth-azure`;
     }
 
-    const nonce = await dispatch('setNonce', opt);
+    // The base nonce that will be sent server way
+    const baseNonce = opt.nonce || await dispatch('createNonce', opt);
+
+    // Save a possibly expanded nonce
+    await dispatch('saveNonce', opt.persistNonce || baseNonce);
+    // Convert the base nonce in to something we can transmit
+    const encodedNonce = await dispatch('encodeNonce', baseNonce);
 
     const fromQuery = unescape(parseUrl(redirectUrl).query?.[GITHUB_SCOPE] || '');
-    const scopes = fromQuery.split(/[, ]+/).filter(x => !!x);
+    const scopes = fromQuery.split(/[, ]+/).filter((x) => !!x);
 
     if (BASE_SCOPES[provider]) {
       addObjects(scopes, BASE_SCOPES[provider]);
@@ -216,8 +242,8 @@ export const actions = {
     let url = removeParam(redirectUrl, GITHUB_SCOPE);
 
     const params = {
-      [GITHUB_SCOPE]: scopes.join(','),
-      [GITHUB_NONCE]: base64Encode(nonce, 'url')
+      [GITHUB_SCOPE]: scopes.join(opt.scopesJoinChar || ','), // Some providers won't accept comma separated scopes
+      [GITHUB_NONCE]: encodedNonce
     };
 
     if (!url.includes(GITHUB_REDIRECT)) {
@@ -249,9 +275,16 @@ export const actions = {
       return ERR_NONCE;
     }
 
+    const body = { code };
+
+    // If the request came with a pkce code ensure we also sent that in the verify
+    if (parsed.pkceCodeVerifier) {
+      body.code_verifier = parsed.pkceCodeVerifier;
+    }
+
     return dispatch('login', {
       provider,
-      body: { code }
+      body
     });
   },
 

package/store/aws.js

@@ -190,7 +190,7 @@ export const actions = {
       const res = await client[cmd](opt);
 
       if ( !key ) {
-        key = Object.keys(res).find(x => isArray(res[x]));
+        key = Object.keys(res).find((x) => isArray(res[x]));
       }
 
       addObjects(out, res[key]);

package/store/catalog.js

@@ -75,7 +75,7 @@ export const getters = {
   },
 
   charts(state, getters, rootState, rootGetters) {
-    const repoKeys = getters.repos.map(x => x._key);
+    const repoKeys = getters.repos.map((x) => x._key);
     let cluster = rootGetters['currentCluster'];
 
     if ( rootGetters['currentProduct']?.inStore === 'management' ) {
@@ -120,7 +120,7 @@ export const getters = {
       });
 
       if ( includeHidden === false ) {
-        matching = matching.filter(x => !x.hidden);
+        matching = matching.filter((x) => !x.hidden);
       }
 
       if ( !matching.length ) {
@@ -176,7 +176,7 @@ export const getters = {
       name = name.toLowerCase().trim();
       chartVersion = normalizeVersion(chartVersion);
 
-      const matching = getters.charts.filter(chart => chart.chartName.toLowerCase().trim() === name);
+      const matching = getters.charts.filter((chart) => chart.chartName.toLowerCase().trim() === name);
 
       if ( !matching.length ) {
         return;
@@ -192,9 +192,9 @@ export const getters = {
       if ( wantVersion === 'latest' ) {
         version = chart.versions[0];
       } else if ( wantVersion === 'match' || wantVersion === 'matching' ) {
-        version = chart.versions.find(v => normalizeVersion(v.version) === chartVersion);
+        version = chart.versions.find((v) => normalizeVersion(v.version) === chartVersion);
       } else {
-        version = chart.versions.find(v => normalizeVersion(v.version) === wantVersion);
+        version = chart.versions.find((v) => normalizeVersion(v.version) === wantVersion);
       }
 
       if ( version ) {
@@ -205,7 +205,7 @@ export const getters = {
 
   versionProviding(state, getters) {
     return ({ repoType, repoName, gvr }) => {
-      const matching = getters.charts.filter(chart => chart.provides.includes(gvr) );
+      const matching = getters.charts.filter((chart) => chart.provides.includes(gvr) );
 
       if ( !matching.length ) {
         return;
@@ -215,7 +215,7 @@ export const getters = {
         preferSameRepo(matching, repoType, repoName);
       }
 
-      const version = matching[0].versions.find(version => version.annotations?.[CATALOG_ANNOTATIONS.PROVIDES] === gvr);
+      const version = matching[0].versions.find((version) => version.annotations?.[CATALOG_ANNOTATIONS.PROVIDES] === gvr);
 
       if ( version ) {
         return clone(version);
@@ -274,7 +274,7 @@ export const getters = {
       const allPaths = require.context('@shell/chart', true, /\.vue$/).keys();
 
       allPaths
-        .filter(path => path.startsWith(stepsPath))
+        .filter((path) => path.startsWith(stepsPath))
         .forEach((path) => {
           try {
             steps.push({
@@ -354,6 +354,7 @@ export const actions = {
 
     // As per comment above, when there are no clusters this will be management. Store it such that it can be used for those cases
     commit('setInStore', inStore);
+    hash.cluster = hash.cluster.filter((repo) => !(repo?.metadata?.annotations?.[CATALOG_ANNOTATIONS.HIDDEN_REPO] === 'true'));
 
     commit('setRepos', hash);
 
@@ -399,7 +400,7 @@ export const actions = {
   },
 
   async refresh({ getters, commit, dispatch }) {
-    const promises = getters.repos.map(x => x.refresh());
+    const promises = getters.repos.map((x) => x.refresh());
 
     // @TODO wait for repo state to indicate they're done once the API has that
 
@@ -567,7 +568,7 @@ function normalizeVersion(v) {
 }
 
 function filterCategories(categories) {
-  categories = (categories || []).map(x => normalizeCategory(x));
+  categories = (categories || []).map((x) => normalizeCategory(x));
 
   const out = [];
 
@@ -650,7 +651,7 @@ export function filterAndArrangeCharts(charts, {
 
     if ( searchQuery ) {
       // The search filter doesn't match
-      const searchTokens = searchQuery.split(/\s*[, ]\s*/).map(x => ensureRegex(x, false));
+      const searchTokens = searchQuery.split(/\s*[, ]\s*/).map((x) => ensureRegex(x, false));
 
       for ( const token of searchTokens ) {
         const chartDescription = c.chartDescription || '';

package/store/digitalocean.js

@@ -39,7 +39,7 @@ export const mutations = {
 };
 
 export const getters = {
-  fromCache: state => ({ credentialId, key }) => {
+  fromCache: (state) => ({ credentialId, key }) => {
     return state.cache[credentialId]?.[key];
   },
 };
@@ -64,8 +64,8 @@ export const actions = {
     const regions = await dispatch('cachedCommand', { credentialId, command: 'regions' });
     const sizes = await dispatch('cachedCommand', { credentialId, command: 'sizes' });
 
-    const regionInfo = regions.regions.find(x => x.slug === region);
-    const available = sizes.sizes.filter(size => regionInfo.sizes.includes(size.slug)).map((size) => {
+    const regionInfo = regions.regions.find((x) => x.slug === region);
+    const available = sizes.sizes.filter((size) => regionInfo.sizes.includes(size.slug)).map((size) => {
       const match = size.slug.match(/^(so|gd|g|c|m|s).*-/);
       const plan = match ? match[1] : (size.slug.includes('-') ? 'standard' : 'other');
 
@@ -81,7 +81,7 @@ export const actions = {
       out.label = rootGetters['i18n/t']('cluster.machineConfig.digitalocean.sizeLabel', out);
 
       return out;
-    }).filter(size => size.plan !== 'other');
+    }).filter((size) => size.plan !== 'other');
 
     return sortBy(available, ['planSort', 'memoryGb', 'vcpus', 'disk']);
   },

package/store/features.js

@@ -30,6 +30,7 @@ export const RKE2 = create('rke2', true);
 export const UNSUPPORTED_STORAGE_DRIVERS = create('unsupported-storage-drivers', false);
 export const FLEET = create('continuous-delivery', true);
 export const HARVESTER = create('harvester', true);
+export const HARVESTER_CONTAINER = create('harvester-baremetal-container-workload', false);
 
 // Not currently used.. no point defining ones we don't use
 // export const EMBEDDED_CLUSTER_API = create('embedded-cluster-api', true);

package/store/github.js

@@ -1,252 +1,109 @@
-import dayjs from 'dayjs';
-import { addParam, parseLinkHeader } from '@shell/utils/url';
-import { addObjects, isArray } from '@shell/utils/array';
-import { GITHUB_REPOS, GITHUB_SCOPES, _DATE } from '@shell/config/local-storage';
+const GITHUB_BASE_API = 'https://api.github.com';
+const MAX_RESULTS = 100; // max number of results is 100
 
-const API_BASE = 'https://api.github.com/';
+const fetchGithubAPI = async(endpoint) => {
+  const response = await fetch(`${ GITHUB_BASE_API }/${ endpoint }`);
 
-export const EXTENDED_SCOPES = ['repo'];
+  // If rate-limit is exceeded, we should wait until the rate limit is reset
+  if (response.status === 403) {
+    const resetTime = new Date(response.headers.get('X-RateLimit-Reset') * 1000);
 
-export const DOCKERFILE = /^Dockerfile(\..*)?$/i;
-export const YAML_FILE = /^.*\.ya?ml$/i;
-
-function getFromStorage(key) {
-  if ( process.server ) {
-    return null;
-  }
-
-  const cached = window.localStorage.getItem(key);
-
-  if ( cached ) {
-    try {
-      const parsed = JSON.parse(cached);
-
-      return parsed;
-    } catch (e) {}
+    throw new Error(`Rate limit exceeded. Try again at ${ resetTime }`);
   }
-}
-
-function getCachedRepos() {
-  const cached = getFromStorage(GITHUB_REPOS);
-
-  return cached || [];
-}
-
-function getCachedScopes() {
-  const cached = getFromStorage(GITHUB_SCOPES);
-
-  return cached;
-}
 
-function hasCached() {
-  if ( process.server ) {
-    return false;
+  if (!response.ok) {
+    throw response;
   }
 
-  const cached = window.localStorage.getItem(GITHUB_REPOS);
-
-  return !!cached;
-}
-
-function cacheExpired() {
-  if ( process.server ) {
-    return false;
-  }
-
-  const updated = window.localStorage.getItem(GITHUB_REPOS + _DATE);
-
-  if ( updated && dayjs().diff(updated) <= 60 * 60 * 1000 ) {
-    return false;
-  }
-
-  return true;
-}
-
-function setCache(repos, scopes) {
-  if ( repos ) {
-    window.localStorage.setItem(GITHUB_REPOS, JSON.stringify(repos));
-    window.localStorage.setItem(GITHUB_REPOS + _DATE, (new Date()).toISOString());
-  }
-
-  if ( scopes ) {
-    window.localStorage.setItem(GITHUB_SCOPES, JSON.stringify(scopes));
-  }
-}
-
-function forgetCache() {
-  window.localStorage.removeItem(GITHUB_REPOS);
-  window.localStorage.removeItem(GITHUB_REPOS + _DATE);
-  window.localStorage.removeItem(GITHUB_SCOPES);
-}
-
-function proxifyUrl(url) {
-  // Strip off absolute links to github API
-  if ( url.startsWith(API_BASE) ) {
-    url = url.substr(API_BASE.length);
-  }
-
-  // Add our proxy prefix
-  url = `/v1/github/${ url.replace(/^\/+/, '') }`;
-
-  // Less pages please
-  addParam(url, 'per_page', 100);
-
-  return url;
-}
-
-export const state = function() {
-  return {
-    repos:  [],
-    scopes: []
-  };
+  return await response.json();
 };
 
+export const getters = {};
+
 export const actions = {
-  async apiList({ commit, dispatch }, {
-    url = null,
-    single = false,
-    depaginate = true,
-    onPageFn = null,
-    objectKey = 'items',
-  } = {}) {
-    const out = [];
-
-    url = proxifyUrl(url);
-
-    while ( true ) {
-      console.log('Github Request:', url); // eslint-disable-line no-console
-      const res = await dispatch('rancher/request', { url }, { root: true });
-      const links = parseLinkHeader(res._headers['link']);
-
-      const scopes = res._headers['x-oauth-scopes'];
-
-      if ( scopes ) {
-        commit('setScopes', scopes.split(/\s*,\s*/));
+  async apiList(ctx, {
+    username, endpoint, repo, branch
+  }) {
+    try {
+      switch (endpoint) {
+      case 'branches': {
+        return await fetchGithubAPI(`repos/${ username }/${ repo }/branches?per_page=${ MAX_RESULTS }`);
       }
-
-      if ( single ) {
-        return res;
+      case 'repo': {
+        return await fetchGithubAPI(`repos/${ username }/${ repo }`);
       }
-
-      addObjects(out, isArray(res) ? res : res[objectKey]);
-
-      if ( onPageFn ) {
-        onPageFn(out);
+      case 'commits': {
+        return await fetchGithubAPI(`repos/${ username }/${ repo }/commits?sha=${ branch }&sort=updated&per_page=${ MAX_RESULTS }`);
       }
-
-      if ( depaginate && links.next ) {
-        url = proxifyUrl(links.next);
-      } else {
-        break;
+      case 'recentRepos': {
+        return await fetchGithubAPI(`users/${ username }/repos?per_page=${ MAX_RESULTS }`);
       }
-    }
+      case 'search': {
+        // Fetch for a specific branches
+        if (username && repo && branch) {
+          const response = await fetchGithubAPI(`repos/${ username }/${ repo }/branches/${ branch }`);
 
-    return out;
-  },
-
-  forgetCache() {
-    forgetCache();
-  },
+          return [response];
+        }
 
-  async fetchRecentRepos({ commit, dispatch }, { allowCache = true } = {}) {
-    const cachedScopes = getCachedScopes();
+        // Fetch for repos
+        const response = await fetchGithubAPI(`search/repositories?q=repo:${ username }/${ repo }`);
 
-    if ( cachedScopes ) {
-      commit('setScopes', cachedScopes);
-    }
-
-    if ( allowCache && hasCached() ) {
-      const cached = getCachedRepos();
-
-      if ( cacheExpired() ) {
-        dispatch('fetchRecentRepos', { allowCache: false });
+        if (response) {
+          return response.items;
+        }
       }
-
-      return cached;
+      }
+    } catch (error) {
+      throw await error.json() ?? Error(`Error fetching ${ endpoint }`);
     }
-
-    const res = await dispatch('apiList', { url: '/user/repos?sort=updated', depaginate: false });
-    const more = await dispatch('apiList', { url: '/user/repos?affiliation=owner,collaborator' });
-    const out = [...res, ...more];
-
-    commit('setRepos', out);
-
-    return out;
   },
 
-  async searchRepos({ state, dispatch }, { search }) {
-    if ( !search ) {
-      return state.repos.slice();
-    }
-
-    const res = await dispatch('apiList', {
-      url:        `/search/repositories?q=${ escape(search) }`,
-      depaginate: false
-    });
+  async fetchRecentRepos({ commit, dispatch }, { username } = {}) {
+    const res = await dispatch('apiList', { username, endpoint: 'recentRepos' });
 
     return res;
   },
 
-  async fetchRepoByUrl({ dispatch }, url) {
-    url = url.replace(/.git$/i, '');
-    url = url.replace(/https:\/\/github.com\//, '');
-    url = `/repos/${ url }`;
-    const res = await dispatch('apiList', { url, single: true });
+  async fetchRepoDetails({ commit, dispatch }, { username, repo } = {}) {
+    const res = await dispatch('apiList', {
+      username, endpoint: 'repo', repo: repo.name
+    });
 
     return res;
   },
 
-  async fetchBranches({ dispatch }, { repo }) {
-    const url = repo.branches_url.replace('{/branch}', '');
-    const res = await dispatch('apiList', { url });
+  async fetchBranches({ commit, dispatch }, { repo, username }) {
+    const res = await dispatch('apiList', {
+      username, endpoint: 'branches', repo: repo.name
+    });
 
     return res;
   },
 
-  async fetchBranch({ dispatch }, { repo, name }) {
-    name = name || 'master';
-
-    const url = repo.branches_url.replace('{/branch}', `/${ name }`);
-    const res = await dispatch('apiList', { url, single: true });
+  async fetchCommits(ctx, { repo, username, branch }) {
+    const { dispatch } = ctx;
+    const res = await dispatch('apiList', {
+      username, endpoint: 'commits', repo: repo.name, branch: branch.name
+    });
 
     return res;
   },
-
-  async fetchFiles({ dispatch }, { repo, branch, pattern = null }) {
-    let url = repo.trees_url.replace('{/sha}', `/${ branch.commit.sha }`);
-
-    url = addParam(url, 'recursive', 1);
-
-    const res = await dispatch('apiList', { url, objectKey: 'tree' });
-
-    if ( !pattern ) {
-      return res;
+  async search({ dispatch }, { repo, username, branch }) {
+    try {
+      const res = await dispatch('apiList', {
+        username, endpoint: 'search', repo: repo?.name, branch: branch?.name
+      });
+
+      return {
+        ...res,
+        hasError: false,
+      };
+    } catch (error) {
+      return {
+        message:  error.message,
+        hasError: true
+      };
     }
-
-    const out = res.filter(file => file.type === 'blob' && file.path.match(pattern));
-
-    return out;
-  },
-
-  async fetchFile({ dispatch }, { repo, branch, file }) {
-    let url = repo.contents_url.replace('{+path}', file);
-
-    url = addParam(url, 'ref', branch.commit.sha);
-
-    const res = await dispatch('apiList', { url, single: true });
-
-    return res;
-  },
-};
-
-export const mutations = {
-  setScopes(state, scopes) {
-    state.scopes = scopes;
-    setCache(null, scopes);
-  },
-
-  setRepos(state, repos) {
-    state.repos = repos;
-    setCache(repos);
   },
 };