AssertionError: expected 'Bonjour,\n\nUne nouvelle toolbox myToolbox a été créé par First Last\n\nCordialement,\n L'équipe Stordata' to equal 'Bonjour,Une nouvelle toolbox myToolbox a été créé par First LastCordialement,\nL'équipe Stordata'

+Bonjour,
+
+Une nouvelle toolbox myToolbox a été créé par First Last
+
+Cordialement,
+ L'équipe Stordata
-Bonjour,Une nouvelle toolbox myToolbox a été créé par First LastCordialement,
-L'équipe Stordata

The new version is actually far better, by the way. Closer to the rendered Html template.

No clue why tests are failing :thinking: they pass locally, but that just might be my modified configuration.

:warning: This PR is a heavy WIP

The main aim of this refactor is to simplify extremely complex validateJob method and make it easier to reason about job object construction/shape. Initially proposed in this comment.

The plan is to:

• [x] Extract as methods used by validateJob function into separate module
• [ ] Divide validateJob method into two separate parts - (1) validation and (2) job object construction
• [ ] Abstract away validateJob dependance on internal state of Bree instance - this.config.jobs
• [ ] Extract validateJob and buildJob into separate module

Above should not change module's API or change it's behavior.

Since cookie options are flat, there's no need for a deep copy. It was probably a mistake that we're modifying the supplied options.

Updated docs around alternative use of async/await in jobs, so clients know exact Node version when they can drop hacky syntax.

