@social-mail/social-mail-web-server 1.4.861 → 1.4.862

package/src/server/model/events/TextDocumentEvents.ts

@@ -18,13 +18,13 @@ export default class TextDocumentEvents extends AuthenticatedEvents<TextDocument
             x.fileContent.appFiles.some((af) =>
                 Sql.text.likeAny(af.path, p.readFileAccess)
                 || af.templates.some((t) =>
-                t.domain.domainUsers.some((d) => d.userID === p.userID)
+                t.hostedDomain.domainUsers.some((d) => d.userID === p.userID)
                 || t.mailbox.userMailboxes.some((u) => u.userID === p.userID)
-                || t.mailbox.domain.domainUsers.some((u) => u.userID === p.userID))
+                || t.mailbox.domain.hostedDomain.domainUsers.some((u) => u.userID === p.userID))
                 ||
                 af.email.mailboxes.some((um) =>
                     um.mailbox.userMailboxes.some((mu) => mu.userID === p.userID)
-                    || um.mailbox.domain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true)
+                    || um.mailbox.domain.hostedDomain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true)
                 )
             )
         );

package/src/server/model/events/UserAuthFactorEvents.ts

@@ -10,6 +10,7 @@ import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWit
 import { AppStringHelper } from "../../../common/AppStringHelper.js";
 import ExternalOtpInService from "../../services/external-otp-in/ExternalOtpInService.js";
 import SocialMailContext from "../SocialMailContext.js";
+import { ForeignKeyFilter } from "@entity-access/entity-access/dist/model/events/EntityEvents.js";
 
 
 export default class UserAuthFactorEvents extends AuthenticatedEvents<UserAuthFactor> {
@@ -116,4 +117,9 @@ export default class UserAuthFactorEvents extends AuthenticatedEvents<UserAuthFa
         }
     }
 
+    onForeignKeyFilter(filter: ForeignKeyFilter<UserAuthFactor, any>): IEntityQuery<any> {
+        if (filter.is((x) => x.verificationID)) {
+            return filter.unfiltered();
+        }
+    }
 }

package/src/server/services/EmailAddressService.ts

@@ -77,8 +77,7 @@ export default class EmailAddressService {
         emailAddress = emailAddress.trim().toLocaleLowerCase();
         using scope = globalServices.createScope();
         const db = scope.resolve(SocialMailContext);
-        const mb = await db.mailboxes.where({ emailAddress }, (p) => (x) => x.emailAddress.emailAddress === p.emailAddress
-            && x.domain.external === false)
+        const mb = await db.mailboxes.where({ emailAddress }, (p) => (x) => x.emailAddress.emailAddress === p.emailAddress)
             .first();
         return mb?.mailboxID > 0 ? mb.mailboxID : void 0;
     }
@@ -88,8 +87,7 @@ export default class EmailAddressService {
         emailAddress = emailAddress.trim().toLocaleLowerCase();
         using scope = globalServices.createScope();
         const db = scope.resolve(SocialMailContext);
-        return await db.mailboxes.where({ emailAddress }, (p) => (x) => x.emailAddress.emailAddress === p.emailAddress
-            && x.domain.external === false)
+        return await db.mailboxes.where({ emailAddress }, (p) => (x) => x.emailAddress.emailAddress === p.emailAddress)
             .first();
     }
 

package/src/server/services/domain-keys/DomainKeyService.ts

@@ -11,9 +11,8 @@ export default class DomainKeyService {
         const db = scope.resolve(SocialMailContext);
         const key = db.domainKeys
             .where({ mailboxID}, (p) => (x) =>
-                    x.domain.mailboxes.some((m) => m.mailboxID === p.mailboxID)
-                    && x.domain.external === false)
-            .include((x) => x.domain.domain)
+                    x.hostedDomain.domain.mailboxes.some((m) => m.mailboxID === p.mailboxID))
+            .include((x) => x.hostedDomain.domain)
             .first();
         return key;
     }

package/src/server/smtp/services/MailAuthService.ts

