fix(server): fix runtime logging interface not authenticated (#1725)

labring · Dec 7, 2023 · 6e41123 · 6e41123
1 parent 0753824
commit 6e41123
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/server/src/application/pod.controller.ts b/server/src/application/pod.controller.ts
@@ -52,6 +52,13 @@ export class PodController {
     if (!podName) {
       return ResponseUtil.error('no podName')
     }
+    const podNames: PodNameListDto =
+      await this.podService.getPodNameListByAppid(appid)
+
+    if (!podNames.podNameList.includes(podName)) {
+      return ResponseUtil.error('podName not exist')
+    }
+
     const containerNames: ContainerNameListDto =
       await this.podService.getContainerNameListByPodName(appid, podName)
     return ResponseUtil.ok(containerNames)

diff --git a/server/src/log/log.controller.ts b/server/src/log/log.controller.ts
@@ -19,7 +19,7 @@ import { Log } from '@kubernetes/client-node'
 import { GetApplicationNamespace } from 'src/utils/getter'
 import { RegionService } from 'src/region/region.service'
 import { ClusterService } from 'src/region/cluster/cluster.service'
-import { Observable, async } from 'rxjs'
+import { Observable } from 'rxjs'
 import { PodService } from 'src/application/pod.service'
 
 @ApiBearerAuth('Authorization')
@@ -107,10 +107,17 @@ export class LogController {
     if (!containerName) {
       containerName = appid
     }
-    let podNameList: string[] = undefined
-    if (podName === 'all') {
-      podNameList = (await this.podService.getPodNameListByAppid(appid))
-        .podNameList
+
+    let podNameList: string[] = (
+      await this.podService.getPodNameListByAppid(appid)
+    ).podNameList
+
+    if (!podNameList.includes(podName) && podName !== 'all') {
+      return ResponseUtil.error('podName not exist')
+    }
+
+    if (podName !== 'all') {
+      podNameList = undefined
     }
 
     const region = await this.regionService.findByAppId(appid)