Migrations for TLS-SNI by mhofer117 · Pull Request #1 · OpenLarry/mailcow-dockerized

mhofer117 · 2019-10-20T17:03:37Z

I have merged all upstream changes and integrated your ecdsa certs into the TLS-SNI changes.

adding the amount of assigned domain quota to the disk usage display as potentially used disk space

now only summing up the assigned domain quota for active domains, and not subtracting disc base occupied by mailboxes of inactive domains (inactive_bytes)

- changed dockerapi to not return human readable values for df - all caluclations now in KiB - moved code from domain_admin to mailbox functions - using actual occupied bytes as used quota - all outputs now in *iB using formatBytes()

[Web] Return 401 status code when API authorization fails

extend debug page to show assigned domain quota

[Web] oAuth2 implementation (wip)

I had mistakenly kept the available disk space for the total disk space.

fix for "available ≠ total" error in mailcow#2989

Revert "fix for "available ≠ total" error in mailcow#2989"

Revert "extend debug page to show assigned domain quota"

[Web] Added API docs

Update update.sh

Fix delete button

…fix/Dovecot/Nginx

…inx sites

…ni-ecdsa # Conflicts: # data/Dockerfiles/acme/docker-entrypoint.sh # data/conf/dovecot/dovecot.conf # data/conf/nginx/site.conf # data/conf/postfix/main.cf # data/web/inc/ajax/dns_diagnostics.php # data/web/inc/functions.inc.php # docker-compose.yml # generate_config.sh # update.sh

OpenLarry · 2019-10-21T11:20:50Z

Oh, thank you! I'm happy to see your SNI PR got merged. :-)

I will verify your changes later and ask for the current state in my original PR. I already tried not to break exiting mailcow installations and I've tested different scenarios that might happen during upgrades. Since we now generate configs dynamically on start up anyway, we could also remove the symlink workaround, if somebody wants to disable ECDSA.

mhofer117 · 2019-10-21T13:13:33Z

Feel free to adapt :) I originally included the ecdsa changes because I thought your PR would be merged before mine.

Change line endings in functions.inc.php back to CRLF

