fix(app-service): change debug-token to bearer token;

labring · Apr 26, 2022 · d4901f1 · d4901f1
1 parent 3ebeee1
commit d4901f1
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 22 deletions.
diff --git a/packages/app-console/src/api/func.js b/packages/app-console/src/api/func.js
@@ -173,17 +173,17 @@ export function compileFunctionCode(func_id, function_data) {
 /**
  * Debug cloud function
  */
-export async function launchFunction(func, param, debug = false) {
+export async function launchFunction(func, param, debug_token) {
   const app_url = getAppAccessUrl()
   const res = await axios({
-    url: app_url + `/func/debug/${func.name}`,
+    url: app_url + `/debug/${func.name}`,
     method: 'post',
     data: {
       func,
       param
     },
     headers: {
-      'debug-token': debug
+      'Authorization': `Bearer ${debug_token}`
     }
   })
 

diff --git a/packages/app-console/src/views/cloudfunction/debug.vue b/packages/app-console/src/views/cloudfunction/debug.vue
@@ -309,7 +309,7 @@ export default {
       const res = await launchFunction(r.data, param, debug_token)
         .finally(() => { this.loading = false })
 
-      this.invokeRequestId = res.headers['requestid']
+      this.invokeRequestId = res.headers['x-request-id'] || res.headers['request-id'] || res.headers['requestid'] || res.headers['requestId']
       await this.getLogByRequestId(this.invokeRequestId)
         .finally(() => { this.loading = false })
 

diff --git a/packages/app-service/Dockerfile b/packages/app-service/Dockerfile
@@ -1,9 +1,5 @@
 FROM node:16-alpine
 RUN apk add --no-cache openssl
-ENV DOCKERIZE_VERSION v0.6.1
-RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
-    && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
-    && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
 
 RUN npm install npm -g
 

diff --git a/packages/app-service/src/handler/debug-func.ts b/packages/app-service/src/handler/debug-func.ts
@@ -7,7 +7,6 @@
 
 import { Request, Response } from 'express'
 import { FunctionContext } from 'cloud-function-engine'
-import { parseToken } from '../support/token'
 import { logger } from '../support/logger'
 import { addFunctionLog } from '../support/function'
 import { ObjectId } from 'bson'
@@ -20,7 +19,6 @@ export async function handleDebugFunction(req: Request, res: Response) {
 
   const requestId = req['requestId']
   const func_name = req.params?.name
-  const debug_token = req.get('debug-token') ?? undefined
   const func_data = req.body?.func
   const param = req.body?.param
 
@@ -29,8 +27,8 @@ export async function handleDebugFunction(req: Request, res: Response) {
   }
 
   // verify the debug token
-  const parsed = parseToken(debug_token as string)
-  if (!parsed || parsed.type !== 'debug') {
+  const auth = req['auth']
+  if (!auth || auth.type !== 'debug') {
     return res.status(403).send('permission denied: invalid debug token')
   }
 

diff --git a/packages/app-service/src/handler/router.ts b/packages/app-service/src/handler/router.ts
@@ -32,18 +32,12 @@ export const router = Router()
 router.post('/proxy/:policy', handleDatabaseProxy)
 router.get('/typing/package', handlePackageTypings)
 
-/**
- * Debug cloud function through HTTP request.
- * @deprecated compatible for history versions
- * @method POST
- */
-router.post('/func/debug/:name', uploader.any(), handleDebugFunction)
 
 /**
  * Debug cloud function through HTTP request.
  * @method POST
  */
-router.post('/debug/:name', uploader.any(), handleDebugFunction)
+router.all('/debug/:name', uploader.any(), handleDebugFunction)
 
 
 /**

diff --git a/packages/app-service/src/index.ts b/packages/app-service/src/index.ts
@@ -38,17 +38,16 @@ process.on('uncaughtException', err => {
 /**
  * Parsing bearer token
  */
-app.use(function (req, res, next) {
+app.use(function (req, _res, next) {
   const token = splitBearerToken(req.headers['authorization'] ?? '')
   const auth = parseToken(token) || null
   req['auth'] = auth
 
-  const requestId = req['requestId'] = generateUUID()
+  const requestId = req['requestId'] = req.headers['x-request-id'] || generateUUID()
   if (req.url !== '/healthz') {
     logger.info(requestId, `${req.method} "${req.url}" - referer: ${req.get('referer') || '-'} ${req.get('user-agent')}`)
     logger.trace(requestId, `${req.method} ${req.url}`, { body: req.body, headers: req.headers, auth })
   }
-  res.set('requestId', requestId)
   next()
 })