Merge branch 'master' of github.com:zone-eu/wildduck into ZMS-3

Author: NickOvt

.github/workflows/test.yml

@@ -29,7 +29,7 @@ jobs:
             - uses: actions/checkout@v6
 
             - name: Start MongoDB
-              uses: supercharge/mongodb-github-action@1.7.0
+              uses: supercharge/mongodb-github-action@1.12.1
               with:
                   mongodb-version: 6.0
                   mongodb-port: 27017

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "1.46.20"
+    ".": "1.46.21"
 }

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [1.46.21](https://github.com/zone-eu/wildduck/compare/v1.46.20...v1.46.21) (2026-02-09)
+
+
+### Bug Fixes
+
+* **logging-autoreply:** ZMSA-65: loggelf autoreply error in filterHandler.storeMessage ([#983](https://github.com/zone-eu/wildduck/issues/983)) ([7b43049](https://github.com/zone-eu/wildduck/commit/7b43049a614a3bafc6d878e8923b81557e80e789))
+* **logging-redis:** ZMSA-78: Improve redis config, error logging and retry handling ([#987](https://github.com/zone-eu/wildduck/issues/987)) ([86d2627](https://github.com/zone-eu/wildduck/commit/86d26276a5ad58a689ea60378a71ec6f827bdad2))
+* **messages-search:** ZMSA-80: fix SearchString import. Fix messages search q param parsing, add search tests for q param ([#990](https://github.com/zone-eu/wildduck/issues/990)) ([312f9f7](https://github.com/zone-eu/wildduck/commit/312f9f787fc75881c15303f7833be978e4325f21))
+* ZMSA-64: on API outbound email sends add passwordType: master to envelope object ([#978](https://github.com/zone-eu/wildduck/issues/978)) ([24ba575](https://github.com/zone-eu/wildduck/commit/24ba57520afd88aa5435fc365f55ea3695f0d66a))
+
 ## [1.46.20](https://github.com/zone-eu/wildduck/compare/v1.46.19...v1.46.20) (2026-01-29)
 
 

lib/api/addresses.js

@@ -26,7 +26,7 @@ const {
     AddressLimits,
     AutoreplyInfo
 } = require('../schemas/response/addresses-schemas');
-const { userId, addressEmail, addressId } = require('../schemas/request/general-schemas');
+const { userId, addressEmailOrWildcard, addressId } = require('../schemas/request/general-schemas');
 const { Autoreply } = require('../schemas/request/addresses-schemas');
 const { mongopagingFindWrapper } = require('../mongopaging-find-wrapper');
 
@@ -40,7 +40,7 @@ module.exports = (db, server, userHandler, settingsHandler) => {
             validationObjs: {
                 requestBody: {},
                 queryParams: {
-                    query: Joi.string().trim().empty('').max(255).description('Partial match of an address'),
+                    query: Joi.string().trim().empty('').max(255).default('').description('Partial match of an address'),
                     forward: Joi.string().trim().empty('').max(255).description('Partial match of a forward email address or URL'),
                     tags: Joi.string().trim().empty('').max(1024).description('Comma separated list of tags. The Address must have at least one to be set'),
                     requiredTags: Joi.string()
@@ -271,18 +271,11 @@ module.exports = (db, server, userHandler, settingsHandler) => {
             summary: 'Create new Address',
             name: 'createUserAddress',
             description:
-                'Add a new email address for a User. Addresses can contain unicode characters. Dots in usernames are normalized so no need to create both "firstlast@example.com" and "first.last@example.com" Special addresses `*@example.com`, `*suffix@example.com` and `username@*` catches all emails to these domains or users without a registered destination (requires allowWildcard argument)',
+                'Add a new email address for a User. Addresses can contain unicode characters. Dots in usernames are normalized so no need to create both "firstlast@example.com" and "first.last@example.com" Special addresses `*@example.com` and `username@*` catch all emails to these domains or users without a registered destination (requires allowWildcard argument)',
             tags: ['Addresses'],
             validationObjs: {
                 requestBody: {
-                    address: Joi.alternatives()
-                        .try(
-                            addressEmail,
-                            Joi.string()
-                                .regex(/^\w+@\*$/, 'special address')
-                                .description('Wildcard address')
-                        )
-                        .description('String. Either an e-mail address or a wildduck address'),
+                    address: addressEmailOrWildcard.description('String. Either an e-mail address or a wildcard address').required(),
                     name: Joi.string().empty('').trim().max(128).description('Identity name'),
                     main: booleanSchema.description('Indicates if this is the default address for the User'),
                     allowWildcard: booleanSchema.description(
@@ -309,7 +302,7 @@ module.exports = (db, server, userHandler, settingsHandler) => {
                         description: 'Success',
                         model: Joi.object({
                             success: successRes,
-                            id: Joi.string().required().description('ID of the address')
+                            id: addressId.description('ID of the address')
                         }).$_setFlag('objectName', 'CreateUserAddressResponse')
                     }
                 }
@@ -756,7 +749,7 @@ module.exports = (db, server, userHandler, settingsHandler) => {
                             success: successRes,
                             id: addressId,
                             name: Joi.string().description('Identity name'),
-                            address: addressEmail,
+                            address: addressEmailOrWildcard,
                             main: booleanSchema.required().description('Indicates if this is the default address for the User'),
                             created: Joi.date().required().description('Datestring of the time the address was created'),
                             tags: Joi.array().items(Joi.string()).required().description('List of tags associated with the Address'),
@@ -1612,10 +1605,7 @@ module.exports = (db, server, userHandler, settingsHandler) => {
             tags: ['Addresses'],
             validationObjs: {
                 requestBody: {
-                    address: Joi.alternatives()
-                        .try(addressEmail, Joi.string().regex(/^\w+@\*$/, 'special address'))
-                        .required()
-                        .description('E-mail Address'),
+                    address: addressEmailOrWildcard.description('E-mail address or wildcard address').required(),
                     name: Joi.string().empty('').trim().max(128).description('Identity name'),
                     targets: Joi.array()
                         .items(
@@ -1631,7 +1621,7 @@ module.exports = (db, server, userHandler, settingsHandler) => {
                         ),
                     forwards: Joi.number().min(0).default(0).description('Daily allowed forwarding count for this address'),
                     allowWildcard: booleanSchema.description(
-                        'If true then address value can be in the form of `*@example.com`, otherwise using * is not allowed'
+                        'If true then address value can be in the form of `*@example.com` or `username@*`, otherwise using * is not allowed'
                     ),
                     autoreply: Autoreply,
                     tags: Joi.array().items(Joi.string().trim().max(128)).description('A list of tags associated with this address'),
@@ -2339,7 +2329,7 @@ module.exports = (db, server, userHandler, settingsHandler) => {
                         model: Joi.object({
                             success: successRes,
                             id: addressId,
-                            address: addressEmail,
+                            address: addressEmailOrWildcard,
                             name: Joi.string().description('Identity name'),
                             targets: Joi.array().items(Joi.string()).description('List of forwarding targets'),
                             limits: AddressLimits,
@@ -2469,19 +2459,23 @@ module.exports = (db, server, userHandler, settingsHandler) => {
                     ip: sessIPSchema
                 },
                 pathParams: {
-                    address: Joi.alternatives().try(addressId, addressEmail).required().description('ID of the Address or e-mail address string')
+                    address: Joi.alternatives()
+                        .try(addressId, addressEmailOrWildcard)
+                        .required()
+                        .description('ID of the Address or e-mail address string (including wildcard addresses)')
                 },
                 response: {
                     200: {
                         description: 'Success',
                         model: Joi.object({
                             success: successRes,
                             id: addressId,
-                            address: addressEmail,
-                            name: Joi.string().required().description('Identity name'),
+                            address: addressEmailOrWildcard,
+                            user: userId.optional().description('User ID this address belongs to if this is a User address'),
+                            name: Joi.string().allow('').description('Identity name'),
                             targets: Joi.array().items(Joi.string()).description('List of forwarding targets if this is a Forwarded address'),
-                            limits: AddressLimits,
-                            autoreply: AutoreplyInfo,
+                            limits: AddressLimits.optional(),
+                            autoreply: AutoreplyInfo.optional(),
                             tags: Joi.array().items(Joi.string()).required().description('List of tags associated with the Address'),
                             created: Joi.date().required().description('Datestring of the time the address was created'),
                             metaData: Joi.object({}).description('Metadata object (if available)'),

lib/api/asps.js

@@ -57,7 +57,7 @@ module.exports = (db, server, userHandler) => {
                                             .$_setFlag('objectName', 'LastUse')
                                             .description('Information about last use'),
                                         created: Joi.date().required().description('Datestring'),
-                                        expires: Joi.date().required().description('Application password expires after the given date')
+                                        expires: Joi.date().description('Application password expires after the given date')
                                     }).$_setFlag('objectName', 'GetASPsResult')
                                 )
                                 .required()
@@ -216,7 +216,7 @@ module.exports = (db, server, userHandler) => {
                                 .$_setFlag('objectName', 'LastUse')
                                 .description('Information about last use'),
                             created: Joi.date().required().description('Datestring'),
-                            expires: Joi.date().required().description('Application password expires after the given date')
+                            expires: Joi.date().description('Application password expires after the given date')
                         }).$_setFlag('objectName', 'GetASPResponse')
                     }
                 }
@@ -289,7 +289,7 @@ module.exports = (db, server, userHandler) => {
                     time: aspData.used || undefined,
                     event: aspData.authEvent || undefined
                 },
-                expires: asp.expires,
+                expires: aspData.expires,
                 created: aspData.created
             });
         })
@@ -311,6 +311,7 @@ module.exports = (db, server, userHandler) => {
                                 .required()
                         )
                         .unique()
+                        .default(['*'])
                         .description(
                             'List of scopes this Password applies to. Special scope "*" indicates that this password can be used for any scope except "master"'
                         ),
@@ -345,13 +346,11 @@ module.exports = (db, server, userHandler) => {
                                 .description(
                                     'Application Specific Password. Generated password is whitespace agnostic, so it could be displayed to the client as "abcd efgh ijkl mnop" instead of "abcdefghijklmnop"'
                                 ),
-                            mobileconfig: Joi.string()
-                                .required()
-                                .description(
-                                    'Base64 encoded mobileconfig file. Generated profile file should be sent to the client with Content-Type value of application/x-apple-aspen-config.'
-                                ),
-                            name: Joi.string().required().description('Account name'),
-                            address: Joi.string().required().description('Account address or the address specified in params of this endpoint')
+                            mobileconfig: Joi.string().description(
+                                'Base64 encoded mobileconfig file. Present when generateMobileconfig is true. Generated profile file should be sent to the client with Content-Type value of application/x-apple-aspen-config.'
+                            ),
+                            name: Joi.string().description('Account name. Present when generateMobileconfig is true.'),
+                            address: Joi.string().description('Account address or the address specified in params of this endpoint. Present when generateMobileconfig is true.')
                         }).$_setFlag('objectName', 'CreateASPResponse')
                     }
                 }

lib/api/audit.js

@@ -6,7 +6,7 @@ const tools = require('../tools');
 const roles = require('../roles');
 const mboxExport = require('../mbox-export');
 const ObjectId = require('mongodb').ObjectId;
-const { sessSchema, sessIPSchema } = require('../schemas');
+const { sessSchema, sessIPSchema, metaDataSchema } = require('../schemas');
 const { userId } = require('../schemas/request/general-schemas');
 const { successRes } = require('../schemas/response/general-schemas');
 
@@ -24,6 +24,8 @@ module.exports = (db, server, auditHandler) => {
                     start: Joi.date().empty('').allow(false).description('Start time as ISO date'),
                     end: Joi.date().empty('').allow(false).description('End time as ISO date'),
                     expires: Joi.date().empty('').greater('now').required().description('Expiration date. Audit data is deleted after this date'),
+                    notes: Joi.string().trim().max(1024).empty('').description('Optional audit notes'),
+                    meta: metaDataSchema.label('meta').description('Optional metadata, must be an object or JSON formatted string'),
                     sess: sessSchema,
                     ip: sessIPSchema
                 },
@@ -72,17 +74,29 @@ module.exports = (db, server, auditHandler) => {
             let start = result.value.start;
             let end = result.value.end;
             let expires = result.value.expires;
+            let notes = result.value.notes;
+            let meta = result.value.meta;
+
+            if (meta && typeof meta === 'string') {
+                try {
+                    meta = JSON.parse(meta);
+                } catch (err) {
+                    meta = undefined;
+                }
+            }
 
             let audit = await auditHandler.create({
                 user,
                 start,
                 end,
-                expires
+                expires,
+                notes,
+                meta
             });
 
             return res.json({
                 success: true,
-                id: audit
+                id: audit.toString()
             });
         })
     );
@@ -109,7 +123,13 @@ module.exports = (db, server, auditHandler) => {
                             user: userId,
                             start: Joi.date().empty('').allow(false).description('Start time as ISO date'),
                             end: Joi.date().empty('').allow(false).description('End time as ISO date'),
-                            expires: Joi.date().empty('').greater('now').required().description('Expiration date. Audit data is deleted after this date'),
+                            expires: Joi.date().required().description('Expiration date. Audit data is deleted after this date'),
+                            notes: Joi.string().description('Optional audit notes'),
+                            meta: Joi.object().description('Custom metadata for this audit'),
+                            deleted: Joi.boolean().description('If true then audit has been deleted'),
+                            deletedTime: Joi.date().description('Time the audit was deleted'),
+                            audited: Joi.number().description('How many messages have been audited'),
+                            lastAuditedMessage: Joi.date().description('Timestamp of the last audited message'),
                             import: Joi.object({
                                 status: Joi.string().required().description('Status of the audit'),
                                 failed: Joi.number().required().description('How many messages failed'),
@@ -163,10 +183,16 @@ module.exports = (db, server, auditHandler) => {
             return res.json({
                 success: true,
                 id: auditData._id.toString(),
-                user: auditData.user,
+                user: auditData.user.toString(),
                 start: auditData.start && auditData.start.toISOString(),
                 end: auditData.end && auditData.end.toISOString(),
                 expires: auditData.expires && auditData.expires.toISOString(),
+                notes: auditData.notes,
+                meta: auditData.meta ? tools.formatMetaData(auditData.meta) : undefined,
+                deleted: !!auditData.deleted,
+                deletedTime: auditData.deletedTime ? auditData.deletedTime.toISOString() : undefined,
+                audited: auditData.audited,
+                lastAuditedMessage: auditData.lastAuditedMessage ? auditData.lastAuditedMessage.toISOString() : undefined,
                 import: auditData.import
             });
         })