This is a squashed commit of the following: commit db8051bc234c5fa67aa87a7a94f9e89eaf0e7dac Merge: 2634fdf 0402068 Author: Aaron Larisch <[email protected]> Date: Tue May 24 20:44:38 2022 +0200 Merge branch 'master' into add-ecdsa-support commit 2634fdf Merge: 0962b90 116c791 Author: Aaron Larisch <[email protected]> Date: Wed Nov 10 08:53:21 2021 +0100 Merge branch 'master' into add-ecdsa-support commit 0962b90 Merge: 6152271 d90d4f9 Author: Aaron Larisch <[email protected]> Date: Wed Jun 9 11:33:34 2021 +0200 Merge branch 'master' into add-ecdsa-support commit 6152271 Merge: 72261e6 6426476 Author: Aaron Larisch <[email protected]> Date: Fri Feb 26 18:20:30 2021 +0100 Merge branch 'master' into add-ecdsa-support commit 72261e6 Merge: 3a1cce2 0846013 Author: Aaron Larisch <[email protected]> Date: Wed Dec 16 21:33:55 2020 +0100 Merge branch 'master' into add-ecdsa-support commit 3a1cce2 Merge: 6a01796 c1034b8 Author: Aaron Larisch <[email protected]> Date: Tue Sep 15 10:51:32 2020 +0200 Merge branch 'master' into add-ecdsa-support commit 6a01796 Merge: 812adb0 9685b4b Author: Aaron Larisch <[email protected]> Date: Tue Jul 21 14:07:56 2020 +0200 Merge branch 'master' into add-ecdsa-support commit 812adb0 Author: Aaron Larisch <[email protected]> Date: Sun Jul 5 00:12:21 2020 +0200 Fix TLSA records for ECDSA and RSA certs in DNS diagnostics Disables TLS 1.3 for the test connection to limit to RSA or ECDSA ciphers. commit 83c9769 Merge: 6fb29ab becc505 Author: Aaron Larisch <[email protected]> Date: Sat Jul 4 23:03:45 2020 +0200 Merge branch 'master' into add-ecdsa-support commit 6fb29ab Merge: 3131e17 b933a30 Author: Aaron Larisch <[email protected]> Date: Thu May 21 11:34:30 2020 +0200 Merge branch 'master' into add-ecdsa-support commit 3131e17 Merge: 1929216 7fa10cc Author: Aaron Larisch <[email protected]> Date: Thu Apr 16 18:20:39 2020 +0200 Merge branch 'master' into add-ecdsa-support commit 1929216 Merge: a0edf84 a9947e9 Author: Aaron Larisch <[email protected]> Date: Sat Mar 21 08:38:07 2020 +0100 Merge branch 'master' into add-ecdsa-support commit a0edf84 Merge: 6152b42 b5c844d Author: Aaron Larisch <[email protected]> Date: Thu Feb 13 13:52:09 2020 +0100 Merge branch 'master' into add-ecdsa-support commit 6152b42 Merge: 85b791b e6bb306 Author: Aaron Larisch <[email protected]> Date: Wed Jan 15 10:14:18 2020 +0100 Merge branch 'master' into add-ecdsa-support commit 85b791b Merge: c233993 ff74b8a Author: Aaron Larisch <[email protected]> Date: Tue Dec 17 15:21:10 2019 +0100 Merge branch 'master' into add-ecdsa-support commit c233993 Merge: eee0238 4e8b2bf Author: Aaron Larisch <[email protected]> Date: Sat Dec 7 17:17:05 2019 +0100 Merge branch 'master' into add-ecdsa-support commit eee0238 Merge: 9e1ff33 1d1a9a2 Author: Aaron Larisch <[email protected]> Date: Fri Nov 8 12:53:51 2019 +0100 Merge branch 'master' into add-ecdsa-support commit 9e1ff33 Merge: ab16425 ea4da60 Author: Aaron Larisch <[email protected]> Date: Fri Nov 1 16:06:41 2019 +0100 Merge branch 'master' into add-ecdsa-support commit ab16425 Merge: c049926 573e62f Author: Aaron Larisch <[email protected]> Date: Thu Oct 31 13:57:01 2019 +0100 Merge branch 'master' into add-ecdsa-support commit c049926 Merge: 6a6d6c4 c431615 Author: Aaron Larisch <[email protected]> Date: Thu Oct 31 13:55:28 2019 +0100 Merge pull request #1 from mhofer117/tls-sni-ecdsa Change line endings in functions.inc.php back to CRLF commit c431615 Author: Marcel Hofer <[email protected]> Date: Sun Oct 20 19:02:17 2019 +0200 remove empty docker-entrypoint.sh commit efd6cd1 Merge: a2a0821 6a6d6c4 Author: Marcel Hofer <[email protected]> Date: Sun Oct 20 19:00:07 2019 +0200 Merge remote-tracking branch 'OpenLarry/add-ecdsa-support' into tls-sni-ecdsa # Conflicts: # data/Dockerfiles/acme/docker-entrypoint.sh # data/conf/dovecot/dovecot.conf # data/conf/nginx/site.conf # data/conf/postfix/main.cf # data/web/inc/ajax/dns_diagnostics.php # data/web/inc/functions.inc.php # docker-compose.yml # generate_config.sh # update.sh commit a2a0821 Merge: 4a62809 05e7c95 Author: Marcel Hofer <[email protected]> Date: Sun Oct 20 18:50:16 2019 +0200 Merge branch 'tls-sni' into tls-sni-ecdsa commit 4a62809 Author: Marcel Hofer <[email protected]> Date: Sat Oct 19 13:04:02 2019 +0200 [SSL] add optional ecdsa certs in addition to rsa certs commit 6a6d6c4 Merge: 351abd2 9f66b83 Author: Aaron Larisch <[email protected]> Date: Tue Oct 1 11:01:28 2019 +0200 Merge branch 'master' into add-ecdsa-support commit 351abd2 Merge: eddb269 0485379 Author: Aaron Larisch <[email protected]> Date: Mon Sep 9 17:40:47 2019 +0200 Merge branch 'master' into add-ecdsa-support commit eddb269 Merge: 9d13ead 6e82a35 Author: Aaron Larisch <[email protected]> Date: Thu Aug 29 11:36:03 2019 +0200 Merge branch 'master' into add-ecdsa-support commit 9d13ead Merge: 478c4d1 f21cf13 Author: Aaron Larisch <[email protected]> Date: Thu Aug 8 13:22:58 2019 +0200 Merge branch 'master' into add-ecdsa-support commit 478c4d1 Merge: 46dbf3b 7665cc2 Author: Aaron Larisch <[email protected]> Date: Thu Jun 27 14:49:09 2019 +0200 Merge branch 'master' into add-ecdsa-support commit 46dbf3b Merge: 680a272 69fb7f7 Author: Aaron Larisch <[email protected]> Date: Fri May 31 12:33:32 2019 +0200 Merge branch 'master' into add-ecdsa-support commit 680a272 Merge: f69559f b20ff13 Author: Aaron Larisch <[email protected]> Date: Tue May 7 12:29:34 2019 +0200 Merge branch 'master' into add-ecdsa-support commit f69559f Merge: 3e8a958 cd88165 Author: Aaron Larisch <[email protected]> Date: Mon Apr 15 12:55:41 2019 +0200 Merge branch 'master' into add-ecdsa-support commit 3e8a958 Merge: 956a487 4aae727 Author: Aaron <[email protected]> Date: Mon Mar 18 16:52:37 2019 +0100 Merge branch 'master' into add-ecdsa-support commit 956a487 Author: Aaron Larisch <[email protected]> Date: Sun Mar 17 12:34:56 2019 +0100 Set SKIP_ECDSA_CERT to y by default commit 7103fe7 Author: Aaron Larisch <[email protected]> Date: Sun Mar 17 11:05:05 2019 +0100 Add SKIP_ECDSA_CERT config parameter commit 91fca4f Author: Aaron Larisch <[email protected]> Date: Sat Mar 16 18:48:28 2019 +0100 Show TLSA records for ECDSA certificates in DNS diagnostics commit cc521b0 Author: Aaron Larisch <[email protected]> Date: Sat Mar 16 13:04:03 2019 +0100 Add ECDSA support Co-authored-by: Marcel Hofer <[email protected]>

