Iframely rel review (#545)

* use `html-meta.iframely` to check `iframely` rel * rename `isAllowedApp` to `isAllowed`
itteco · Jul 9, 2024 · a5d7c38 · a5d7c38
1 parent b0fa073
commit a5d7c38
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/plugins/links/iframely-link.js b/plugins/links/iframely-link.js
@@ -16,7 +16,7 @@ export default {
         }
 
         for (const [key, value] of Object.entries(meta)) {
-            if (key.indexOf(appname) === 0 || !ignoreIframely && key.indexOf(CONFIG.R.iframely) === 0) {
+            if (key.indexOf(appname) === 0 || (!ignoreIframely && key.indexOf(CONFIG.R.iframely) === 0)) {
                 links = links.concat(
                     utils.parseMetaLinks(
                         key, 

diff --git a/plugins/links/utils.js b/plugins/links/utils.js
@@ -90,8 +90,12 @@ export default {
         // Filter empty.
         rels = rels.filter(i => i);
 
+        var isAllowed = whitelistRecord.isAllowed('html-meta.iframely') // New check.
+                        || whitelistRecord.isAllowed('iframely.app');   // Old check
+
+        // If no additional rels specified, try add 'app'.
         if (!rels.some(rel => CONFIG.REL_GROUPS && CONFIG.REL_GROUPS.includes(rel))) {
-            if (whitelistRecord.isAllowed('iframely.app') 
+            if (isAllowed
                 && /iframely/i.test(key)
                 || (appname && key.indexOf(appname) === 0)) {
                 // Allow <link rel="iframely" ....
@@ -121,9 +125,16 @@ export default {
         // Apply whitelist except for thumbnails.
         if (rels.indexOf(CONFIG.R.thumbnail) === -1 && rels.indexOf(CONFIG.R.icon) === -1 && rels.indexOf(CONFIG.R.logo) === -1) {
             var tags = whitelistRecord.getQATags(rels);
-            if (tags.indexOf('allow') === -1) {
+            var isAllowedByRels = tags.indexOf('allow') > -1;
+
+            if (!isAllowed && !isAllowedByRels) {
                 return [];
             }
+
+            // Add resizable rel.
+            if (rels.indexOf(CONFIG.R.resizable) === -1 && whitelistRecord.isAllowed('html-meta.iframely', CONFIG.R.resizable)) {
+                rels.push(CONFIG.R.resizable);
+            }
         }
 
         var links = [];