move mv-isos and ct-templates paths to /access/users/:username/...

.gitignore

@@ -3,4 +3,4 @@
 **/localdb.json
 **/docs
 **/config.json
-.vscode/settings.json
+.vscode/*

api/test_access.http

@@ -1,18 +0,0 @@
-### Get ticket
-POST {{baseUrl}}/access/ticket
-Content-Type: application/x-www-form-urlencoded
-
-username={{username}}
-&password={{password}}
-
-### Get user
-GET {{baseUrl}}/access/users/{{username}}
-
-### Get group
-GET {{baseUrl}}/access/groups/{{groupname}}
-
-### Get all pools
-GET {{baseUrl}}/access/pools/
-
-### Get pool
-GET {{baseUrl}}/access/pools/{{poolname}}

api/test_instance.http

@@ -1,36 +0,0 @@
-### Get ticket
-POST {{baseUrl}}/access/ticket
-Content-Type: application/x-www-form-urlencoded
-
-username={{username}}
-&password={{password}}
-
-### Get instance resources
-GET {{baseUrl}}/cluster/{{testvmpath}}
-
-### Get instance backups
-GET {{baseUrl}}/cluster/{{testvmpath}}/backup
-
-### Test create instance
-
-POST {{baseUrl}}/cluster/{{testvmpath}}/create
-Content-Type: application/x-www-form-urlencoded
-
-name=testvm
-&pool={{poolname}}
-&cores=8
-&memory=8192
-
-### Test fail create instance
-
-POST {{baseUrl}}/cluster/{{testvmpath}}/create
-Content-Type: application/x-www-form-urlencoded
-
-name=testvm
-&pool={{poolname}}
-&cores=9999
-&memory=8192
-
-### Test delete instance
-
-DELETE {{baseUrl}}/cluster/{{testvmpath}}/delete

api/test_version.http

@@ -1,2 +0,0 @@
-### Get version
-GET {{baseUrl}}/version

config/template.config.json

@@ -117,7 +117,7 @@
 			"multiplier": 1000000,
 			"base": 1000,
 			"compact": true,
-			"unit": "B/s",
+			"unit": "b/s",
 			"display": true,
 			"category": ""
 		},

src/backends/access_manager.js

@@ -25,7 +25,7 @@ export default class ACCESS_MANAGER_API extends ACCESS_BACKEND {
 			mode: "cors",
 			credentials: "include",
 			headers: {
-				"Content-Type": "application/x-www-form-urlencoded"
+				"Content-Type": "application/json"
 			},
 			data: body
 		};

src/routes/access/users.js

@@ -1,6 +1,9 @@
 import { Router } from "express";
 export const router = Router({ mergeParams: true });
 
+const config = global.config;
+const checkAuth = global.utils.checkAuth;
+
 /**
  * GET - get specific user
  * request:
@@ -35,3 +38,79 @@ router.get("/:username", async (req, res) => {
 
 	res.status(200).send({ user });
 });
+
+/**
+ * GET - get user accessible iso files
+ * response:
+ * - 200: Array.<Object>
+ * - 401: {auth: false}
+ */
+router.get("/:username/vm-isos", async (req, res) => {
+	const params = {
+		username: req.params.username
+	};
+	// check auth
+	const auth = await checkAuth(req.cookies, res);
+	if (!auth) {
+		return;
+	}
+	// check requested username is current user
+	if (req.cookies.username !== params.username) {
+		res.status(401).send({ auth: false  });
+		return;
+	}
+	// get user iso config
+	const userIsoConfig = config.useriso;
+	// get all isos
+	const content = await global.pve.requestPVE(`/nodes/${userIsoConfig.node}/storage/${userIsoConfig.storage}/content?content=iso`, "GET", { token: true });
+	if (content.status !== 200) {
+		res.status(content.status).send({ error: content.statusText });
+		return;
+	}
+	const isos = content.data;
+	const userIsos = [];
+	isos.forEach((iso) => {
+		iso.name = iso.volid.replace(`${userIsoConfig.storage}:iso/`, "");
+		userIsos.push(iso);
+	});
+	userIsos.sort();
+	res.status(200).send(userIsos);
+});
+
+/**
+ * GET - get user accessible container template files
+ * response:
+ * - 200: Array.<Object>
+ * - 401: {auth: false}
+ */
+router.get("/:username/ct-templates", async (req, res) => {
+	const params = {
+		username: req.params.username
+	};
+	// check auth
+	const auth = await checkAuth(req.cookies, res);
+	if (!auth) {
+		return;
+	}
+	// check requested username is current user
+	if (req.cookies.username !== params.username) {
+		res.status(401).send({ auth: false  });
+		return;
+	}
+	// get user iso config
+	const userIsoConfig = config.useriso;
+	// get all isos
+	const content = await global.pve.requestPVE(`/nodes/${userIsoConfig.node}/storage/${userIsoConfig.storage}/content?content=vztmpl`, "GET", { token: true });
+	if (content.status !== 200) {
+		res.status(content.status).send({ error: content.statusText });
+		return;
+	}
+	const isos = content.data;
+	const userIsos = [];
+	isos.forEach((iso) => {
+		iso.name = iso.volid.replace(`${userIsoConfig.storage}:vztmpl/`, "");
+		userIsos.push(iso);
+	});
+	userIsos.sort();
+	res.status(200).send(userIsos);
+});

