Home Explore Help
Sign In
mirrors
/
mailcow-dockerized
mirror of https://github.com/mailcow/mailcow-dockerized
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #4766 from mailcow/staging

2022-09
Niklas Meyer 2 years ago
parent
15f2c4c769 8e0b1d8aee
commit
5470b51cc7
24 changed files with 75 additions and 60 deletions
Split View Show Diff Stats
  1. 1 1
      .github/workflows/close_old_issues_and_prs.yml
  2. 3 0
      .github/workflows/image_builds.yml
  3. 3 0
      .github/workflows/integration_tests.yml
  4. 2 2
      data/Dockerfiles/dovecot/quarantine_notify.py
  5. 14 2
      data/Dockerfiles/postfix/postfix.sh
  6. 16 0
      data/web/api/index.css
  7. 2 43
      data/web/api/index.html
  8. 10 6
      data/web/api/oauth2-redirect.html
  9. 19 0
      data/web/api/swagger-initializer.js
  10. 0 0
      data/web/api/swagger-ui-bundle.js
  11. 0 0
      data/web/api/swagger-ui-bundle.js.map
  12. 0 0
      data/web/api/swagger-ui-es-bundle-core.js
  13. 0 0
      data/web/api/swagger-ui-es-bundle-core.js.map
  14. 0 0
      data/web/api/swagger-ui-es-bundle.js
  15. 0 0
      data/web/api/swagger-ui-es-bundle.js.map
  16. 0 0
      data/web/api/swagger-ui-standalone-preset.js
  17. 0 0
      data/web/api/swagger-ui-standalone-preset.js.map
  18. 0 1
      data/web/api/swagger-ui.css
  19. 0 0
      data/web/api/swagger-ui.css.map
  20. 0 1
      data/web/api/swagger-ui.js
  21. 0 0
      data/web/api/swagger-ui.js.map
  22. 2 1
      data/web/lang/lang.tr.json
  23. 2 2
      docker-compose.yml
  24. 1 1
      update.sh

+ 1 - 1
.github/workflows/close_old_issues_and_prs.yml
View File 

@@ -14,7 +14,7 @@ jobs:
 
       pull-requests: write
 
     steps:
 
       - name: Mark/Close Stale Issues and Pull Requests 🗑️
 
-        uses: actions/stale@v5.1.1
 
+        uses: actions/stale@v6.0.0
 
         with:
 
           repo-token: ${{ secrets.STALE_ACTION_PAT }}
 
           days-before-stale: 60

+ 3 - 0
.github/workflows/image_builds.yml
View File 

@@ -5,6 +5,9 @@ on:
 
     branches: [ "master", "staging" ]
 
   workflow_dispatch:
 
 
+permissions:
 
+  contents: read # to fetch code (actions/checkout)
 
+
 
 jobs:
 
   docker_image_builds:
 
     strategy:

+ 3 - 0
.github/workflows/integration_tests.yml
View File 

@@ -5,6 +5,9 @@ on:
 
     branches: [ "master", "staging" ]
 
   workflow_dispatch:
 
 
+permissions:
 
+  contents: read
 
+
 
 jobs:
 
   integration_tests:
 
     runs-on: ubuntu-latest

+ 2 - 2
data/Dockerfiles/dovecot/quarantine_notify.py
View File 

@@ -50,7 +50,7 @@ try:
 
   def query_mysql(query, headers = True, update = False):
 
     while True:
 
       try:
 
-        cnx = mysql.connector.connect(unix_socket = '/var/run/mysqld/mysqld.sock', user=os.environ.get('DBUSER'), passwd=os.environ.get('DBPASS'), database=os.environ.get('DBNAME'), charset="utf8")
 
+        cnx = mysql.connector.connect(unix_socket = '/var/run/mysqld/mysqld.sock', user=os.environ.get('DBUSER'), passwd=os.environ.get('DBPASS'), database=os.environ.get('DBNAME'), charset="utf8mb4", collation="utf8mb4_general_ci")
 
       except Exception as ex:
 
         print('%s - trying again...'  % (ex))
 
         time.sleep(3)
 
@@ -166,4 +166,4 @@ try:
 
       notify_rcpt(record['rcpt'], record['counter'], record['quarantine_acl'], attrs['quarantine_category'])
 
 
 finally:
 
-  os.unlink(pidfile)
 
+  os.unlink(pidfile)

+ 14 - 2
data/Dockerfiles/postfix/postfix.sh
View File 

@@ -323,7 +323,19 @@ hosts = unix:/var/run/mysqld/mysqld.sock
 
 dbname = ${DBNAME}
 
 # First select queries domain and alias_domain to determine if domains are active.
 
 query = SELECT goto FROM alias
 
