Merge branch 'MCSManager:master' into master

Author: SnowMoonSS

README.md

@@ -257,6 +257,22 @@ Before contributing code to this project, please make sure to review the followi
 - Please maintain the existing code structure and formatting, **do not apply unnecessary or excessive formatting changes.**
 - All submitted code **must follow internationalization (i18n) standards**.
 
+### Bug Reports
+
+We welcome all bug reports and feedback. Your contributions help us improve the project.
+
+If you encounter any issues, please report them via the [GitHub Issues](https://github.com/MCSManager/MCSManager/issues) page, and we’ll address them as soon as possible.
+
+For serious **security vulnerabilities** that should not be disclosed publicly, please contact us directly at: **support@mcsmanager.com**
+
+Once resolved, we will credit the discoverer in the relevant code or release notes.
+
+### Acknowledgements
+
+Thanks to the following developers for making important contributions to the security testing of MCSManager!
+
+> @Execute, [@xiaosuyyds](https://github.com/xiaosuyyds)
+
 <br />
 
 ## Development
@@ -308,17 +324,6 @@ MCSManager supports all major modern browsers, including:
 
 <br />
 
-## Bug Reports
-
-We welcome all bug reports and feedback. Your contributions help us improve the project.
-
-If you encounter any issues, please report them via the [GitHub Issues](https://github.com/MCSManager/MCSManager/issues) page, and we’ll address them as soon as possible.
-
-For serious **security vulnerabilities** that should not be disclosed publicly, please contact us directly at: **support@mcsmanager.com**
-
-Once resolved, we will credit the discoverer in the relevant code or release notes.
-
-<br />
 
 ## Contributors
 

README_ZH.md

@@ -247,6 +247,18 @@ docker compose pull && docker compose up -d
 
 - 所有代码必须符合国际化标准。
 
+### BUG 报告
+
+欢迎发现的任何问题进行反馈，必当及时修复。
+
+若发现严重安全漏洞又不便公开发布，请发送邮件至: support@mcsmanager.com，安全问题修复后将在代码中附加漏洞发现者姓名。
+
+### 鸣谢
+
+感谢以下开发者为 MCSManager 安全性提供重要的代码贡献！
+
+> @Execute, [@xiaosuyyds](https://github.com/xiaosuyyds)
+
 <br />
 
 ## 开发此项目
@@ -294,14 +306,6 @@ docker compose pull && docker compose up -d
 
 <br />
 
-## BUG 报告
-
-欢迎发现的任何问题进行反馈，必当及时修复。
-
-若发现严重安全漏洞又不便公开发布，请发送邮件至: support@mcsmanager.com，安全问题修复后将在代码中附加漏洞发现者姓名。
-
-<br />
-
 ## 贡献者
 
 <a href="https://openomy.com/MCSManager/MCSManager" target="_blank" style="display: block; width: 100%;" align="center">

daemon/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcsmanager-daemon",
-  "version": "4.16.0",
+  "version": "4.16.1",
   "description": "Provides remote control capability for MCSManager to manage processes, scheduled tasks, I/O streams, and more",
   "scripts": {
     "dev": "nodemon --watch src --ext ts,js --exec \"npm run build && node --enable-source-maps production/app.js\"",

frontend/src/widgets/InstanceList.vue

@@ -370,20 +370,20 @@ const handleSelectInstance = (item: InstanceMoreDetail) => {
 };
 
 const selectAllInstances = () => {
-  let allInstancesCount = 0;
-  for (const node of tableTreeData.value) {
-    if (!node.children) continue;
-    allInstancesCount += node.children.length;
-  }
-
   selectedInstance.value = [];
-  if (allInstancesCount === selectedInstance.value?.length) return;
 
-  for (const node of tableTreeData.value) {
-    if (!node.children) continue;
-    for (const child of node.children) {
-      if (findInstance(child.inst)) continue;
-      selectedInstance.value.push(child.inst);
+  if (isGlobalDaemonMode.value) {
+    for (const node of tableTreeData.value) {
+      if (!node.children) continue;
+      for (const child of node.children) {
+        if (findInstance(child.inst)) continue;
+        selectedInstance.value.push(child.inst);
+      }
+    }
+  } else {
+    for (const item of instancesMoreInfo.value) {
+      if (findInstance(item)) continue;
+      selectedInstance.value.push(item);
     }
   }
 };

panel/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mcsmanager-panel",
-  "version": "10.16.0",
-  "daemonVersion": "4.16.0",
+  "version": "10.16.1",
+  "daemonVersion": "4.16.1",
   "description": "Provide MCSManager with the ability to connect and control all Daemons, and provide API services for the front end.",
   "scripts": {
     "dev": "nodemon --watch src --ext ts,js --exec \"npm run build && node --enable-source-maps production/app.js\"",
@@ -72,4 +72,4 @@
     "webpack-cli": "^4.10.0",
     "webpack-node-externals": "^3.0.0"
   }
-}
+}

panel/src/app/middleware/validator.ts

@@ -74,7 +74,8 @@ export default function (parameter: IParam) {
     try {
       parameter["params"] && check(ctx.params, parameter["params"]);
       parameter["query"] && check(ctx.query, parameter["query"]);
-      parameter["body"] && check(ctx.request.body, parameter["body"]);
+      if (parameter["body"] && Object.keys(parameter["body"]).length > 0)
+        check(ctx.request.body, parameter["body"]);
       return await next();
     } catch (err: any) {
       ctx.status = 400;

panel/src/app/routers/instance_operate_router.ts

@@ -7,7 +7,7 @@ import permission from "../middleware/permission";
 import validator from "../middleware/validator";
 import { checkInstanceAdvancedParams, getAppMarketList } from "../service/instance_service";
 import { operationLogger } from "../service/operation_logger";
-import { getUserUuid } from "../service/passport_service";
+import { getUserPermission, getUserUuid } from "../service/passport_service";
 import { timeUuid } from "../service/password";
 import { isHaveInstanceByUuid, isTopPermissionByUuid } from "../service/permission_service";
 import RemoteRequest, { RemoteRequestTimeoutError } from "../service/remote_command";
@@ -506,7 +506,7 @@ router.post(
         instanceUuid,
         taskName,
         parameter,
-        role: ctx.session?.["role"] as ROLE // Permission check is performed in the daemon
+        role: getUserPermission(ctx) // Permission check is performed in the daemon
       });
       ctx.body = result;
     } catch (err) {