src/routes/user.js

@@ -1,65 +0,0 @@
-import { Router } from "express";
-export const router = Router({ mergeParams: true }); ;
-
-const config = global.config;
-const checkAuth = global.utils.checkAuth;
-
-/**
- * GET - get user accessible iso files
- * response:
- * - 200: Array.<Object>
- * - 401: {auth: false}
- */
-router.get("/vm-isos", async (req, res) => {
-	// check auth
-	const auth = await checkAuth(req.cookies, res);
-	if (!auth) {
-		return;
-	}
-	// get user iso config
-	const userIsoConfig = config.useriso;
-	// get all isos
-	const content = await global.pve.requestPVE(`/nodes/${userIsoConfig.node}/storage/${userIsoConfig.storage}/content?content=iso`, "GET", { token: true });
-	if (content.status !== 200) {
-		res.status(content.status).send({ error: content.statusText });
-		return;
-	}
-	const isos = content.data;
-	const userIsos = [];
-	isos.forEach((iso) => {
-		iso.name = iso.volid.replace(`${userIsoConfig.storage}:iso/`, "");
-		userIsos.push(iso);
-	});
-	userIsos.sort();
-	res.status(200).send(userIsos);
-});
-
-/**
- * GET - get user accessible container template files
- * response:
- * - 200: Array.<Object>
- * - 401: {auth: false}
- */
-router.get("/ct-templates", async (req, res) => {
-	// check auth
-	const auth = await checkAuth(req.cookies, res);
-	if (!auth) {
-		return;
-	}
-	// get user iso config
-	const userIsoConfig = config.useriso;
-	// get all isos
-	const content = await global.pve.requestPVE(`/nodes/${userIsoConfig.node}/storage/${userIsoConfig.storage}/content?content=vztmpl`, "GET", { token: true });
-	if (content.status !== 200) {
-		res.status(content.status).send({ error: content.statusText });
-		return;
-	}
-	const isos = content.data;
-	const userIsos = [];
-	isos.forEach((iso) => {
-		iso.name = iso.volid.replace(`${userIsoConfig.storage}:vztmpl/`, "");
-		userIsos.push(iso);
-	});
-	userIsos.sort();
-	res.status(200).send(userIsos);
-});

src/utils.js

@@ -4,6 +4,7 @@ import url from "url";
 import * as fs from "fs";
 import { readFileSync } from "fs";
 import { exit } from "process";
+import { log } from "console";
 
 /**
  * Check if a user is authorized to access a specified vm, or the cluster in general.
@@ -76,7 +77,7 @@ export async function getPoolResources (req, pool) {
 	// setup the pool resource object with used and avail for each resource and each resource pool
 	// also add a total counter for each resource (only used for display, not used to check requests)
 	for (const resourceName of Object.keys(poolConfigResources)) {
-		if (configResources[resourceName].type === "list") {
+		if (resourceName in configResources && configResources[resourceName].type === "list") {
 			poolConfigResources[resourceName].total = [];
 			poolConfigResources[resourceName].global.forEach((e) => {
 				e.used = 0;
@@ -105,7 +106,7 @@ export async function getPoolResources (req, pool) {
 				});
 			}
 		}
-		else {
+		else if (resourceName in configResources){ // numeric or storage
 			const total = {
 				max: 0,
 				used: 0,
@@ -123,6 +124,13 @@ export async function getPoolResources (req, pool) {
 			}
 			poolConfigResources[resourceName].total = total;
 		}
+		else {
+			// pool's resource config included a resource which was not in the metadata config
+			// delete it from the config
+			// remeber that a resource requested with no config limit is default deny
+			delete poolConfigResources[resourceName];
+			console.log(`utils: pool had resource key ${resourceName} which is not in the config.json`);
+		}
 	}
 
 	const resources = await global.pve.getPoolResources(req.cookies, pool);