Bumps highlight.js from 9.14.2 to 10.1.2. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/highlightjs/highlight.js/releases">highlight.js's releases</a>.</em></p> <blockquote> <h2>10.1.2</h2> <p>Fixes:</p> <ul> <li>fix(night) Prevent object prototype values from being returned by <code>getLanguage</code> (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2636">#2636</a>) <a href="https://github.com/night">night</a></li> </ul> <h2>10.1.1</h2> <p>Fixes:</p> <ul> <li>Resolve issue on Node 6 due to dangling comma (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2608">#2608</a>) [Edwin Hoogerbeets][]</li> <li>Resolve <code>index.d.ts is not a module</code> error (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2603">#2603</a>) [Josh Goebel][]</li> </ul> <h2>10.1.0</h2> <p>Just your typical minor release. Plenty of fixes and enhancements, few new themes.</p> <p>Some deprecations language maintainers might want to pay attention to:</p> <ul> <li><code>htmlbars</code> grammar is now deprecated. Use <code>handlebars</code> instead. (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2344">#2344</a>) [Nils Knappmeier][]</li> <li>when using <code>highlightBlock</code> <code>result.re</code> deprecated. Use <code>result.relevance</code> instead. (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2552">#2552</a>) [Josh Goebel][]</li> <li>ditto for <code>result.second_best.re</code> => <code>result.second_best.relevance</code> (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2552">#2552</a>)</li> <li><code>lexemes</code> is now deprecated in favor of <code>keywords.$pattern</code> key (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2519">#2519</a>) [Josh Goebel][]</li> <li><code>endSameAsBegin</code> is now deprecated. (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2261">#2261</a>) [Josh Goebel][]</li> </ul> <h2>10.0.2</h2> <p>Fixes a serious potential freeze/infinite loop issue. Everyone on version 10 should upgrade.</p> <ul> <li>Remove support for AMD module loading, which never truly worked properly anyways.</li> </ul> <h2>10.0.1</h2> <p>Fixes: sublanguage with no rule matches causes text to disappear in final output. (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2506">#2506</a>).</p> <h2>10.0.0</h2> <p>Welcome to version 10.0. This a major release and therefore will contain breaking changes.</p> <h2>Breaking Changes</h2> <p>Our normal minor releases try to never break anything, holding all breaking changes for major releases. We tried to squeeze in as many as we could this time so that after 10.0 ships we'll be back to quiet sailing for a while before we need to push version 11. That said, we're very conservative about what we consider a breaking change.</p> <p><em>i.e., if there it could possibly break things for anyone, it's typically a breaking change.</em> The fact is a vast majority of users should upgrade and probably not notice any changes at all.</p> <p>See <a href="https://github.com/highlightjs/highlight.js/blob/master/VERSION_10_BREAKING_CHANGES.md">VERSION_10_BREAKING_CHANGES.md</a> for a comprehensive list of breaking changes, but here is a summary... if you use:</p> <h3>Core highlight.js lib on the client (with no extra CDN languages)</h3> <p>Just keep doing that.</p> <ul> <li>If you're using <code>darkula.css</code>, you'll need to change that to <code>darcula.css</code></li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/highlightjs/highlight.js/blob/10.1.2/CHANGES.md">highlight.js's changelog</a>.</em></p> <blockquote> <h2>Version 10.1.2</h2> <p>Fixes:</p> <ul> <li>fix(night) Prevent object prototype values from being returned by <code>getLanguage</code> (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2636">#2636</a>) <a href="https://github.com/night">night</a></li> </ul> <h2>Version 10.1.1</h2> <p>Fixes:</p> <ul> <li>Resolve issue on Node 6 due to dangling comma (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2608">#2608</a>) <a href="https://github.com/ehoogerbeets">Edwin Hoogerbeets</a></li> <li>Resolve <code>index.d.ts is not a module</code> error (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2603">#2603</a>) <a href="https://github.com/yyyc514">Josh Goebel</a></li> </ul> <h2>Version 10.1.0</h2> <p>New themes:</p> <ul> <li><em>NNFX</em> and <em>NNFX-dark</em> by [Jim Mason][]</li> <li><em>lioshi</em> by [lioshi][]</li> </ul> <p>Parser Engine:</p> <ul> <li>(parser) Now escapes quotes in text content when escaping HTML (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2564">#2564</a>) <a href="https://github.com/yyyc514">Josh Goebel</a></li> <li>(parser) Adds <code>keywords.$pattern</code> key to grammar definitions (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2519">#2519</a>) <a href="https://github.com/yyyc514">Josh Goebel</a></li> <li>(parser) Adds SHEBANG utility mode <a href="https://github.com/yyyc514">Josh Goebel</a></li> <li>(parser) Adds <code>registerAliases</code> method (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2540">#2540</a>) [Taufik Nurrohman][]</li> <li>(enh) Added <code>on:begin</code> callback for modes (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2261">#2261</a>) <a href="https://github.com/yyyc514">Josh Goebel</a></li> <li>(enh) Added <code>on:end</code> callback for modes (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2261">#2261</a>) <a href="https://github.com/yyyc514">Josh Goebel</a></li> <li>(enh) Added ability to programatically ignore begin and end matches (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2261">#2261</a>) <a href="https://github.com/yyyc514">Josh Goebel</a></li> <li>(enh) Added <code>END_SAME_AS_BEGIN</code> mode to replace <code>endSameAsBegin</code> parser attribute (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2261">#2261</a>) <a href="https://github.com/yyyc514">Josh Goebel</a></li> <li>(fix) <code>fixMarkup</code> would rarely destroy markup when <code>useBR</code> was enabled (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2532">#2532</a>) <a href="https://github.com/yyyc514">Josh Goebel</a></li> </ul> <p>Deprecations:</p> <ul> <li><code>htmlbars</code> grammar is now deprecated. Use <code>handlebars</code> instead. (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2344">#2344</a>) [Nils Knappmeier][]</li> <li>when using <code>highlightBlock</code> <code>result.re</code> deprecated. Use <code>result.relevance</code> instead. (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2552">#2552</a>) <a href="https://github.com/yyyc514">Josh Goebel</a></li> <li>ditto for <code>result.second_best.re</code> => <code>result.second_best.relevance</code> (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2552">#2552</a>)</li> <li><code>lexemes</code> is now deprecated in favor of <code>keywords.$pattern</code> key (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2519">#2519</a>) <a href="https://github.com/yyyc514">Josh Goebel</a></li> <li><code>endSameAsBegin</code> is now deprecated. (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2261">#2261</a>) <a href="https://github.com/yyyc514">Josh Goebel</a></li> </ul> <p>Language Improvements:</p> <ul> <li>fix(groovy) strings are not allowed inside ternary clauses (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2217">#2217</a>) <a href="https://github.com/yyyc514">Josh Goebel</a></li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/highlightjs/highlight.js/commit/edd73d2402b3d66706d141e9fadda004d237925d"><code>edd73d2</code></a> bump v10.1.2</li> <li><a href="https://github.com/highlightjs/highlight.js/commit/7241013ae011a585983e176ddc0489a7a52f6bb0"><code>7241013</code></a> (parser) use null prototype objects for languages/aliases (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2636">#2636</a>)</li> <li><a href="https://github.com/highlightjs/highlight.js/commit/93fd0d7335e2b8b94dd122dc2898db8c86343257"><code>93fd0d7</code></a> bump v10.1.1; (chore) add changelog for 10.1.1</li> <li><a href="https://github.com/highlightjs/highlight.js/commit/c5783d2ffca795ccbae7045f66553adaf78303a2"><code>c5783d2</code></a> (chore) clean up types just a little</li> <li><a href="https://github.com/highlightjs/highlight.js/commit/a4ee4e40263aad8586bfe7d1d0fc42a0683080f7"><code>a4ee4e4</code></a> (chore) declare ambient modules for lib/core & languges</li> <li><a href="https://github.com/highlightjs/highlight.js/commit/06565885c7c8d2717b0f8d655c3157f02551686c"><code>0656588</code></a> (chore) removed dangling comma (<a href="https://github-redirect.dependabot.com/highlightjs/highlight.js/issues/2612">#2612</a>)</li> <li><a href="https://github.com/highlightjs/highlight.js/commit/b1bce6e3ada485b89696f554878b2ef44a73d94a"><code>b1bce6e</code></a> (chore) more import below metadata comment</li> <li><a href="https://github.com/highlightjs/highlight.js/commit/74de6eaa1d4dddd2ce1b167abda91913a77c48e6"><code>74de6ea</code></a> (chore) bump copyright</li> <li><a href="https://github.com/highlightjs/highlight.js/commit/b2d19b038882b32935325d7f73531c8dfde2f7c4"><code>b2d19b0</code></a> bump v10.1.0</li> <li><a href="https://github.com/highlightjs/highlight.js/commit/84f7fa3c8d9742a2f890a406ac2cebf88830d139"><code>84f7fa3</code></a> (chore) upgrade some dev stuff to newer versions</li> <li>Additional commits viewable in <a href="https://github.com/highlightjs/highlight.js/compare/9.14.2...10.1.2">compare view</a></li> </ul> </details> <details> <summary>Maintainer changes</summary> <p>This version was pushed to npm by <a href="https://www.npmjs.com/~isagalaev">isagalaev</a>, a new releaser for highlight.js since your current version.</p> </details> <br />

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

