fix(mis): 修复租户、账户已结束作业列表，可搜索出非本租户、账户下的作业的问题 (#533)

1、搜索不到无权限账户的数据 ![image](https://user-images.githubusercontent.com/25954437/228271177-accf78b7-de0a-4093-a2db-cf659cda23d8.png) 2、搜索不到无权限用户的数据 ![image](https://user-images.githubusercontent.com/25954437/228271742-d6571a67-8f10-445b-9dec-5a70852eba09.png) 3、精确搜索搜不到无权限的数据 ![image](https://user-images.githubusercontent.com/25954437/228272004-d9654529-548d-4432-9ddb-8db03af14262.png) 4、账户管理下搜不到其它账户的数据 ![image](https://user-images.githubusercontent.com/25954437/228272282-82ec1da7-fb71-44fe-a5c0-6630abbed1ae.png)
PKUHPC · Apr 3, 2023 · ece2b01 · ece2b01
1 parent fc1730d
commit ece2b01
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 21 deletions.
diff --git a/.changeset/tender-queens-smash.md b/.changeset/tender-queens-smash.md
@@ -0,0 +1,6 @@
+---
+"@scow/mis-server": patch
+"@scow/mis-web": patch
+---
+
+修复管理端的作业操作权限问题
diff --git a/apps/mis-server/src/services/job.ts b/apps/mis-server/src/services/job.ts
@@ -14,7 +14,6 @@ import { ensureNotUndefined, plugin } from "@ddadaal/tsgrpc-server";
 import { ServiceError, status } from "@grpc/grpc-js";
 import { Status } from "@grpc/grpc-js/build/src/constants";
 import { FilterQuery, QueryOrder, UniqueConstraintViolationException } from "@mikro-orm/core";
-import { MySqlDriver, SqlEntityManager } from "@mikro-orm/mysql";
 import { Decimal, decimalToMoney, moneyToNumber } from "@scow/lib-decimal";
 import {
   GetJobsResponse,
@@ -62,14 +61,10 @@ function toGrpc(x: JobInfoEntity) {
   };
 }
 
-async function filterJobs({
+function filterJobs({
   clusters, accountName, jobEndTimeEnd, tenantName,
   jobEndTimeStart, jobId, userId, startBiJobIndex,
-}: JobFilter, em: SqlEntityManager<MySqlDriver>) {
-
-  const accountNames = (accountName === undefined && userId === undefined)
-    ? (await em.find(Account, { tenant: { name: tenantName } }, { fields: ["accountName"]})).map((x) => x.accountName)
-    : accountName;
+}: JobFilter) {
 
   return {
     ...startBiJobIndex ? { biJobIndex: { $gte: startBiJobIndex } } : {},
@@ -78,27 +73,31 @@ async function filterJobs({
     ...jobId
       ? {
         idJob: jobId,
+        ...accountName === undefined ? {} : { account: accountName },
       } : {
-        ...accountNames === undefined ? {} : { account: accountNames },
+        ...accountName === undefined ? {} : { account: accountName },
         ...(jobEndTimeEnd || jobEndTimeStart) ? {
           timeEnd: {
             ...jobEndTimeStart ? { $gte: jobEndTimeStart } : {},
             ...jobEndTimeEnd ? { $lte: jobEndTimeEnd } : {},
           },
         } : {},
       },
+    tenant: tenantName,
   } as FilterQuery<JobInfoEntity>;
 }
 
 export const jobServiceServer = plugin((server) => {
 
   server.addService<JobServiceServer>(JobServiceService, {
 
-    getJobs: async ({ request, em }) => {
+    getJobs: async ({ request, em, logger }) => {
 
       const { filter, page, pageSize } = ensureNotUndefined(request, ["filter"]);
 
-      const sqlFilter = await filterJobs(filter, em);
+      const sqlFilter = filterJobs(filter);
+
+      logger.info("getJobs sqlFilter %s", JSON.stringify(sqlFilter));
 
       const [jobs, count] = await em.findAndCount(JobInfoEntity, sqlFilter, {
         ...paginationProps(page, pageSize || 10),
@@ -131,7 +130,7 @@ export const jobServiceServer = plugin((server) => {
 
       return await em.transactional(async (em) => {
 
-        const jobs = await em.find(JobInfoEntity, await filterJobs(filter, em), {});
+        const jobs = await em.find(JobInfoEntity, filterJobs(filter), {});
 
         const record = new JobPriceChange({
           jobs,

diff --git a/apps/mis-server/tests/job/JobService.test.ts b/apps/mis-server/tests/job/JobService.test.ts
@@ -15,7 +15,7 @@ import { Server } from "@ddadaal/tsgrpc-server";
 import { ChannelCredentials } from "@grpc/grpc-js";
 import { SqlEntityManager } from "@mikro-orm/mysql";
 import { Decimal, moneyToNumber, numberToMoney } from "@scow/lib-decimal";
-import { JobServiceClient } from "@scow/protos/build/server/job";
+import { JobFilter, JobServiceClient } from "@scow/protos/build/server/job";
 import { createServer } from "src/app";
 import { JobInfo } from "src/entities/JobInfo";
 import { JobPriceChange } from "src/entities/JobPriceChange";
@@ -189,6 +189,31 @@ it("returns jobs starting from start_bi_job_index", async () => {
   });
 
   expect(reply.jobs).toSatisfyAll((x: JobInfo) => x.biJobIndex >= 10);
-  expect(reply.jobs).toHaveLength(30);
+  expect(reply.jobs).toHaveLength(50);
+
+});
+
+it("returns 0 job if Accout not exist or is not in scope of permissions", async () => {
+  const em = server.ext.orm.em.fork();
+
+  await em.persistAndFlush(range(1, 20).map((x) =>
+    mockOriginalJobData(x, data.uaAA, new Decimal(20), new Decimal(10))));
+
+  const test = async (filter: JobFilter) => {
+    const client = createClient();
+    const reply = await asyncClientCall(client, "getJobs", {
+      filter,
+      page: 1,
+      pageSize: 10,
+    });
+    expect(reply.jobs).toHaveLength(0);
+  };
+
+  await Promise.all([
+    // 当用户id与账号无关时，查不到数据
+    test({ tenantName: "default2", clusters: []}),
+    // 当用户id与账号无关时，查不到数据
+    test({ tenantName: data.tenant.name, userId: "a", accountName: "hpcb", clusters: []}),
+  ]);
 
 });
diff --git a/apps/mis-web/src/pageComponents/job/HistoryJobTable.tsx b/apps/mis-web/src/pageComponents/job/HistoryJobTable.tsx
@@ -57,6 +57,8 @@ export const JobTable: React.FC<Props> = ({
 
   const rangeSearch = useRef(true);
 
+  const [pageInfo, setPageInfo] = useState({ page: 1, pageSize: 10 });
+
   const [query, setQuery] = useState<FilterForm>(() => {
     const now = dayjs();
     return {
@@ -68,24 +70,26 @@ export const JobTable: React.FC<Props> = ({
   });
 
   useDidUpdateEffect(() => {
+    setPageInfo({ page: 1, pageSize: pageInfo.pageSize });
     setQuery((q) => ({
       ...q,
       accountName: Array.isArray(accountNames) ? accountNames[0] : accountNames,
     }));
+
   }, [accountNames]);
 
   const [form] = Form.useForm<FilterForm>();
 
-  const [pageInfo, setPageInfo] = useState({ page: 1, pageSize: 10 });
 
   const promiseFn = useCallback(async () => {
     return await api.getJobInfo({ query: {
-      userId: rangeSearch.current ? (query.userId || userId || undefined) : undefined,
+      // userId: rangeSearch.current ? (query.userId || userId || undefined) : undefined,
+      userId: query.userId || userId || undefined,
       jobId: rangeSearch.current ? undefined : query.jobId,
       page: pageInfo.page,
       pageSize: pageInfo.pageSize,
       clusters: query.clusters?.map((x) => x.id),
-      accountName: query.accountName || undefined,
+      accountName: query.accountName || (Array.isArray(accountNames) ? undefined : accountNames),
       jobEndTimeStart: query.jobEndTime[0].toISOString(),
       jobEndTimeEnd: query.jobEndTime[1].toISOString(),
     } }).catch((e: HttpError) => {
@@ -107,10 +111,9 @@ export const JobTable: React.FC<Props> = ({
           form={form}
           initialValues={query}
           onFinish={async () => {
-            setQuery({
-              accountName: query.accountName,
-              ...(await form.validateFields()),
-            });
+            const currentQuery = await form.validateFields();
+            setQuery(currentQuery);
+            setPageInfo({ page: 1, pageSize: pageInfo.pageSize });
           }}
         >
           <FilterFormTabs
@@ -250,6 +253,7 @@ export const JobInfoTable: React.FC<JobInfoTableProps> = ({
         }
       </TableTitle>
       <Table
+        rowKey={(i) => i.idJob}
         dataSource={data?.jobs}
         loading={isLoading}
         pagination={setPageInfo ? {

diff --git a/apps/mis-web/src/pageComponents/tenant/AdminJobTable.tsx b/apps/mis-web/src/pageComponents/tenant/AdminJobTable.tsx
@@ -91,7 +91,9 @@ export const AdminJobTable: React.FC<Props> = () => {
           form={form}
           initialValues={query}
           onFinish={async () => {
-            setQuery(await form.validateFields());
+            const currentQuery = await form.validateFields();
+            setQuery(currentQuery);
+            setPageInfo({ page: 1, pageSize: pageInfo.pageSize });
           }}
         >
           <FilterFormTabs
@@ -231,6 +233,7 @@ const JobInfoTable: React.FC<JobInfoTableProps> = ({
         </Space>
       </TableTitle>
       <Table
+        rowKey={(i) => i.idJob}
         dataSource={data?.jobs}
         loading={isLoading}
         pagination={setPageInfo ? {