@waline/vercel 1.13.0 → 1.13.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.13.0",
+  "version": "1.13.3",
   "description": "vercel server for waline comment system",
   "repository": "https://github.com/walinejs/waline",
   "license": "MIT",
@@ -31,7 +31,7 @@
     "think-logger3": "^1.3.1",
     "think-model": "^1.5.4",
     "think-model-mysql": "^1.1.7",
-    "think-model-postgresql": "^1.1.6",
+    "think-model-postgresql": "1.1.6",
     "think-model-sqlite": "^1.2.2",
     "think-mongo": "^2.1.2",
     "think-router-rest": "^1.0.5",

package/src/config/extend.js

@@ -5,6 +5,12 @@ module.exports = [
   Model(think.app),
   Mongo(think.app),
   {
+    context: {
+      get serverURL() {
+        const { protocol, host, path, controller } = this;
+        return `${protocol}://${host}${path.slice(0, -controller.length)}`;
+      },
+    },
     controller: {
       fail(...args) {
         if (this.ctx.status === 200) {

package/src/controller/comment.js

@@ -375,10 +375,9 @@ module.exports = class extends BaseRest {
       think.logger.debug(`Comment initial status is ${data.status}`);
 
       if (data.status === 'approved') {
-        const spam = await akismet(
-          data,
-          this.ctx.protocol + '://' + this.ctx.host
-        ).catch((e) => console.log(e)); // ignore akismet error
+        const spam = await akismet(data, this.ctx.serverURL).catch((e) =>
+          console.log(e)
+        ); // ignore akismet error
 
         if (spam === true) {
           data.status = 'spam';

package/src/controller/db.js

@@ -1,6 +1,8 @@
-const fs = require('fs/promises');
+const fs = require('fs');
+const util = require('util');
 const BaseRest = require('./rest');
 
+const readFileAsync = util.promisify(fs.readFile);
 module.exports = class extends BaseRest {
   async getAction() {
     const exportData = {
@@ -17,7 +19,10 @@ module.exports = class extends BaseRest {
 
     for (let i = 0; i < exportData.tables.length; i++) {
       const tableName = exportData.tables[i];
-      const model = this.model(tableName);
+      const model = this.service(
+        `storage/${this.config('storage')}`,
+        tableName
+      );
       const data = await model.select({});
       exportData.data[tableName] = data;
     }
@@ -28,7 +33,7 @@ module.exports = class extends BaseRest {
   async postAction() {
     const file = this.file('file');
     try {
-      const jsonText = await fs.readFile(file.path, 'utf-8');
+      const jsonText = await readFileAsync(file.path, 'utf-8');
       const importData = JSON.parse(jsonText);
       if (!importData || importData.type !== 'waline') {
         return this.fail('import data format not support!');

package/src/controller/oauth.js

@@ -18,8 +18,8 @@ module.exports = class extends think.Controller {
     const hasCode =
       type === 'twitter' ? oauth_token && oauth_verifier : Boolean(code);
     if (!hasCode) {
-      const { protocol, host } = this.ctx;
-      const redirectUrl = `${protocol}://${host}/oauth?${qs.stringify({
+      const { serverURL } = this.ctx;
+      const redirectUrl = `${serverURL}/oauth?${qs.stringify({
         redirect,
         type,
       })}`;
@@ -36,8 +36,8 @@ module.exports = class extends think.Controller {
      */
     const params = { code, oauth_verifier, oauth_token };
     if (type === 'facebook') {
-      const { protocol, host } = this.ctx;
-      const redirectUrl = `${protocol}://${host}/oauth?${qs.stringify({
+      const { serverURL } = this.ctx;
+      const redirectUrl = `${serverURL}/oauth?${qs.stringify({
         redirect,
         type,
       })}`;

package/src/controller/user/password.js

@@ -27,9 +27,8 @@ module.exports = class extends BaseRest {
     }
 
     const notify = this.service('notify');
-    const { protocol, host } = this.ctx;
     const token = jwt.sign(user[0].email, this.config('jwtKey'));
-    const profileUrl = `${protocol}://${host}/ui/profile?token=${token}`;
+    const profileUrl = `${this.ctx.serverURL}/ui/profile?token=${token}`;
 
     await notify.transporter.sendMail({
       from:

package/src/controller/user.js

@@ -58,9 +58,7 @@ module.exports = class extends BaseRest {
 
     const notify = this.service('notify');
     const apiUrl =
-      this.ctx.protocol +
-      '://' +
-      this.ctx.host +
+      this.ctx.serverURL +
       '/verification?' +
       qs.stringify({ token, email: data.email });
 

package/src/service/markdown/xss.js

@@ -9,7 +9,7 @@ const DOMPurify = createDOMPurify(new JSDOM('').window);
  */
 DOMPurify.addHook('afterSanitizeAttributes', function (node) {
   // set all elements owning target to target=_blank
-  if ('target' in node) {
+  if ('target' in node && node.href && !node.href.startsWith('about:blank#')) {
     node.setAttribute('target', '_blank');
     node.setAttribute('rel', 'noreferrer noopener');
   }