feat(core): support app.config.assets.whitelist

koishijs · Feb 11, 2022 · 1f53441 · 1f53441
1 parent 52c1a1d
commit 1f53441
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 26 deletions.
diff --git a/packages/koishi/src/assets.ts b/packages/koishi/src/assets.ts
@@ -1,9 +1,31 @@
-import { Context, Service } from '@koishijs/core'
-import { segment } from '@koishijs/utils'
+import { App, Context, Schema, Service } from '@koishijs/core'
+import { defineProperty, segment } from '@koishijs/utils'
 import { createHash } from 'crypto'
 import { basename } from 'path'
 import FileType from 'file-type'
 
+declare module '@koishijs/core' {
+  namespace App {
+    interface Config {
+      assets: Config.Assets
+    }
+
+    namespace Config {
+      interface Static {
+        Assets?: Schema<Assets>
+      }
+
+      interface Assets {
+        whitelist?: string[]
+      }
+    }
+  }
+}
+
+defineProperty(App.Config, 'Assets', Schema.object({
+  whitelist: Schema.array(Schema.string().role('url')).description('不处理的白名单 URL 列表。'),
+}).description('资源设置'))
+
 const PROTOCOL_BASE64 = 'base64://'
 
 export abstract class Assets extends Service {
@@ -19,7 +41,13 @@ export abstract class Assets extends Service {
 
   public async transform(content: string) {
     return await segment.transformAsync(content, Object.fromEntries(this.types.map((type) => {
-      return [type, async (data) => segment(type, { url: await this.upload(data.url, data.file) })]
+      return [type, async (data) => {
+        if (this.ctx.app.options.assets.whitelist.some(prefix => data.url.startsWith(prefix))) {
+          return segment(type, data)
+        } else {
+          return segment(type, { url: await this.upload(data.url, data.file) })
+        }
+      }]
     })))
   }
 

diff --git a/packages/koishi/src/index.ts b/packages/koishi/src/index.ts
@@ -1,4 +1,4 @@
-import { App, Context, Modules } from '@koishijs/core'
+import { App, Context, Modules, Schema } from '@koishijs/core'
 import { trimSlash } from '@koishijs/utils'
 import { Cache } from './cache'
 import { Assets } from './assets'
@@ -29,6 +29,12 @@ declare module '@koishijs/core' {
   }
 }
 
+App.Config.list.unshift(App.Config.Network)
+App.Config.list.push(Schema.object({
+  request: Quester.Config,
+  assets: App.Config.Assets,
+}))
+
 // use node require
 Modules.internal.require = require
 Modules.internal.resolve = require.resolve

diff --git a/packages/koishi/src/quester.ts b/packages/koishi/src/quester.ts
@@ -1,21 +1,13 @@
-import { App, Schema } from '@koishijs/core'
-import { Dict, defineProperty } from '@koishijs/utils'
+import { Schema } from '@koishijs/core'
+import { Dict } from '@koishijs/utils'
 import { Agent } from 'http'
 import ProxyAgent from 'proxy-agent'
 import axios, { AxiosRequestConfig, AxiosResponse, Method } from 'axios'
 
 declare module '@koishijs/core' {
   namespace App {
-    interface Config extends Config.Request {}
-
-    namespace Config {
-      interface Static {
-        Request?: Schema<Config.Request>
-      }
-
-      interface Request {
-        request?: Quester.Config
-      }
+    interface Config {
+      request?: Quester.Config
     }
   }
 
@@ -107,11 +99,3 @@ export namespace Quester {
     return http
   }
 }
-
-const RequestConfig: Schema<App.Config.Request> = Schema.object({
-  request: Quester.Config,
-})
-
-defineProperty(App.Config, 'Request', RequestConfig)
-
-App.Config.list.push(RequestConfig)
diff --git a/packages/koishi/src/router.ts b/packages/koishi/src/router.ts
@@ -44,8 +44,6 @@ defineProperty(App.Config, 'Network', Schema.object({
   selfUrl: Schema.string().role('url').description('应用暴露在公网的地址。部分插件 (例如 github 和 telegram) 需要用到。'),
 }).description('网络设置'))
 
-App.Config.list.unshift(App.Config.Network)
-
 type WebSocketCallback = (socket: WebSocket, request: IncomingMessage) => void
 
 export class WebSocketLayer {