Merge pull request #4698 from mailcow/staging

2022-07a

.github/workflows/close_old_issues_and_prs.yml

@@ -14,7 +14,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Mark/Close Stale Issues and Pull Requests 🗑️
-        uses: actions/stale@v5.0.0
+        uses: actions/stale@v5.1.0
         with:
           repo-token: ${{ secrets.STALE_ACTION_PAT }}
           days-before-stale: 60
@@ -30,6 +30,7 @@ jobs:
           stale-issue-label: "stale"
           stale-pr-label: "stale"
           exempt-draft-pr: "true"
+          close-issue-reason: "not_planned"
           operations-per-run: "250"
           ascending: "true"
           #DRY-RUN

.github/workflows/image_builds.yml

@@ -1,4 +1,4 @@
-name: Build Mailcow Docker Images
+name: Build mailcow Docker Images
 
 on:
   push:
@@ -9,19 +9,20 @@ jobs:
   docker_image_builds:
     strategy:
       matrix:
-        images: ["acme-mailcow",
+        images:
-                 "clamd-mailcow",
+          - "acme-mailcow"
-                 "dockerapi-mailcow",
+          - "clamd-mailcow"
-                 "dovecot-mailcow",
+          - "dockerapi-mailcow"
-                 "netfilter-mailcow",
+          - "dovecot-mailcow"
-                 "olefy-mailcow",
+          - "netfilter-mailcow"
-                 "php-fpm-mailcow",
+          - "olefy-mailcow"
-                 "postfix-mailcow",
+          - "php-fpm-mailcow"
-                 "rspamd-mailcow",
+          - "postfix-mailcow"
-                 "sogo-mailcow",
+          - "rspamd-mailcow"
-                 "solr-mailcow",
+          - "sogo-mailcow"
-                 "unbound-mailcow",
+          - "solr-mailcow"
-                 "watchdog-mailcow"]
+          - "unbound-mailcow"
+          - "watchdog-mailcow"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

.github/workflows/integration_tests.yml

@@ -1,4 +1,4 @@
-name: Mailcow Integration Tests
+name: mailcow Integration Tests
 
 on:
   push:

data/Dockerfiles/clamd/Dockerfile

@@ -1,4 +1,4 @@
-FROM clamav/clamav:0.105.0_base
+FROM clamav/clamav:0.105.1_base
 
 LABEL maintainer "André Peters <andre.peters@servercow.de>"
 

data/web/api/openapi.yaml

@@ -518,6 +518,9 @@ paths:
                         - domain.tld
                       type: success
               schema:
+                type: array
+                items:
+                  type: object
                   properties:
                     log:
                       description: contains request object
@@ -532,7 +535,6 @@ paths:
                         - danger
                         - error
                       type: string
-                type: object
           description: OK
           headers: {}
       tags:
@@ -579,6 +581,11 @@ paths:
                 domain:
                   description: Fully qualified domain name
                   type: string
+                gal:
+                  description: >-
+                    is domain global address list active or not, it enables
+                    shared contacts accross domain in SOGo webmail
+                  type: boolean
                 mailboxes:
                   description: limit count of mailboxes associated with this domain
                   type: number
@@ -596,6 +603,9 @@ paths:
                     if not, them you have to create "dummy" mailbox for each
                     address to relay
                   type: boolean
+                relay_unknown_only:
+                  description: Relay non-existing mailboxes only. Existing mailboxes will be delivered locally.
+                  type: boolean
                 rl_frame:
                   enum:
                     - s
@@ -606,6 +616,11 @@ paths:
                 rl_value:
                   description: rate limit value
                   type: number
+                tags:
+                  description: tags for this Domain
+                  type: array
+                  items:
+                    type: string
               type: object
       summary: Create domain
   /api/v1/add/domain-admin:
@@ -1952,6 +1967,9 @@ paths:
                         - domain2.tld
                       type: success
               schema:
+                type: array
+                items:
+                  type: object
                   properties:
                     log:
                       description: contains request object
@@ -1966,7 +1984,6 @@ paths:
                         - danger
                         - error
                       type: string
-                type: object
           description: OK
           headers: {}
       tags:
@@ -1977,14 +1994,15 @@ paths:
         content:
           application/json:
             schema:
+              type: object
               example:
                 - domain.tld
                 - domain2.tld
               properties:
                 items: 
-                  description: contains list of domains you want to delete
+                  type: array
-                  type: object
+                  items:
-              type: object
+                    type: string
       summary: Delete domain
   /api/v1/delete/domain-admin:
     post:
@@ -2972,23 +2990,25 @@ paths:
           $ref: "#/components/responses/Unauthorized"
         "200":
           content:
-            "*/*":
+            application/json:
               schema:
+                type: array
+                items: 
+                  type: object
                   properties:
                     log:
+                      type: array
                       description: contains request object
                       items: {}
-                    type: array
                     msg:
-                    items: {}
                       type: array
+                      items: {}
                     type:
                       enum:
                         - success
                         - danger
                         - error
                       type: string
-                type: object
           description: OK
           headers: {}
       tags:
@@ -3056,13 +3076,33 @@ paths:
                         if not, them you have to create "dummy" mailbox for each
                         address to relay
                       type: boolean
+                    relay_unknown_only:
+                      description: Relay non-existing mailboxes only. Existing mailboxes will be delivered locally.
+                      type: boolean
                     relayhost:
                       description: id of relayhost
                       type: number
+                    rl_frame:
+                      enum:
+                        - s
+                        - m
+                        - h
+                        - d
+                      type: string
+                    rl_value:
+                      description: rate limit value
+                      type: number
+                    tags:
+                      description: tags for this Domain
+                      type: array
+                      items:
+                        type: string
                   type: object
                 items:
                   description: contains list of domain names you want update
-                  type: object
+                  type: array
+                  items:
+                    type: string
               type: object
       summary: Update domain
   /api/v1/edit/fail2ban:

data/web/inc/init_db.inc.php

@@ -3,7 +3,7 @@ function init_db_schema() {
   try {
     global $pdo;
 
-    $db_version = "13072022_1700";
+    $db_version = "25072022_2300";
 
     $stmt = $pdo->query("SHOW TABLES LIKE 'versions'");
     $num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC));
@@ -738,7 +738,7 @@ function init_db_schema() {
           "username" => "VARCHAR(255) NOT NULL",
           "authmech" => "ENUM('yubi_otp', 'u2f', 'hotp', 'totp', 'webauthn')",
           "secret" => "VARCHAR(255) DEFAULT NULL",
-          "keyHandle" => "VARCHAR(255) DEFAULT NULL",
+          "keyHandle" => "VARCHAR(1023) DEFAULT NULL",
           "publicKey" => "VARCHAR(4096) DEFAULT NULL",
           "counter" => "INT NOT NULL DEFAULT '0'",
           "certificate" => "TEXT",

docker-compose.yml

@@ -58,7 +58,7 @@ services:
             - redis
 
     clamd-mailcow:
-      image: mailcow/clamd:1.53
+      image: mailcow/clamd:1.54
       restart: always
       depends_on:
         - unbound-mailcow