underpost 2.90.1 → 2.92.0

package/src/client/components/core/CommonJs.js

@@ -798,7 +798,6 @@ const generateRandomPasswordSelection = (length) => {
     ',',
     '.',
     '|',
-    '\\',
   ];
   const numbers = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
 

package/src/client/components/core/Input.js

@@ -102,8 +102,8 @@ const Input = {
               </div>
             `
           : options?.placeholderIcon
-          ? html` <div class="fl input-row-${id}">${options.placeholderIcon} ${inputElement}</div> `
-          : inputElement}
+            ? html` <div class="fl input-row-${id}">${options.placeholderIcon} ${inputElement}</div> `
+            : inputElement}
         <div class="in input-info input-info-${id}">&nbsp</div>
       </div>
     </div>`;
@@ -189,7 +189,7 @@ const Input = {
 
         switch (inputData.inputType) {
           case 'file':
-            if (fileObj[inputData.model] && s(`.${inputData.id}`)) {
+            if (fileObj && fileObj[inputData.model] && s(`.${inputData.id}`)) {
               const dataTransfer = new DataTransfer();
 
               if (fileObj[inputData.model].fileBlob)
@@ -207,7 +207,9 @@ const Input = {
             continue;
             break;
           case 'md':
-            RichText.Tokens[inputData.id].easyMDE.value(fileObj[inputData.model].mdPlain);
+            if (fileObj && fileObj[inputData.model] && fileObj[inputData.model].mdPlain) {
+              RichText.Tokens[inputData.id].easyMDE.value(fileObj[inputData.model].mdPlain);
+            }
             continue;
             break;
 

package/src/client/components/core/Modal.js

@@ -54,19 +54,18 @@ const Modal = {
       disableBoxShadow: false,
     },
   ) {
-    options.heightBottomBar = 50;
-    options.heightTopBar = 50;
-    let originHeightBottomBar = options.heightBottomBar ? newInstance(options.heightBottomBar) : 0;
-    let originHeightTopBar = options.heightTopBar ? newInstance(options.heightTopBar) : 0;
+    const originHeightBottomBar = 50;
+    const originHeightTopBar = 50;
+    options.heightBottomBar = 0;
+    options.heightTopBar = 100;
+    if (options && options.barMode && options.barMode === 'top-bottom-bar') {
+      options.heightTopBar = 50;
+      options.heightBottomBar = 50;
+    }
     let width = 300;
     let height = 400;
     let top = options.style?.top ? options.style.top : 0;
     let left = options.style?.left ? options.style.left : 0;
-    const topBottomBarEnable = options && options.barMode && options.barMode === 'top-bottom-bar';
-    if (!topBottomBarEnable) {
-      options.heightTopBar = options.heightTopBar + options.heightBottomBar;
-      options.heightBottomBar = 0;
-    }
     let transition = `opacity 0.3s, box-shadow 0.3s, bottom 0.3s`;
     const originSlideMenuWidth = 320;
     const collapseSlideMenuWidth = 50;
@@ -828,8 +827,7 @@ const Modal = {
                     },
                     dragDisabled: true,
                     maximize: true,
-                    heightBottomBar: 0,
-                    heightTopBar: options.heightTopBar,
+                    barMode: options.barMode,
                   });
 
                   // Bind hover/focus and click-outside to dismiss
@@ -997,8 +995,6 @@ const Modal = {
                   dragDisabled: true,
                   maximize: true,
                   slideMenu: 'modal-menu',
-                  heightTopBar: originHeightTopBar,
-                  heightBottomBar: originHeightBottomBar,
                   barMode: options.barMode,
                   observer: true,
                   disableBoxShadow: true,
@@ -1150,7 +1146,7 @@ const Modal = {
                     dragDisabled: true,
                     disableCenter: true,
                     // maximize: true,
-                    // barMode: options.barMode,
+                    barMode: options.barMode,
                   });
                   Responsive.Event[`view-${id}`] = () => {
                     if (!this.Data[id] || !s(`.${id}`)) return delete Responsive.Event[`view-${id}`];
@@ -1259,8 +1255,6 @@ const Modal = {
                       },
                       dragDisabled: true,
                       maximize: true,
-                      heightBottomBar: 0,
-                      heightTopBar: originHeightTopBar,
                       barMode: options.barMode,
                     });
 
@@ -1319,8 +1313,6 @@ const Modal = {
                   },
                   dragDisabled: true,
                   maximize: true,
-                  heightTopBar: originHeightTopBar,
-                  heightBottomBar: originHeightBottomBar,
                   barMode: options.barMode,
                 });
 
@@ -2489,6 +2481,9 @@ const subMenuHandler = (routes, route) => {
   }
   setTimeout(() => {
     let cid = getQueryParams().cid;
+    if (cid && cid.includes(',')) {
+      cid = cid.split(',')[0];
+    }
     if (s(`.main-sub-btn-active`)) s(`.main-sub-btn-active`).classList.remove('main-sub-btn-active');
     if (cid && s(`.btn-${route}-${cid}`)) {
       s(`.btn-${route}-${cid}`).classList.add('main-sub-btn-active');

package/src/client/components/core/Panel.js

@@ -108,12 +108,32 @@ const Panel = {
           openPanelForm();
           // s(`.btn-${idPanel}-add`).click();
           s(`.${scrollClassContainer}`).scrollTop = 0;
-          Input.setValues(
-            formData,
-            obj,
-            options.originData().find((d) => d._id === obj._id || d.id === obj.id),
-            options.filesData().find((d) => d._id === obj._id || d.id === obj.id),
-          );
+
+          const originData = options.originData();
+          const filesData = options.filesData();
+
+          // Convert IDs to strings for comparison to handle ObjectId vs string issues
+          const searchId = String(obj._id || obj.id);
+          const foundOrigin = originData.find((d) => String(d._id || d.id) === searchId);
+          const foundFiles = filesData.find((d) => String(d._id || d.id) === searchId);
+
+          if (!foundOrigin) {
+            logger.error('Could not find origin data for ID:', searchId);
+            logger.error(
+              'Available originData IDs:',
+              originData.map((d) => String(d._id || d.id)),
+            );
+          }
+
+          if (!foundFiles) {
+            logger.error('Could not find files data for ID:', searchId);
+            logger.error(
+              'Available filesData IDs:',
+              filesData.map((d) => String(d._id || d.id)),
+            );
+          }
+
+          Input.setValues(formData, obj, foundOrigin, foundFiles);
           if (options.on.initEdit) await options.on.initEdit({ data: obj });
         });
         s(`.a-${payload._id}`).onclick = async (e) => {

package/src/client/components/core/PanelForm.js

@@ -230,9 +230,10 @@ const PanelForm = {
             let message = '';
             let status = 'success';
             let indexFormDoc = -1;
-            const filesData = data.fileId ? data.fileId : [null];
 
-            for (const file of filesData) {
+            const inputFiles = data.fileId ? data.fileId : [null];
+
+            for (const file of inputFiles) {
               indexFormDoc++;
               let fileId;
 
@@ -247,8 +248,17 @@ const PanelForm = {
                   status,
                 });
                 if (status === 'success') {
-                  mdFileId = data[0]._id;
-                  if (data[1]) fileId = data[1]._id;
+                  // Identify files by comparing filename instead of just mimetype
+                  // This handles the case where an .md file is uploaded as the optional file
+                  // - mdFileId: matches the generated mdFileName from the title
+                  // - fileId: any other file (including other .md files)
+                  for (const uploadedFile of data) {
+                    if (uploadedFile.name === mdFileName) {
+                      mdFileId = uploadedFile._id;
+                    } else {
+                      fileId = uploadedFile._id;
+                    }
+                  }
                 }
               })();
               const body = {
@@ -329,8 +339,12 @@ const PanelForm = {
 
     const getPanelData = async (isLoadMore = false) => {
       const panelData = PanelForm.Data[idPanel];
+      logger.warn('getPanelData called, isLoadMore:', isLoadMore);
       try {
-        if (panelData.loading || !panelData.hasMore) return;
+        if (panelData.loading || !panelData.hasMore) {
+          logger.warn('getPanelData early return - loading:', panelData.loading, 'hasMore:', panelData.hasMore);
+          return;
+        }
         panelData.loading = true;
 
         if (!isLoadMore) {
@@ -364,45 +378,51 @@ const PanelForm = {
             let mdBlob, fileBlob;
             let mdPlain, filePlain;
 
-            {
-              const {
-                data: [file],
-              } = await FileService.get({ id: documentObject.mdFileId });
-
-              // const ext = file.name.split('.')[file.name.split('.').length - 1];
-              mdBlob = file;
-              mdPlain = await getRawContentFile(getBlobFromUint8ArrayFile(file.data.data, file.mimetype));
-              mdFileId = newInstance(mdPlain);
-            }
-            if (documentObject.fileId) {
-              const {
-                data: [file],
-              } = await FileService.get({ id: documentObject.fileId._id });
+            try {
+              {
+                const {
+                  data: [file],
+                } = await FileService.get({ id: documentObject.mdFileId._id });
 
-              // const ext = file.name.split('.')[file.name.split('.').length - 1];
-              fileBlob = file;
-              filePlain = undefined;
-              fileId = getSrcFromFileData(file);
-            }
+                // const ext = file.name.split('.')[file.name.split('.').length - 1];
+                mdBlob = file;
+                mdPlain = await getRawContentFile(getBlobFromUint8ArrayFile(file.data.data, file.mimetype));
+                mdFileId = newInstance(mdPlain);
+              }
+              if (documentObject.fileId) {
+                const {
+                  data: [file],
+                } = await FileService.get({ id: documentObject.fileId._id });
+
+                // const ext = file.name.split('.')[file.name.split('.').length - 1];
+                fileBlob = file;
+                filePlain = undefined;
+                fileId = getSrcFromFileData(file);
+              }
 
-            panelData.filesData.push({
-              id: documentObject._id,
-              _id: documentObject._id,
-              mdFileId: { mdBlob, mdPlain },
-              fileId: { fileBlob, filePlain },
-            });
+              panelData.filesData.push({
+                id: documentObject._id,
+                _id: documentObject._id,
+                mdFileId: { mdBlob, mdPlain },
+                fileId: { fileBlob, filePlain },
+              });
 
-            panelData.data.push({
-              id: documentObject._id,
-              title: documentObject.title,
-              createdAt: documentObject.createdAt,
-              tags: documentObject.tags.filter((t) => !prefixTags.includes(t)),
-              mdFileId: marked.parse(mdFileId),
-              userId: documentObject.userId._id,
-              fileId,
-              tools: Elements.Data.user.main.model.user._id === documentObject.userId._id,
-              _id: documentObject._id,
-            });
+              panelData.data.push({
+                id: documentObject._id,
+                title: documentObject.title,
+                createdAt: documentObject.createdAt,
+                tags: documentObject.tags.filter((t) => !prefixTags.includes(t)),
+                mdFileId: marked.parse(mdFileId),
+                userId: documentObject.userId._id,
+                fileId,
+                tools: Elements.Data.user.main.model.user._id === documentObject.userId._id,
+                _id: documentObject._id,
+              });
+            } catch (fileError) {
+              logger.error('Error fetching files for document:', documentObject._id, fileError);
+              // Still add the document to originData even if file fetching fails
+              // but skip adding to data and filesData arrays
+            }
           }
 
           panelData.skip += result.data.data.length;
@@ -497,7 +517,11 @@ const PanelForm = {
             JSON.stringify(Elements.Data.user.main.model.user, null, 4),
           );
 
-          if (loadingGetData || (lastCid === cid && !forceUpdate)) return;
+          // Normalize empty values for comparison (undefined, null, '' should all be treated as empty)
+          const normalizedCid = cid || '';
+          const normalizedLastCid = lastCid || '';
+
+          if (loadingGetData || (normalizedLastCid === normalizedCid && !forceUpdate)) return;
           loadingGetData = true;
           lastUserId = newInstance(Elements.Data.user.main.model.user._id);
           lastCid = cid;
@@ -579,16 +603,7 @@ const PanelForm = {
         id: options.parentIdModal ? 'html-' + options.parentIdModal : 'main-body',
         routeId: options.route,
         event: async (path) => {
-          PanelForm.Data[idPanel] = {
-            ...PanelForm.Data[idPanel],
-            originData: [],
-            data: [],
-            filesData: [],
-            // skip: 0,
-            limit: 3, // Load 5 items per page
-            hasMore: true,
-            loading: false,
-          };
+          // Don't manually clear arrays - updatePanel() will handle it if needed
           await PanelForm.Data[idPanel].updatePanel();
         },
       });

package/src/db/mongo/MongooseDB.js

@@ -31,7 +31,11 @@ class MongooseDBService {
     logger.info('MongooseDB connect', { host, name, uri });
     return await mongoose
       .createConnection(uri, {
-        // Options like useNewUrlParser and useUnifiedTopology are often set here.
+        serverSelectionTimeoutMS: 5000,
+        // readPreference: 'primary',
+        // directConnection: true,
+        // useNewUrlParser: true,
+        // useUnifiedTopology: true,
       })
       .asPromise();
   }

package/src/index.js

@@ -36,7 +36,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.90.1';
+  static version = 'v2.92.0';
   /**
    * Repository cli API
    * @static

package/src/server/dns.js

@@ -100,6 +100,160 @@ class Dns {
     return ipv4.address;
   }
 
+  /**
+   * Setup nftables tables and chains if they don't exist.
+   * @static
+   * @memberof DnsManager
+   */
+  static setupNftables() {
+    shellExec(`sudo nft add table inet filter 2>/dev/null || true`, { silent: true });
+    shellExec(
+      `sudo nft add chain inet filter input '{ type filter hook input priority 0; policy accept; }' 2>/dev/null || true`,
+      { silent: true },
+    );
+    shellExec(
+      `sudo nft add chain inet filter output '{ type filter hook output priority 0; policy accept; }' 2>/dev/null || true`,
+      { silent: true },
+    );
+    shellExec(
+      `sudo nft add chain inet filter forward '{ type filter hook forward priority 0; policy accept; }' 2>/dev/null || true`,
+      { silent: true },
+    );
+  }
+
+  /**
+   * Bans an IP address from ingress traffic.
+   * @static
+   * @memberof DnsManager
+   * @param {string} ip - The IP address to ban.
+   */
+  static banIngress(ip) {
+    Dns.setupNftables();
+    if (!validator.isIP(ip)) {
+      logger.error(`Invalid IP address: ${ip}`);
+      return;
+    }
+    shellExec(`sudo nft add rule inet filter input ip saddr ${ip} counter drop`, { silent: true });
+    logger.info(`Banned ingress for IP: ${ip}`);
+  }
+
+  /**
+   * Bans an IP address from egress traffic.
+   * @static
+   * @memberof DnsManager
+   * @param {string} ip - The IP address to ban.
+   */
+  static banEgress(ip) {
+    Dns.setupNftables();
+    if (!validator.isIP(ip)) {
+      logger.error(`Invalid IP address: ${ip}`);
+      return;
+    }
+    shellExec(`sudo nft add rule inet filter output ip daddr ${ip} counter drop`, { silent: true });
+    shellExec(`sudo nft add rule inet filter forward ip daddr ${ip} counter drop`, { silent: true });
+    logger.info(`Banned egress for IP: ${ip}`);
+  }
+
+  /**
+   * Helper to get nftables rule handles for a specific IP and chain.
+   * @static
+   * @memberof DnsManager
+   * @param {string} chain - The chain name (input, output, forward).
+   * @param {string} ip - The IP address.
+   * @param {string} type - The type (saddr or daddr).
+   * @returns {string[]} Array of handles.
+   */
+  static getNftHandles(chain, ip, type) {
+    const output = shellExec(`sudo nft -a list chain inet filter ${chain}`, { stdout: true, silent: true });
+    const lines = output.split('\n');
+    const handles = [];
+    // Regex to match IP and handle. Note: output format depends on nft version but usually contains "handle <id>" at end.
+    // Example: ip saddr 1.2.3.4 counter packets 0 bytes 0 drop # handle 5
+    const regex = new RegExp(`ip ${type} ${ip} .* handle (\\d+)`);
+    for (const line of lines) {
+      const match = line.match(regex);
+      if (match) {
+        handles.push(match[1]);
+      }
+    }
+    return handles;
+  }
+
+  /**
+   * Unbans an IP address from ingress traffic.
+   * @static
+   * @memberof DnsManager
+   * @param {string} ip - The IP address to unban.
+   */
+  static unbanIngress(ip) {
+    const handles = Dns.getNftHandles('input', ip, 'saddr');
+    for (const handle of handles) {
+      shellExec(`sudo nft delete rule inet filter input handle ${handle}`, { silent: true });
+    }
+    logger.info(`Unbanned ingress for IP: ${ip}`);
+  }
+
+  /**
+   * Unbans an IP address from egress traffic.
+   * @static
+   * @memberof DnsManager
+   * @param {string} ip - The IP address to unban.
+   */
+  static unbanEgress(ip) {
+    const outputHandles = Dns.getNftHandles('output', ip, 'daddr');
+    for (const handle of outputHandles) {
+      shellExec(`sudo nft delete rule inet filter output handle ${handle}`, { silent: true });
+    }
+    const forwardHandles = Dns.getNftHandles('forward', ip, 'daddr');
+    for (const handle of forwardHandles) {
+      shellExec(`sudo nft delete rule inet filter forward handle ${handle}`, { silent: true });
+    }
+    logger.info(`Unbanned egress for IP: ${ip}`);
+  }
+
+  /**
+   * Lists all banned ingress IPs.
+   * @static
+   * @memberof DnsManager
+   */
+  static listBannedIngress() {
+    const output = shellExec(`sudo nft list chain inet filter input`, { stdout: true, silent: true });
+    console.log(output);
+  }
+
+  /**
+   * Lists all banned egress IPs.
+   * @static
+   * @memberof DnsManager
+   */
+  static listBannedEgress() {
+    console.log('--- Output Chain ---');
+    console.log(shellExec(`sudo nft list chain inet filter output`, { stdout: true, silent: true }));
+    console.log('--- Forward Chain ---');
+    console.log(shellExec(`sudo nft list chain inet filter forward`, { stdout: true, silent: true }));
+  }
+
+  /**
+   * Clears all banned ingress IPs.
+   * @static
+   * @memberof DnsManager
+   */
+  static clearBannedIngress() {
+    shellExec(`sudo nft flush chain inet filter input`, { silent: true });
+    logger.info('Cleared all ingress bans.');
+  }
+
+  /**
+   * Clears all banned egress IPs.
+   * @static
+   * @memberof DnsManager
+   */
+  static clearBannedEgress() {
+    shellExec(`sudo nft flush chain inet filter output`, { silent: true });
+    shellExec(`sudo nft flush chain inet filter forward`, { silent: true });
+    logger.info('Cleared all egress bans.');
+  }
+
   /**
    * Performs the dynamic DNS update logic.
    * It checks if the public IP has changed and, if so, updates the configured DNS records.

package/src/server/start.js

@@ -119,7 +119,9 @@ class UnderpostStartUp {
      * @param {boolean} options.run - Whether to run the deployment.
      */
     async callback(deployId = 'dd-default', env = 'development', options = { build: false, run: false }) {
+      UnderpostRootEnv.API.set('container-status', `${deployId}-${env}-build-deployment`);
       if (options.build === true) await UnderpostStartUp.API.build(deployId, env);
+      UnderpostRootEnv.API.set('container-status', `${deployId}-${env}-initializing-deployment`);
       if (options.run === true) await UnderpostStartUp.API.run(deployId, env);
     },
     /**