Add WL to config. Code clean-up.

default/config.yaml

@@ -48,6 +48,12 @@ allowKeysExposure: false
 skipContentCheck: false
 # Disable automatic chats backup
 disableChatBackup: false
+# Allowed hosts for card downloads
+whitelistImportDomains:
+  - localhost
+  - cdn.discordapp.com
+  - files.catbox.moe
+  - raw.githubusercontent.com
 # API request overrides (for KoboldAI and Text Completion APIs)
 ## Note: host includes the port number if it's not the default (80 or 443)
 ## Format is an array of objects:

public/script.js

@@ -10542,9 +10542,7 @@ jQuery(async function () {
             <li>JanitorAI Character (Direct Link or UUID)<br>Example: <tt>ddd1498a-a370-4136-b138-a8cd9461fdfe_character-aqua-the-useless-goddess</tt></li>
             <li>Pygmalion.chat Character (Direct Link or UUID)<br>Example: <tt>a7ca95a1-0c88-4e23-91b3-149db1e78ab9</tt></li>
             <li>AICharacterCard.com Character (Direct Link or ID)<br>Example: <tt>AICC/aicharcards/the-game-master</tt></li>
-            <li>Catbox.moe Character image link<br>Example: <tt>https://files.catbox.moe/notarealfile.png</tt></li>
+            <li>Direct PNG Link (refer to <code>config.yaml</code> for allowed hosts)<br>Example: <tt>https://files.catbox.moe/notarealfile.png</tt></li>
-            <li>Discord Character image link<br>Example: <tt>https://cdn.discordapp.com/attachments/.../alsonotreal.png?...</tt></li>
-            <li>More coming soon...</li>
         <ul>`;
         const input = await callPopup(html, 'input', '', { okButton: 'Import', rows: 4 });
 

src/endpoints/content-manager.js

@@ -10,6 +10,8 @@ const contentDirectory = path.join(process.cwd(), 'default/content');
 const contentIndexPath = path.join(contentDirectory, 'index.json');
 const characterCardParser = require('../character-card-parser.js');
 
+const WHITELIST_GENERIC_URL_DOWNLOAD_SOURCES = getConfigValue('whitelistImportDomains', []);
+
 /**
  * @typedef {Object} ContentItem
  * @property {string} filename
@@ -434,7 +436,7 @@ async function downloadGenericPng(url) {
     try {
         const result = await fetch(url);
 
-        if(result.ok) {
+        if (result.ok) {
             const buffer = await result.buffer();
             const fileName = sanitize(result.url.split('?')[0].split('/').reverse()[0]);
             const contentType = result.headers.get('content-type') || 'image/png'; //yoink it from AICC function lol
@@ -442,7 +444,7 @@ async function downloadGenericPng(url) {
             return {
                 buffer: buffer,
                 fileName: fileName,
-                fileType:contentType,
+                fileType: contentType,
             };
         }
     } catch (error) {
@@ -467,38 +469,26 @@ function getUuidFromUrl(url) {
 }
 
 /**
- * Filter to get the domain host of a url instead of a blanket string
+ * Filter to get the domain host of a url instead of a blanket string search.
- * search.
+ * @param {String} url URL to strip
-    * @param {String} url URL to strip
+ * @returns {String} Domain name
-    * @result {String} Domain name
  */
 function getHostFromUrl(url) {
-    //dirty way to do it, but if someone wants to bash their head on the regex
+    try {
-    //go ahead
+        const urlObj = new URL(url);
-    return url.replace('http://','').replace('https://','').split('/')[0];
+        return urlObj.hostname;
+    } catch {
+        return '';
+    }
 }
 
 /**
- * List of generic domains that are trusted to hold character cards.
+ * Checks if host is part of generic download source whitelist.
- * Some additional providers may be added later on.
+ * @param {String} host Host to check
+ * @returns {boolean} If the host is on the whitelist.
  */
-const WHITELIST_GENERIC_URL_DOWNLOAD_SOURCES = [
+function isHostWhitelisted(host) {
-    'discordapp.com',
+    return WHITELIST_GENERIC_URL_DOWNLOAD_SOURCES.includes(host);
-    'catbox.moe',
-]; //TODO: move this to config.yaml?
-
-/**
- * Checks if url is part of generic download source whitelist.
- * @param {String} url
- * @returns {bool} if the url is on the whitelist.
- */
-function isUrlWhitelisted(url) {
-    for(const k of WHITELIST_GENERIC_URL_DOWNLOAD_SOURCES) {
-        if(url.includes(k)) {
-            return true;
-        }
-    }
-    return false;
 }
 
 const router = express.Router();
@@ -518,7 +508,7 @@ router.post('/importURL', jsonParser, async (request, response) => {
         const isJannnyContent = host.includes('janitorai');
         const isPygmalionContent = host.includes('pygmalion.chat');
         const isAICharacterCardsContent = host.includes('aicharactercards.com');
-        const isGeneric = isUrlWhitelisted(host);
+        const isGeneric = isHostWhitelisted(host);
 
         if (isPygmalionContent) {
             const uuid = getUuidFromUrl(url);
@@ -566,8 +556,12 @@ router.post('/importURL', jsonParser, async (request, response) => {
             return response.sendStatus(404);
         }
 
+        if (!result) {
+            return response.sendStatus(404);
+        }
+
         if (result.fileType) response.set('Content-Type', result.fileType);
-        response.set('Content-Disposition', `attachment; filename="${result.fileName}"`);
+        response.set('Content-Disposition', `attachment; filename="${encodeURI(result.fileName)}"`);
         response.set('X-Custom-Content-Type', type);
         return response.send(result.buffer);
     } catch (error) {