<details> <summary>Dependabot commands and options</summary> <br />

You can trigger Dependabot actions by commenting on this PR:

• @dependabot rebase will rebase this PR
• @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
• @dependabot merge will merge this PR after your CI passes on it
• @dependabot squash and merge will squash and merge this PR after your CI passes on it
• @dependabot cancel merge will cancel a previously requested merge and block automerging
• @dependabot reopen will reopen this PR if it is closed
• @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
• @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
• @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
• @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
• @dependabot use these labels will set the current labels as the default for future PRs for this repo and language
• @dependabot use these reviewers will set the current reviewers as the default for future PRs for this repo and language
• @dependabot use these assignees will set the current assignees as the default for future PRs for this repo and language
• @dependabot use this milestone will set the current milestone as the default for future PRs for this repo and language

You can disable automated security fix PRs for this repo from the Security Alerts page.

</details>

#20

@niftylettuce, sure in few minutes.

Sorry no 😔 I'm not even sure there's an option to set, maybe it's just the default behavior that was changed...

Thanks @lholota - This is a great idea! One issue I'm trying to think through is the need for cert expiration management and along side that, the ability to properly mitigate failed emails during a time when keys need to be rotated either on our side (invalidating the TXT record entry) or on client side where the user needs to rotate their keys and update the TXT record.

