Merge pull request #157 from tingxin/fix_watermark_malformed

fix text decode issue

Author: wchaws

source/new-image-handler/package.json

@@ -47,6 +47,7 @@
   },
   "dependencies": {
     "aws-sdk": "^2.1130.0",
+    "html-entities": "^2.3.3",
     "http-errors": "^1.8.1",
     "koa": "^2.13.4",
     "koa-bodyparser": "^4.3.0",

source/new-image-handler/src/processor/image/watermark.ts

@@ -1,9 +1,11 @@
+import { encode } from 'html-entities';
 import * as sharp from 'sharp';
 import { IImageContext } from '.';
 import { IActionOpts, ReadOnly, InvalidArgument, Features, IProcessContext } from '..';
 import * as is from '../../is';
 import { BaseImageAction, split1 } from './_base';
 
+
 export interface WatermarkOpts extends IActionOpts {
   text: string;
   t: number; // 不透明度
@@ -72,12 +74,12 @@ export class WatermarkAction extends BaseImageAction {
       const [k, v] = split1(param, '_');
       if (k === 'text') {
         if (v) {
-          const buff = Buffer.from(v, 'base64');
+          const buff = Buffer.from(v, 'base64url');
           opt.text = buff.toString('utf-8');
         }
       } else if (k === 'image') {
         if (v) {
-          const buff = Buffer.from(v, 'base64');
+          const buff = Buffer.from(v, 'base64url');
           opt.image = buff.toString('utf-8');
         }
       } else if (k === 't') {
@@ -142,7 +144,7 @@ export class WatermarkAction extends BaseImageAction {
         opt.color = v;
       } else if (k === 'type') {
         if (v) {
-          const buff = Buffer.from(v, 'base64');
+          const buff = Buffer.from(v, 'base64url');
           opt.type = buff.toString('utf-8');
         }
       } else if (k === 'shadow') {
@@ -267,9 +269,10 @@ export class WatermarkAction extends BaseImageAction {
   }
 
   async textImg(opt: WatermarkOpts): Promise<sharp.Sharp> {
+    const safetext = encode(opt.text);
     const o = sharp({
       text: {
-        text: `<span size="${opt.size}pt" foreground="#${opt.color}">${opt.text}</span>`,
+        text: `<span size="${opt.size}pt" foreground="#${opt.color}">${safetext}</span>`,
         align: 'center',
         rgba: true,
         dpi: 72,
@@ -291,7 +294,7 @@ export class WatermarkAction extends BaseImageAction {
 
     const shadow = sharp({
       text: {
-        text: `<span size="${opt.size}pt" foreground="#${opt.halo}">${opt.text}</span>`,
+        text: `<span size="${opt.size}pt" foreground="#${opt.halo}">${safetext}</span>`,
         align: 'center',
         rgba: true,
         dpi: 72,
@@ -300,15 +303,7 @@ export class WatermarkAction extends BaseImageAction {
 
     const oBuffer = await o.png().toBuffer();
     const opacity = opt.shadow / 100;
-    const copy = await shadow.convolve({
-      width: 3,
-      height: 3,
-      kernel: [
-        0, 0, 0,
-        0, opacity, 0,
-        0, 0, 0,
-      ],
-    }).png().toBuffer();
+    const copy = await shadow.png().ensureAlpha(opacity).toBuffer();
 
     const u = await sharp({
       create: {

source/new-image-handler/yarn.lock

@@ -3178,6 +3178,11 @@ html-encoding-sniffer@^2.0.1:
   dependencies:
     whatwg-encoding "^1.0.5"
 
+html-entities@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46"
+  integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==
+
 html-escaper@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"