@ecency/render-helper 2.2.7 → 2.2.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecency/render-helper",
-  "version": "2.2.7",
+  "version": "2.2.11",
   "description": "Markdown+Html Render helper",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -63,6 +63,7 @@
     "multihashes": "0.4.13",
     "path": "^0.12.7",
     "querystring": "^0.2.0",
+    "react-native-crypto-js": "^1.0.0",
     "remarkable": "^2.0.1",
     "url": "^0.11.0",
     "xmldom": "^0.5.0",

package/src/consts/allowed-attributes.const.ts

@@ -12,6 +12,7 @@ export const ALLOWED_ATTRIBUTES: XSSWhiteList = {
     'data-community',
     'data-filter',
     'data-embed-src',
+    'data-youtube',
     'data-video-href',
     'data-proposal',
     'class',

package/src/consts/white-list.const.ts

@@ -25,4 +25,5 @@ export const WHITE_LIST = [
   'hiveblockexplorer.com',
   'proofofbrain.blog',
   'liketu.com',
+  'inji.com'
 ]

package/src/markdown-2-html.spec.ts

@@ -70,7 +70,7 @@ describe('Markdown2Html', () => {
         last_update: '2019-05-10T09:15:21',
         body: 'https://www.youtube.com/watch?v=qK3d1eoH-Qs'
       }
-      const expected = '<p><a class="markdown-video-link markdown-video-link-youtube" data-embed-src="https://www.youtube.com/embed/qK3d1eoH-Qs?autoplay=1"><img class="no-replace video-thumbnail" src="https://images.ecency.com/p/S5Eokt4BcQdk7EHeT1aYjzebg2hC7hkthT45eMZRVYW6mkGBWKemLWWzXbRhNG7Z3h1qjGS.png?format=match&amp;mode=fit" /><span class="markdown-video-play"></span></a></p>'
+      const expected = '<p><a class="markdown-video-link markdown-video-link-youtube" data-embed-src="https://www.youtube.com/embed/qK3d1eoH-Qs?autoplay=1" data-youtube="qK3d1eoH-Qs"><img class="no-replace video-thumbnail" src="https://images.ecency.com/p/S5Eokt4BcQdk7EHeT1aYjzebg2hC7hkthT45eMZRVYW6mkGBWKemLWWzXbRhNG7Z3h1qjGS.png?format=match&amp;mode=fit" /><span class="markdown-video-play"></span></a></p>'
 
       expect(markdown2Html(input)).toBe(expected)
     })
@@ -142,7 +142,7 @@ describe('Markdown2Html', () => {
         last_update: '2019-05-10T09:15:21',
         body: '<iframe width="560" height="315" src="https://www.youtube.com/embed/I3f9ixg59no?foo=bar&baz=000" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>'
       }
-      const expected = '<iframe src="https://www.youtube.com/embed/I3f9ixg59no" frameborder="0" allowfullscreen="allowfullscreen"></iframe>'
+      const expected = '<iframe src=\"https://www.youtube.com/embed/I3f9ixg59no\" allowfullscreen=\"allowfullscreen\"></iframe>'
 
       expect(markdown2Html(input)).toBe(expected)
     })
@@ -447,7 +447,7 @@ describe('Markdown2Html', () => {
         last_update: '2019-05-10T09:15:21',
         body: 'https://youtu.be/_-6hJ8sltdI'
       }
-      const expected = '<p><a class="markdown-video-link markdown-video-link-youtube" data-embed-src="https://www.youtube.com/embed/_-6hJ8sltdI?autoplay=1"><img class="no-replace video-thumbnail" src="https://images.ecency.com/p/S5Eokt4BcQdk7EHeT1aYjzebg2hC7hkthT45eEGc5AMBA14JMjkkxrUAj3mV5QR9D6zfstr.png?format=match&amp;mode=fit" /><span class="markdown-video-play"></span></a></p>'
+      const expected = '<p><a class="markdown-video-link markdown-video-link-youtube" data-embed-src="https://www.youtube.com/embed/_-6hJ8sltdI?autoplay=1" data-youtube="_-6hJ8sltdI"><img class="no-replace video-thumbnail" src="https://images.ecency.com/p/S5Eokt4BcQdk7EHeT1aYjzebg2hC7hkthT45eEGc5AMBA14JMjkkxrUAj3mV5QR9D6zfstr.png?format=match&amp;mode=fit" /><span class="markdown-video-play"></span></a></p>'
 
       expect(markdown2Html(input)).toBe(expected)
     })