Hi guys,

Our build fails when upgrading from v7.2.0 to v8.0.0 because of the bumped html-to-text dependency. The outputted text is slightly different, mostly in newlines. This is totally OK as you released a major version, but maybe it's worth mentionning that in the Breaking changes section of the README ?

Regards, David

I have been using the freeplan for quite a while and the only thing I would like to improve a bit is the fact that the configuration is exposed in the TXT records in plain text. I know the paid plan has a feature that fixes this, but there is another option:

Store the configuration in publicly exposed DNS records, but in an encrypted form. The DNS record could then look for example like this:

Option 1 - Symmetric algorithm

Given that the key for symmetric encryption must be kept secret, the encryption would have to be done by the site. The user would sign into their account in forwardemail.net, enter the desired value and the website would return an encrypted version of the value. User would then just copy-paste this value into their DNS configuration.

Option 2 - Asymmetric algorithm

In this case, the public key could be really publicly exposed and therefore the encryption could be done by the users manually, it can be done on users' machines, it could be used in automated scripts etc. Decryption of asymmetrically encrypted data is usually more complex though.

I know this means development of new functionality (e.g. encryption key storage), but it does not require additional storage which would grow with the number of users (you can just rotate the keys every couple of weeks/months and the keys can be shared) and it does not require additional network calls when processing a forwarded e-mail.

Another benefit of this feature is that DNS records for webhooks could then also contain shared secret for signing the payload (like GitHub uses for their webhooks) which makes security the webhook consuming endpoint a lot simpler.

I case you decided to give this one a try, I am happy to assist.

We have written NodeJS based express application. REST API is defined as following:

router.get('/module/:id/', async (req, res ) => {
    try {
       
        var moduleid = req.params.id
   
        const module =  await ModuleMaster.findById(moduleid)
        
        if(!module || !module.modulefile){
            throw new Error('Module does not exist')
        }
         res.set('Content-Type','application/zip')
        res.send(module.modulefile)
    } catch (error) {
        res.status(404).send(error.Message)
    }
})

Above function is successfully returning file is being tested in browser and postman.

As part of automation, we have written following Jest script to test the functionality of receiving file.

const request = require('supertest')
responseFromFileFAPI = await request(app).get('/module/1')
            .expect(200)
            expect(responseFromFileFAPI.body).not.toBeNull()
            expect(responseFromFileFAPI.body.Buffer)   

All above expect are passing however I am not sure how can I convert the response to zip format so that I can use it to compare with original file?

The problem I'm facing is a confusing (from job developer perspective) use of the data (workerData) passed into the worker. After looking closer into how workerData parameter is constructed, I have a proposal on how to structure it so it's more intuitive for the job developer.

Let's consider an example bree job initialization with a value passed in:

// bree client configuring a job with passed in data

const job = {
    cron:'0/5 * * * * *',
    name:'job-with-data',
    path:'/path/to/job-using-data.js',
    worker:{
      workerData: 42
    }
};

bree.add(job);
bree.start('job-with-data');

// job-using-data.js file content

const {workerData} = require('worker_threads');

(async () => {
    const data = workerData.job.worker.workerData;
    console.log(data); // prints '42'
})();

To get access to the data inside of the job file job developer has have knowledge about quite complicated bree's internal object structure workerData.job.worker.workerData. This structure doesn't match 1:1 to the parameter passed during the job initialization. As a developer writing a job, I would expect to have access to same data structure as if I initialized a job through native Worker constructor:

new Worker('/path/to/job-using-data.js', {workerData: 42});

// job-using-data.js file content
const {workerData} = require('worker_threads');