-  WHERE address='%s'
 
+  WHERE id IN (
 
+      SELECT COALESCE (
 
+        (
 
+          SELECT id FROM alias
 
+            WHERE address='%s'
 
+            AND (active='1' OR active='2')
 
+        ), (
 
+          SELECT id FROM alias
 
+            WHERE address='@%d'
 
+            AND (active='1' OR active='2')
 
+        )
 
+      )
 
+    )
 
     AND active='1'
 
     AND (domain IN
 
       (SELECT domain FROM domain
 
@@ -354,7 +366,7 @@ query = SELECT goto FROM alias
 
     WHERE alias_domain.alias_domain = '%d'
 
       AND mailbox.username = CONCAT('%u','@',alias_domain.target_domain)
 
       AND (mailbox.active = '1' OR mailbox.active ='2')
 
-      AND alias_domain.active='1'
 
+      AND alias_domain.active='1';
 
 EOF
 
 
 # MX based routing

+ 16 - 0
data/web/api/index.css
View File 

@@ -0,0 +1,16 @@
 
+html {
 
+    box-sizing: border-box;
 
+    overflow: -moz-scrollbars-vertical;
 
+    overflow-y: scroll;
 
+}
 
+
 
+*,
 
+*:before,
 
+*:after {
 
+    box-sizing: inherit;
 
+}
 
+
 
+body {
 
+    margin: 0;
 
+    background: #fafafa;
 
+}

+ 2 - 43
data/web/api/index.html
View File 

@@ -5,56 +5,15 @@
 
     <meta charset="UTF-8">
 
     <title>Swagger UI</title>
 
     <link rel="stylesheet" type="text/css" href="./swagger-ui.css" />
 
+    <link rel="stylesheet" type="text/css" href="index.css" />
 
     <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
 
     <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
 
-    <style>
 
-      html
 
-      {
 
-        box-sizing: border-box;
 
-        overflow: -moz-scrollbars-vertical;
 
-        overflow-y: scroll;
 
-      }
 
-
 
-      *,
 
-      *:before,
 
-      *:after
 
-      {
 
-        box-sizing: inherit;
 
-      }
 
-
 
-      body
 
-      {
 
-        margin:0;
 
-        background: #fafafa;
 
-      }
 
-    </style>
 
   </head>
 
 
   <body>
 
     <div id="swagger-ui"></div>
 
-
 
     <script src="./swagger-ui-bundle.js" charset="UTF-8"> </script>
 
     <script src="./swagger-ui-standalone-preset.js" charset="UTF-8"> </script>
 
-    <script>
 
-    window.onload = function() {
 
-      // Begin Swagger UI call region
 
-      const ui = SwaggerUIBundle({
 
-        urls: [{url: "/api/openapi.yaml", name: "mailcow API"}],
 
-        dom_id: '#swagger-ui',
 
-        deepLinking: true,
 
-        presets: [
 
-          SwaggerUIBundle.presets.apis,
 
-          SwaggerUIStandalonePreset
 
-        ],
 
-        plugins: [
 
-          SwaggerUIBundle.plugins.DownloadUrl
 
-        ],
 
-        layout: "StandaloneLayout"
 
-      });
 
-      // End Swagger UI call region
 
-
 
-      window.ui = ui;
 
-    };
 
-  </script>
 
+    <script src="./swagger-initializer.js" charset="UTF-8"> </script>
 
   </body>
 
 </html>

+ 10 - 6
data/web/api/oauth2-redirect.html
View File 

@@ -13,7 +13,7 @@
 
         var isValid, qp, arr;
 
 
         if (/code|token|error/.test(window.location.hash)) {
 
-            qp = window.location.hash.substring(1);
 
+            qp = window.location.hash.substring(1).replace('?', '&');
 
         } else {
 
             qp = location.search.substring(1);
 
         }
 
@@ -38,7 +38,7 @@
 
                     authId: oauth2.auth.name,
 
                     source: "auth",
 
                     level: "warning",
 
-                    message: "Authorization may be unsafe, passed state was changed in server Passed state wasn't returned from auth server"
 
+                    message: "Authorization may be unsafe, passed state was changed in server. The passed state wasn't returned from auth server."
 
                 });
 
             }
 
 
@@ -58,7 +58,7 @@
 
                     authId: oauth2.auth.name,
 
                     source: "auth",
 
                     level: "error",
 
-                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server"
 
+                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server."
 
                 });
 
             }
 
         } else {
 
@@ -67,9 +67,13 @@
 
         window.close();
 
     }
 
 
-    window.addEventListener('DOMContentLoaded', function () {
 
-      run();
 
-    });
 