@@ -27,13 +27,13 @@ export default class MailAuthService {
 
         const dkimSignerKey = await this.db.domainKeys
             .where({ ids }, (p) => (x) => x.domainID in p.ids)
-            .include((x) => x.domain.domain)
+            .include((x) => x.hostedDomain.domain)
             .first();
 
         let seal = void 0;
         if (dkimSignerKey) {
             seal = {
-                signingDomain: dkimSignerKey.domain.domain.name,
+                signingDomain: dkimSignerKey.hostedDomain.domain.name,
                 selector: dkimSignerKey.name,
                 privateKey: dkimSignerKey.privateKey
             };

package/src/server/smtp/services/MailReceiverService.ts

@@ -128,7 +128,7 @@ export default class MailReceiverService {
             }
         }
 
-        if (mailbox && !mailbox.domain.external) {
+        if (mailbox) {
             if (!this.session.user) {
                 console.error(`Login required for ${address.address}`);
                 throw new SmtpError("Login required", SmtpStatusCodes.AuthenticationRequired);
@@ -244,13 +244,13 @@ export default class MailReceiverService {
 
         const dkimSignerKey = await this.db.domainKeys
             .where({ ids }, (p) => (x) => x.domainID in p.ids)
-            .include((x) => x.domain.domain)
+            .include((x) => x.hostedDomain.domain)
             .first();
 
         let seal = void 0;
         if (dkimSignerKey) {
             seal = {
-                signingDomain: dkimSignerKey.domain.domain.name,
+                signingDomain: dkimSignerKey.hostedDomain.domain.name,
                 selector: dkimSignerKey.name,
                 privateKey: dkimSignerKey.privateKey
             };

package/src/server/workflows/smtp/MailDispatcherService.ts

@@ -162,7 +162,7 @@ export default class MailDispatcherService {
         const dk = await dks.getDomainKey(senderID);
 
         const signer = new DKIM({
-            domainName: dk.domain.domain.name,
+            domainName: dk.hostedDomain.domain.name,
             keySelector: dk.name,
             privateKey: dk.privateKey
         });

package/src/server/workflows/smtp/PrepareEmailToSend.ts

@@ -53,7 +53,7 @@ export default class PrepareEmailToSend extends Workflow<number, string> {
                 && x.workflowID === p.wid
             )
             .include((x) => [
-                x.senderEmail.mailbox.domain,
+                x.senderEmail.mailbox.domain.hostedDomain,
                 x.recipients.forEach((er) => er.emailAddress.domain)])
             .first();
 
@@ -76,7 +76,7 @@ export default class PrepareEmailToSend extends Workflow<number, string> {
                 senderID: email.senderID,
                 emailID: x.emailID,
                 emailAddressID: x.emailAddressID,
-                external: email.senderEmail.mailbox?.domain.external,
+                external: !email.senderEmail.mailbox.domain.hostedDomain,
                 to: [ x.replyTo ?? x.emailAddress.emailAddress]
             }));
         return outsiders;

package/src/tests/core/tags/tag-parser.ts

@@ -0,0 +1,20 @@
+import assert from "assert";
+import Hashtags from "../../../common/Hashtags.js";
+
+export default async function() {
+
+    const set = Hashtags.extract(data);
+    assert.strictEqual(4, set.size);
+
+}
+
+const data = `Your Highlights
+
+sdfdsfsd af asdfadsfasd lkj ;lksdj f;sdf lsdj fdlsf dsj f;
+#shortfilm  #Action  #CastingCall  #paid @Castyy_Official  
+https://t.co/M6J5Otlsdfsfsfsdfsdfasdfsfasfsd
+Read more at Twitter <https://twitter.com//176235614760272325asfsdfdsf45141234320>
+  ----------
+sfdsf sdfsd;flj sd;fjk
+  ----------
+Read more at Twitter <https://twitter.com//17622779asfsadfdsfdasf28610701511>`;

package/src/tests/core/tags/test-tags.ts

@@ -14,4 +14,4 @@ export default async function() {
 
     assert.strictEqual(3, tags.length);
 
-}
+}

package/src/tests/createTest.ts

@@ -157,7 +157,7 @@ export class testScope {
 
             db.mailboxes.add({
                 username: "test",
-                domain,
+                domain: domain.domain,
             });
 
             await db.saveChanges();
@@ -282,6 +282,9 @@ export class testScope {
 
         // verify access to mailbox...
         if (!user.userMailboxes.some((s) => s.mailboxID === senderID)) {
+            if (mustFail) {
+                return;
+            }
             throw new EntityAccessError(`Cannot send mail.`);
         }
 

package/src/tests/services/smtp/auth.ts

@@ -3,19 +3,19 @@ import ESmtpClient from "../../../protocols/smtp/ESmtpClient.js";
 
 export default async function () {
 
-    // return true;
+    return true;
 
-    using c = await ESmtpClient.connect({
-        port: 25,
-        host: "smtp.gmail.com",
-        helo: "localhost",
-        auth: {
-            login: {
-                username: "a",
-                password: "b"
-            }
-        },
-        logger: console.log
-    });
+    // using c = await ESmtpClient.connect({
+    //     port: 25,
+    //     host: "smtp.gmail.com",
+    //     helo: "localhost",
+    //     auth: {
+    //         login: {
+    //             username: "a",
+    //             password: "b"
+    //         }
+    //     },
+    //     logger: console.log
+    // });
 
 }

package/src/wwwroot/routes/social-mail/public/dns/hosts/index.ts

@@ -25,7 +25,6 @@ export default class extends Page {
 
         const emailDomains = await this.db.hostedDomains.asQuery()
             .where(void 0, (p) => (x) => x.enableReceive === true
-                && x.external === false
                 && x.domainKeys.some((d) => d.domainKeyID > 0))
             .include((x) => [x.domain, x.domainKeys])
             .limit(100)

package/test.js

@@ -3,6 +3,7 @@ import path from "path";
 import PostgreSqlDriver from "@entity-access/entity-access/dist/drivers/postgres/PostgreSqlDriver.js";
 import { tmpdir } from "os";
 import { existsSync, mkdirSync } from "fs";
+import { spawnPromise } from "./dist/common/spawnPromise.js";
 
 const host = process.env.POSTGRES_HOST ?? "localhost";
 const postGresPort = Number(process.env.POSTGRES_PORT ?? 5432);
@@ -61,6 +62,48 @@ export default class TestRunner {
      * @param {string} name
      */
     static async runTest(name, thisParam) {
+
+        if (!testFile) {
+            const dbID = start++;
+            let db = `social-mail-test-${dbID}`;
+            const tPath = `${tmpdir()}/t/${dbID}`;
+            if(!existsSync(tPath)) {
+                mkdirSync(tPath, { recursive: true });
+            }
+            
+            const t1 = setTimeout(() => console.warn(`Test ${name} ran for more than 30 seconds`), 30000);
+            try {
+                const result = await spawnPromise("node", ["--enable-source-maps", "./run-test.js", name], {
+                    logData: false,
+                    logCommand: false,
+                    throwOnFail: true,
+                    logError: false,
+                    env: {
+                        SOCIAL_MAIL_DB_SSL: "false",
+                        SOCIAL_MAIL_TEST: "true",
+                        SOCIAL_MAIL_AV: "none",
+                        SOCIAL_MAIL_TMP_PATH: tPath,
+                        SOCIAL_MAIL_DB_DATABASE: db,
+                        SOCIAL_MAIL_DB_USER: "postgres",
+                        SOCIAL_MAIL_DB_PASSWORD: "abcd123",
+                        SOCIAL_MAIL_DB_HOST: host,
+                        SOCIAL_MAIL_DB_PORT: postGresPort,
+                        SOCIAL_MAIL_SECRET_KEY: "abcd123",
+                        SOCIAL_MAIL_AV_PORT: "false"
+                    }
+                });
+                if (result.status > 0) {
+                    results.unshift({ name, error: result.all });
+                } else {
+                    results.push({ name, log: result.all });
+                }
+            } catch (e) {
+                results.unshift({ name, error: e });
+            }
+            clearTimeout(t1);
+            return;
+        }
+
         const moduleExports = await import(name);
         const { default: d } = moduleExports;
         if (!d) {
@@ -121,7 +164,7 @@ for (const { error, name } of results) {
         exitCode = 1;
         failed++;
         console.error(`${name} failed`);
-        console.error(error?.stack ?? error);
+        // console.error(error?.stack ?? error);
         continue;
     }
     console.log(`${name} executed.`);