(async () => {
    const data = workerData;
    console.log(data); // prints '42'
})();

I don't see a good reason why bree job would need to have all the meta information about itself accessible from within the script. I think it's unnecessary for the job to know about it's name, interval or any other bree's internal configurations. It should be up to bree's client to use these configurations and the job itself should execute in self contained manner, with as little knowledge as possible. @niftylettuce what are your thoughts? Could you please clarify the usecase for passing in job metadata into workerData parameter?

Proposed change

I think initializing worker in following way would make reading workerData inside of jobs most intuitive:

const workerData = job.worker && job.worker.workerData ? job.worker.workerData : undefined;
const object = {
  ...(this.config.worker ? this.config.worker : {}),
  ...(job.worker ? job.worker : {}),
  workerData
};

this.workers[name] = new threads.Worker(job.path, object);

Only guessing that's the intended link that was meant to be used

Would a PR fixing this one be of interest here, @rimiti? I quickly fixed my version locally and the output is now the following:

  expected 200 "OK", got 404 "Not Found"
Error
    at Test.expect (/project/node_modules/supertest/lib/test.js:86:18)
    at Context.<anonymous> (/project/test/controllers/MyController.test.js:84:50)  <--- only meaningful line
    at callFn (/project/node_modules/mocha/lib/runnable.js:358:21)
    at Test.Runnable.run (/project/node_modules/mocha/lib/runnable.js:346:5)
    at Runner.runTest (/project/node_modules/mocha/lib/runner.js:621:10)
    at /project/node_modules/mocha/lib/runner.js:745:12
    at next (/project/node_modules/mocha/lib/runner.js:538:14)
    at /project/node_modules/mocha/lib/runner.js:548:7
    at next (/project/node_modules/mocha/lib/runner.js:430:14)
    at Immediate._onImmediate (/project/node_modules/mocha/lib/runner.js:516:5)
    at processImmediate (internal/timers.js:461:21)
    at process.topLevelDomainCallback (domain.js:138:15)
    at process.callbackTrampoline (internal/async_hooks.js:124:14)

Not sure it if would fix this one, it is still a bunch of non-sense but at least I can quickly know where the error failed. Maybe someone with more experience could get it better later.

Bug Bounty

We have opened up a bounty for this issue on our bug bounty platform. Want to solve this vulnerability? Go to https://huntr.dev/

We will submit a pull request directly to your repository with the fix as soon as possible. Want to learn more? Go to https://github.com/418sec/huntr 📚

Automatically generated by @huntr-helper...

Bug Bounty

We have opened up a bounty for this issue on our bug bounty platform. Want to solve this vulnerability? Go to https://huntr.dev/

We will submit a pull request directly to your repository with the fix as soon as possible. Want to learn more? Go to https://github.com/418sec/huntr 📚

Automatically generated by @huntr-helper...

Bug Bounty

We have opened up a bounty for this issue on our bug bounty platform. Want to solve this vulnerability? Go to https://huntr.dev/

We will submit a pull request directly to your repository with the fix as soon as possible. Want to learn more? Go to https://github.com/418sec/huntr 📚

Automatically generated by @huntr-helper...

Bug Bounty

We have opened up a bounty for this issue on our bug bounty platform. Want to solve this vulnerability? Go to https://huntr.dev/

We will submit a pull request directly to your repository with the fix as soon as possible. Want to learn more? Go to https://github.com/418sec/huntr 📚

Automatically generated by @huntr-helper...

Please review this merge.

This is part of the Ubuntu distribution for ppc64le. This helps us simplify testing later when distributions are re-building and re-releasing,For more info tag @gerrith3.

Pull Request Test Coverage Report for Build 378317936

• 0 of 0 changed or added relevant lines in 0 files are covered.
• No unchanged relevant lines lost coverage.
• Overall coverage remained the same at 86.667%

Totals
Change from base Build 369699620:	0.0%
Covered Lines:	44
Relevant Lines:	52

💛 - Coveralls