+    if (document.readyState !== 'loading') {
 
+        run();
 
+    } else {
 
+        document.addEventListener('DOMContentLoaded', function () {
 
+            run();
 
+        });
 
+    }
 
 </script>
 
 </body>
 
 </html>

+ 19 - 0
data/web/api/swagger-initializer.js
View File 

@@ -0,0 +1,19 @@
 
+window.onload = function() {
 
+  // Begin Swagger UI call region
 
+  const ui = SwaggerUIBundle({
 
+    urls: [{url: "/api/openapi.yaml", name: "mailcow API"}],
 
+    dom_id: '#swagger-ui',
 
+    deepLinking: true,
 
+    presets: [
 
+      SwaggerUIBundle.presets.apis,
 
+      SwaggerUIStandalonePreset
 
+    ],
 
+    plugins: [
 
+      SwaggerUIBundle.plugins.DownloadUrl
 
+    ],
 
+    layout: "StandaloneLayout"
 
+  });
 
+  // End Swagger UI call region
 
+
 
+  window.ui = ui;
 
+};

File diff suppressed because it is too large
+ 0 - 0
data/web/api/swagger-ui-bundle.js


File diff suppressed because it is too large
+ 0 - 0
data/web/api/swagger-ui-bundle.js.map


File diff suppressed because it is too large
+ 0 - 0
data/web/api/swagger-ui-es-bundle-core.js


File diff suppressed because it is too large
+ 0 - 0
data/web/api/swagger-ui-es-bundle-core.js.map


File diff suppressed because it is too large
+ 0 - 0
data/web/api/swagger-ui-es-bundle.js


File diff suppressed because it is too large
+ 0 - 0
data/web/api/swagger-ui-es-bundle.js.map


File diff suppressed because it is too large
+ 0 - 0
data/web/api/swagger-ui-standalone-preset.js


File diff suppressed because it is too large
+ 0 - 0
data/web/api/swagger-ui-standalone-preset.js.map


File diff suppressed because it is too large
+ 0 - 1
data/web/api/swagger-ui.css


File diff suppressed because it is too large
+ 0 - 0
data/web/api/swagger-ui.css.map


File diff suppressed because it is too large
+ 0 - 1
data/web/api/swagger-ui.js


File diff suppressed because it is too large
+ 0 - 0
data/web/api/swagger-ui.js.map


+ 2 - 1
data/web/lang/lang.tr.json
View File 

@@ -14,7 +14,8 @@
 
         "sogo_access": "SOGo erişiminin yönetilmesine izin ver",
 
         "domain_desc": "Alan adı açıklamasını değiştir",
 
         "extend_sender_acl": "Gönderenin acl'sini harici adreslere göre genişletmeye izin ver",
 
-        "spam_policy": "Engellenenler / İzin verilenler"
 
+        "spam_policy": "Engellenenler / İzin verilenler",
 
+        "filters": "Fitreler"
 
     },
 
     "add": {
 
         "activate_filter_warn": "Aktif edilirse diğer tüm filtreler devre dışı bırakılacak.",

+ 2 - 2
docker-compose.yml
View File 

@@ -215,7 +215,7 @@ services:
 
             - sogo
 
 
     dovecot-mailcow:
 
-      image: mailcow/dovecot:1.19
 
+      image: mailcow/dovecot:1.20
 
       depends_on:
 
         - mysql-mailcow
 
       dns:
 
@@ -295,7 +295,7 @@ services:
 
             - dovecot
 
 
     postfix-mailcow:
 
-      image: mailcow/postfix:1.67
 
+      image: mailcow/postfix:1.68
 
       depends_on:
 
         - mysql-mailcow
 
       volumes:

+ 1 - 1
update.sh
View File 

@@ -198,7 +198,7 @@ if ! [ "${DOCKER_COMPOSE_VERSION}" == "native" ] && ! [ "${DOCKER_COMPOSE_VERSIO
 
         echo -e "\e[31mFound Docker Compose Standalone.\e[0m"
 
         echo -e "\e[31mSetting the DOCKER_COMPOSE_VERSION Variable to standalone\e[0m"
 
         sleep 2
 
-        echo -e "\e[33mNotice: For an automatic update of docker-compose please use the update_compose.sh scripts located at the helper-scripts folder.[0m"
 
+        echo -e "\e[33mNotice: For an automatic update of docker-compose please use the update_compose.sh scripts located at the helper-scripts folder.\e[0m"
 
       else
 
         echo -e "\e[31mCannot find Docker Compose with a Version Higher than 2.X.X.\e[0m" 
         echo -e "\e[31mPlease update/install regarding to this doc site: https://mailcow.github.io/mailcow-dockerized-docs/i_u_m/i_u_m_install/\e[0m"

Some files were not shown because too many files changed in this diff