@@ -476,14 +476,14 @@ describe('Markdown2Html', () => {
       expect(markdown2Html(input)).toBe(expected)
     })
 
-    it('32- Should handle whitelisted post links', () => {
+    it('32 - Should handle whitelisted post links', () => {
       const input = {
         author: 'foo33435',
         permlink: 'bar32435',
         last_update: '2019-05-10T09:15:21',
         body: 'https://peakd.com/tag/@demo/tests and https://steemit.com/test/@demo/post'
       }
-      const expected = '<p><a class="markdown-post-link" data-tag="tag" data-author="demo" data-permlink="tests">/@demo/tests</a> and <a class="markdown-post-link" data-tag="test" data-author="demo" data-permlink="post">/@demo/post</a></p>'
+      const expected = '<p><a class=\"markdown-post-link\" data-tag=\"tag\" data-author=\"demo\" data-permlink=\"tests\">@demo/tests</a> and <a class=\"markdown-post-link\" data-tag=\"test\" data-author=\"demo\" data-permlink=\"post\">@demo/post</a></p>'
 
       expect(markdown2Html(input)).toBe(expected)
     })
@@ -644,14 +644,14 @@ describe('Markdown2Html', () => {
       expect(markdown2Html(input)).toBe(expected)
     })
 
-    it('45- Should handle collection linking', () => {
+    it('45 - Should handle collection linking', () => {
       const input = {
         author: 'foo345',
         permlink: 'bar345',
         last_update: '2019-05-10T09:15:21',
         body: 'this is link https://peakd.com/ccc/jarvie/one-week-roadtrip-to-all-5-utah-national-parks-and-more'
       }
-      const expected = '<p>this is link <a class=\"markdown-post-link\" data-tag=\"ccc\" data-author=\"jarvie\" data-permlink=\"one-week-roadtrip-to-all-5-utah-national-parks-and-more\">/@jarvie/one-week-roadtrip-to-all-5-utah-national-parks-and-more</a></p>'
+      const expected = '<p>this is link <a class=\"markdown-post-link\" data-tag=\"ccc\" data-author=\"jarvie\" data-permlink=\"one-week-roadtrip-to-all-5-utah-national-parks-and-more\">@jarvie/one-week-roadtrip-to-all-5-utah-national-parks-and-more</a></p>'
 
       expect(markdown2Html(input)).toBe(expected)
     })

package/src/methods/a.method.ts

@@ -99,7 +99,7 @@ export function a(el: HTMLElement, forApp: boolean, webp: boolean): void {
     const author = postMatch[3].replace('@', '')
     const permlink = postMatch[4]
     if (el.textContent === href) {
-      el.textContent = `/@${author}/${permlink}`
+      el.textContent = `@${author}/${permlink}`
     }
     if (forApp) {
       el.removeAttribute('href')
@@ -152,7 +152,7 @@ export function a(el: HTMLElement, forApp: boolean, webp: boolean): void {
         const ha = `https://ecency.com/@${author}/${section}`
         el.setAttribute('href', ha)
       } else {
-        const h = `@${author}/${section}`
+        const h = `/@${author}/${section}`
         el.setAttribute('href', h)
       }
       return
@@ -215,7 +215,7 @@ export function a(el: HTMLElement, forApp: boolean, webp: boolean): void {
       const section = cpostMatch[2]
 
       if (el.textContent === href) {
-        el.textContent = `/@${author}/${section}`
+        el.textContent = `@${author}/${section}`
       }
       if (forApp) {
         const ha = `https://ecency.com/@${author}/${section}`
@@ -233,7 +233,7 @@ export function a(el: HTMLElement, forApp: boolean, webp: boolean): void {
       const author = cpostMatch[1].replace('@', '')
       const permlink = cpostMatch[2]
       if (el.textContent === href) {
-        el.textContent = `/@${author}/${permlink}`
+        el.textContent = `@${author}/${permlink}`
       }
       if (forApp) {
         el.removeAttribute('href')
@@ -329,7 +329,7 @@ export function a(el: HTMLElement, forApp: boolean, webp: boolean): void {
     const author = cccMatch[2].replace('@', '')
     const permlink = cccMatch[3]
     if (el.textContent === href) {
-      el.textContent = `/@${author}/${permlink}`
+      el.textContent = `@${author}/${permlink}`
     }
     if (forApp) {
       el.removeAttribute('href')
@@ -412,8 +412,9 @@ export function a(el: HTMLElement, forApp: boolean, webp: boolean): void {
       const embedSrc = `https://www.youtube.com/embed/${vid}?autoplay=1`
 
       el.textContent = ''
-
-      el.setAttribute('data-embed-src', embedSrc)
+     
+      el.setAttribute('data-embed-src', embedSrc);
+      el.setAttribute('data-youtube', vid);
 
       const thumbImg = el.ownerDocument.createElement('img')
       thumbImg.setAttribute('class', 'no-replace video-thumbnail')
@@ -664,6 +665,14 @@ export function a(el: HTMLElement, forApp: boolean, webp: boolean): void {
 
   if (forApp) {
     el.setAttribute('data-href', href)
+    const match = href.match(YOUTUBE_REGEX)
+    if (match) {
+      const e = YOUTUBE_REGEX.exec(href)
+      if (e[1]) {
+        const vid = e[1]
+        el.setAttribute('data-youtube', vid);
+      }
+    }
     el.removeAttribute('href')
   } else {
     const externalRegex =/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig;

package/src/methods/markdown-to-html.method.ts

@@ -44,7 +44,26 @@ export function markdownToHTML(input: string, forApp: boolean, webp: boolean): s
     return ''
   }
 
-  let output
+  let output = '';
+
+  //encrypt entities
+  const entities = input.match(/&(.*?);/g);
+  const encEntities:string[] = [];
+
+  try{
+    if(entities && forApp){
+      entities.forEach((entity)=>{
+        const CryptoJS = require("react-native-crypto-js");
+        const encData = CryptoJS.AES.encrypt(entity, 'key').toString();
+        const encyptedEntity = CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(encData));
+        encEntities.push(encyptedEntity);
+        input = input.replace(entity, encyptedEntity);
+      })
+    }
+  } catch (err){
+    console.log("failed to encrypt entities, ignore if not using mobile");
+  }
+
 
   try {
     output = md.render(input)
@@ -57,6 +76,16 @@ export function markdownToHTML(input: string, forApp: boolean, webp: boolean): s
     output = ''
   }
 
+  //decrypt and put back entiteis
+  if(forApp && output){
+    encEntities.forEach((encEntity)=>{
+      const CryptoJS = require("react-native-crypto-js");
+      const decData = CryptoJS.enc.Base64.parse(encEntity).toString(CryptoJS.enc.Utf8);
+      const entity = CryptoJS.AES.decrypt(decData, 'key').toString(CryptoJS.enc.Utf8);
+      output = output.replace(encEntity, entity);
+    })
+  }
+
   output = output.replace(/ xmlns="http:\/\/www.w3.org\/1999\/xhtml"/g, '')
     .replace('<body id="root">', '')
     .replace('</body>', '')

package/src/methods/text.method.ts

@@ -34,7 +34,7 @@ export function text(node: HTMLElement, forApp: boolean, webp: boolean): void {
       const thumbnail = proxifyImageSrc(`https://img.youtube.com/vi/${vid.split('?')[0]}/hqdefault.jpg`, 0, 0, webp ? 'webp' : 'match')
       const embedSrc = `https://www.youtube.com/embed/${vid}?autoplay=1`
 
-      const attrs = `class="markdown-video-link markdown-video-link-youtube" data-embed-src="${embedSrc}"`
+      const attrs = `class="markdown-video-link markdown-video-link-youtube" data-embed-src="${embedSrc}" data-youtube="${vid}"`
 
       const thumbImg = node.ownerDocument.createElement('img')
       thumbImg.setAttribute('class', 'no-replace video-thumbnail')

package/src/post-body-summary.spec.ts

@@ -140,4 +140,11 @@ So, how can you qualify to get one?`
     const expected = 'Lorem Ipsum Dolor'
     expect(getPostBodySummary(input)).toBe(expected)
   })
+
+
+  it('12- Test entity parsing', () => {
+    const input = 'http://lorem.com Lorem < Ipsum & Dolor €	'
+    const expected = 'Lorem < Ipsum & Dolor €'
+    expect(getPostBodySummary(input)).toBe(expected)
+  })
 })

package/src/post-body-summary.ts

@@ -31,7 +31,7 @@ const joint = (arr: string[], limit = 200) => {
   return result.trim();
 };
 
-function postBodySummary(entryBody: string, length?: number): string {
+function postBodySummary(entryBody: string, length?: number, platform:'ios'|'android'|'web' = 'web'): string {
   if (!entryBody) {
     return ''
   }
@@ -57,6 +57,19 @@ function postBodySummary(entryBody: string, length?: number): string {
     'sup'
   ]);
 
+  //encrypt entities
+  const entities = entryBody.match(/&(.*?);/g);
+  const encEntities:string[] = [];
+  if(entities && platform !== 'web'){
+    entities.forEach((entity)=>{
+      var CryptoJS = require("react-native-crypto-js");
+      const encData = CryptoJS.AES.encrypt(entity, 'key').toString();
+      let encyptedEntity = CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(encData));
+      encEntities.push(encyptedEntity);
+      entryBody = entryBody.replace(entity, encyptedEntity);
+    })
+  }
+
   // Convert markdown to html
   let text = '';
   try {
@@ -65,6 +78,18 @@ function postBodySummary(entryBody: string, length?: number): string {
     console.log(err)
   }
 
+
+  //decrypt and put back entiteis
+  if(platform !== 'web'){
+    encEntities.forEach((encEntity)=>{
+      var CryptoJS = require("react-native-crypto-js");
+      let decData = CryptoJS.enc.Base64.parse(encEntity).toString(CryptoJS.enc.Utf8);
+      let entity = CryptoJS.AES.decrypt(decData, 'key').toString(CryptoJS.enc.Utf8);
+      text = text.replace(encEntity, entity);
+    })
+  }
+
+
   text = text
     .replace(/(<([^>]+)>)/gi, '') // Remove html tags
     .replace(/\r?\n|\r/g, ' ') // Remove new lines
@@ -84,9 +109,9 @@ function postBodySummary(entryBody: string, length?: number): string {
   return text
 }
 
-export function getPostBodySummary(obj: Entry | string, length?: number): any {
+export function getPostBodySummary(obj: Entry | string, length?: number, platform?:'ios'|'android'|'web'): any {
   if (typeof obj === 'string') {
-    return postBodySummary(obj as string, length)
+    return postBodySummary(obj as string, length, platform)
   }
 
   const key = `${makeEntryCacheKey(obj)}-sum-${length}`
@@ -96,7 +121,7 @@ export function getPostBodySummary(obj: Entry | string, length?: number): any {
     return item
   }
 
-  const res = postBodySummary(obj.body, length)
+  const res = postBodySummary(obj.body, length, platform)
   cacheSet(key, res)
 
   return res

package/src/test/data/legacy/22.json

@@ -1,5 +1,5 @@
 {
   "id": 22,
   "input": "<IMG SRC=JaVaScRiPt:alert('XSS')> <IMG SRC=javascript:alert(&quot;XSS&quot;)>\n<IMG SRC=`javascript:alert(\"RSnake says, 'XSS'\")`>\n<a onmouseover=\"alert(document.cookie)\">xxs link</a><a onmouseover=alert(document.cookie)>xxs link</a>\n<IMG \"\"\"><SCRIPT>alert(\"XSS\")</SCRIPT>\"><IMG SRC=javascript:alert(String.fromCharCode(88,83,83))>\n <IMG SRC= onmouseover=\"alert('xxs')\">",
-  "result": "<p>&lt;IMG SRC=JaVaScRiPt:alert('XSS')&gt; <img /><br />\n&lt;IMG SRC=<code>javascript:alert(\"RSnake says, 'XSS'\")</code>&gt;<br />\n<a>xxs link</a><a>xxs link</a><br />\n&lt;IMG \"\"\"&gt;alert(&quot;XSS&quot;)\"&gt;<img /><br />\n&lt;IMG SRC= onmouseover=\"alert('xxs')\"&gt;</p>"
+  "result": "<p>&lt;IMG SRC=JaVaScRiPt:alert('XSS')&gt; &lt;IMG SRC=javascript:alert(&quot;XSS&quot;)&gt;<br />\n&lt;IMG SRC=<code>javascript:alert(\"RSnake says, 'XSS'\")</code>&gt;<br />\n<a>xxs link</a><a>xxs link</a><br />\n&lt;IMG \"\"\"&gt;alert(&quot;XSS&quot;)\"&gt;<img /><br />\n&lt;IMG SRC= onmouseover=\"alert('xxs')\"&gt;</p>"
 }

package/src/test/data/legacy/23.json

@@ -1,5 +1,5 @@
 {
   "id": 23,
   "input": "<IMG SRC=/ onerror=\"alert(String.fromCharCode(88,83,83))\"></img> <img src=x onerror=\"&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058&#0000097&#0000108&#0000101&#0000114&#0000116&#0000040&#0000039&#0000088&#0000083&#0000083&#0000039&#0000041\"> <IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;> <IMG SRC=&#x6A&#x61&#x76&#x61&#x73&#x63&#x72&#x69&#x70&#x74&#x3A&#x61&#x6C&#x65&#x72&#x74&#x28&#x27&#x58&#x53&#x53&#x27&#x29> <IMG SRC=\" &#14;  javascript:alert('XSS');\">",
-  "result": "<p>&lt;IMG SRC=/ onerror=\"alert(String.fromCharCode(88,83,83))\"&gt; <img src=\"https://images.ecency.com/p/35.png?format=match&amp;mode=fit\" /> <img /> <img /> <img /></p>"
+  "result": "<p>&lt;IMG SRC=/ onerror=\"alert(String.fromCharCode(88,83,83))\"&gt; <img src=\"https://images.ecency.com/p/35.png?format=match&amp;mode=fit\"> <img> <img> <img /></p>"
 }

package/src/test/data/legacy/27.JSON

@@ -1,5 +1,5 @@
 {
   "id": 27,
   "input": "<BR SIZE=\"&{alert('XSS')}\"> <LINK REL=\"stylesheet\" HREF=\"javascript:alert('XSS');\"> <STYLE>body{}</STYLE> <META HTTP-EQUIV=\"Link\" Content=\"<http://xss.rocks/xss.css>; REL=stylesheet\"> <IFRAME SRC=\"javascript:alert('XSS');\"></IFRAME> foo <IFRAME SRC=# onmouseover=\"alert(document.cookie)\"></IFRAME> bar <FRAMESET><FRAME SRC=\"javascript:alert('XSS');\"></FRAMESET> baz ",
-  "result": "<p><br />     foo  bar  baz\n</p>"
+  "result": "<p><br>     foo  bar  baz\n</p>"
 }