Skip to content

SCCM-1815: Reduce dashboard and server vulnerabilities with safe dependency and build fixes #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Riyasoni0 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

SCCM-1815: Reduce dashboard and server vulnerabilities with safe dependency and build fixes #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa98699
Fixing vulnerabilities for npm and node
Riyasoni0 May 13, 2026
5825d8e
Merge branch 'master' into Fixing-vulnerabilities-for-npm-and-node
Riyasoni0 May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dashboard/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion dashboard/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"v-page": "^2.0.10",
"v-tooltip": "^2.1.3",
"vee-validate": "2.0.9",
"vue": "^2.6.14",
"vue": "^2.7.16",
"vue-book": "0.1.0-alpha.9",
"vue-bulma-expanding": "0.0.1",
"vue-chartjs": "^3.5.1",
Expand Down Expand Up @@ -98,6 +98,7 @@
},
"overrides": {
"ajv": "^6.14.0",
"follow-redirects": "^1.16.0",
"immutable": "^4.3.8",
"picomatch": "^2.3.2",
"underscore": "^1.13.8"
Expand Down
21 changes: 10 additions & 11 deletions server/k8s.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,23 @@ const fs = require('fs');
const k8s = require('@kubernetes/client-node');
const kubeConfigFile = process.env.HOME + '/.kube/config';

const secretPrefix = 'dashboard-user-'
const kc = new k8s.KubeConfig()
let k8sClient = null
const secretPrefix = 'dashboard-user-';
const kc = new k8s.KubeConfig();
let k8sClient = null;

if (fs.existsSync(kubeConfigFile)) {
cfg.L.info('set up kubernetes cluster dev local access');
kc.loadFromFile(kubeConfigFile)
k8sClient = kc.makeApiClient(k8s.CoreV1Api)
kc.loadFromFile(kubeConfigFile);
k8sClient = kc.makeApiClient(k8s.CoreV1Api);
} else if (
(process.env.KUBERNETES_SERVICE_HOST != '' || cfg.globalConf.server_config.kubernetes.service_host != '') &&
(process.env.KUBERNETES_SERVICE_PORT != '' || cfg.globalConf.server_config.kubernetes.service_port != '')
((process.env.KUBERNETES_SERVICE_HOST && process.env.KUBERNETES_SERVICE_HOST !== '') || cfg.globalConf.server_config.kubernetes.service_host !== '') &&
((process.env.KUBERNETES_SERVICE_PORT && process.env.KUBERNETES_SERVICE_PORT !== '') || cfg.globalConf.server_config.kubernetes.service_port !== '')
) {
kc.loadFromCluster()
k8sClient = kc.makeApiClient(k8s.CoreV1Api)
kc.loadFromCluster();
k8sClient = kc.makeApiClient(k8s.CoreV1Api);
cfg.L.info('set up kubernetes in-cluster access');
} else {
cfg.L.error("no kubernetes cluster access ")
cfg.L.error('no kubernetes cluster access ');
}
/**
* Get secret from the key
Expand All @@ -53,7 +53,6 @@ const getSecrets = async (namespace, key) => {
return null
}
const secrets = await k8sClient.listNamespacedSecret(namespace);
const items = secrets.body && secrets.body.items ? secrets.body.items : []
const secretName = secretPrefix + key
for (let i = 0; i < items.length; i++) {
let item = items[i]
Expand Down
24 changes: 12 additions & 12 deletions server/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"author": "ming luo",
"license": "Apache-2.0",
"dependencies": {
"@kubernetes/client-node": "^1.4.0",
"axios": "^1.15.2",
"body-parser": "^1.20.4",
"config": "^3.3.7",
Expand All @@ -27,7 +28,6 @@
"express": "^4.17.2",
"http-proxy-middleware": "^2.0.9",
"jsonwebtoken": "^9.0.0",
"@kubernetes/client-node": "^1.4.0",
"random-id": "^1.0.4",
"winston": "^3.4.0"
},
Expand All @@ -37,11 +37,11 @@
"form-data": "^4.0.4",
"lodash": "^4.18.1",
"minimatch": "^3.1.3",
"path-to-regexp": "^0.1.13",
"picomatch": "^2.3.2",
"qs": "^6.14.2",
"underscore": "^1.13.8",
"path-to-regexp": "^0.1.13",
"tough-cookie": "^4.1.3",
"underscore": "^1.13.8",
"uuid": "^11.1.1"
},
"devDependencies": {
Expand Down