friedPotat0 and others added 30 commits September 17, 2019 21:27

update postscreen whitelist by using postwhite

58cbf2c

add postscreen whitelist update script

6d41561

update postscreen whitelist

ea8c002

remove tmp folder

0d12be8

displaying assigned domain quota

1e6a032

adding the amount of assigned domain quota to the disk usage display as potentially used disk space

Merge remote-tracking branch 'upstream/master' into patch-5

471ab05

don't count assigned domain quota for inactive domains

f01e3e5

now only summing up the assigned domain quota for active domains, and not subtracting disc base occupied by mailboxes of inactive domains (inactive_bytes)

uniform spelling for quota

7c2a5ba

finalizing disk usage rework

ecda554

- changed dockerapi to not return human readable values for df - all caluclations now in KiB - moved code from domain_admin to mailbox functions - using actual occupied bytes as used quota - all outputs now in *iB using formatBytes()

[Web] Return 401 status code when API authentication fails

8b5be0b

Merge pull request mailcow#2993 from ntimo/task/api-unauth-status-code

7e44256

[Web] Return 401 status code when API authorization fails

Merge pull request mailcow#2989 from heavygale/patch-5

b727d24

extend debug page to show assigned domain quota

[Web] Do not allow to add domain admin for non existing domain

1c35002

[Web] oAuth2 implementation (wip)

Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized

23dcb68

Revert "extend debug page to show assigned domain quota"

4f6d407

fix available ≠ total

17f96fe

I had mistakenly kept the available disk space for the total disk space.

Merge pull request mailcow#2994 from heavygale/patch-5

ac56646

fix for "available ≠ total" error in mailcow#2989

[Compose] Update Dockerapi

323f98d

Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized

6f92988

Revert "fix for "available ≠ total" error in mailcow#2989"

35420f4

Merge pull request mailcow#2995 from mailcow/revert-2994-patch-5

bd52d04

Revert "fix for "available ≠ total" error in mailcow#2989"

Merge pull request mailcow#2996 from mailcow/revert-2989-patch-5

0b0ab00

Revert "extend debug page to show assigned domain quota"

Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized

b5ac86f

[Web] Added API docs html render

7377227

[NGINX] Make API docs accessible using /api/

5cf74f6

[Web] Remove mail address from examples of tls policy maps

65ce73f

[Web] Updated API docs

ea55b2a

Merge branch 'master' into task/api-docs

6e07de8

[Web] Removed output.html

aa7d203

Merge pull request mailcow#2998 from ntimo/task/api-docs

8d1c6e5

[Web] Added API docs

andryyy and others added 20 commits October 17, 2019 07:19

Merge pull request mailcow#3048 from Zyplonox/Zyplonox-redis-timeout-fix

67ef319

Update update.sh

Update admin.js

e329bff

Merge pull request mailcow#3053 from SamuelNitsche/patch-2

0f590ea

Fix delete button

[Netfilter] Add missing rspamderror php...

b02f73e

[Dockerfiles] Rename some files and create hook points

b0711db

[Git] Add ignore for hooks

05e1a17

[Compose] Update some images

1b9cea9

Remove test hook

65fc5d7

[Watchdog] Watch olefy

a95a3f6

[SSL] create individual domain certificates, add SNI configs for Post…

2e35da6

…fix/Dovecot/Nginx

[SSL] re-add nginx site.conf

84c5f43

[SSL] add new SNI config on updates / new installs

f702c67

[SSL] add optional ecdsa certs in addition to rsa certs

4a62809

[SSL] minor fix: prevent checking of empty SQL_DOMAIN

b413ed4

[SSL] prevent multiple certificates with the same domain

56bc9d4

[SSL] restore old nginx templates. fix possible issues with custom ng…

dcd50b2

…inx sites

[SSL] fix wildcard compare for non-bash shell

05e7c95

Merge branch 'tls-sni' into tls-sni-ecdsa

a2a0821

remove empty docker-entrypoint.sh

c431615

mhofer117 mentioned this pull request Nov 16, 2019

Add ECDSA support mailcow/mailcow-dockerized#2443

Open

OpenLarry merged commit c431615 into OpenLarry:add-ecdsa-support Dec 7, 2019

OpenLarry added a commit that referenced this pull request Dec 7, 2019

Merge pull request #1 from mhofer117/tls-sni-ecdsa

c049926

Change line endings in functions.inc.php back to CRLF

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrations for TLS-SNI#1

Migrations for TLS-SNI#1
OpenLarry merged 125 commits intoOpenLarry:add-ecdsa-supportfrom
mhofer117:tls-sni-ecdsa

mhofer117 commented Oct 20, 2019

Uh oh!

OpenLarry commented Oct 21, 2019

Uh oh!

mhofer117 commented Oct 21, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Conversation

mhofer117 commented Oct 20, 2019

Uh oh!

OpenLarry commented Oct 21, 2019

Uh oh!

mhofer117 commented Oct 21, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants