Commit Graph

1127 Commits (8c3ab0371af6154771342774d8d5ab90168f8479)

Author SHA1 Message Date
heavygale 11503fd316 Change ACL description 2019-10-09 22:30:20 +02:00
andryyy 88a32f025a Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2019-10-09 22:24:52 +02:00
André Peters a5fb1695fa
Merge pull request #3024 from friedPotat0/rspamdquarantinedetails
Add rspamd score and symbols to quarantine detail view
2019-10-09 22:24:47 +02:00
andryyy 83231ba8b5 Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2019-10-09 22:23:05 +02:00
andryyy 227093ce9b
[Web] More details about SOGo profile purging 2019-10-09 22:22:53 +02:00
André Peters 7373d91724
Merge pull request #3002 from ntimo/task/api-status-codes
[API] Status Codes and only allow valid http method
2019-10-09 22:22:06 +02:00
friedPotat0 cb17d71c61 Add score, symbols to quarantine detail view 2019-10-09 22:07:26 +02:00
friedPotat0 6fc32e8e52 Add option to download quarantine item as eml 2019-10-09 20:18:21 +02:00
ntimo af13ae455c
[API] Invalidate session after api call is done 2019-10-08 19:30:01 +02:00
andryyy 80a9c39956
[Web] Validate plain md5 hashes, closes #3017 2019-10-08 17:36:28 +02:00
heavygale a049a1ffac Undo automatic whitespace cleanup 2 2019-10-06 18:59:54 +02:00
heavygale a997a2e462 Undo automatic whitespace cleanup 2019-10-06 18:56:24 +02:00
ntimo 8a87dd4254
[API] Removed unsets that are not needed 2019-10-05 18:14:36 +02:00
heavygale 48838d9fd7 Don't update sogo_access when editing without acl
Disabled checkboxes send 0 even if checked -> don't change sogo_access at all, if mailbox gets edited by domain admin without sogo_access acl.
2019-10-05 18:07:46 +02:00
heavygale 292923a1cc Fix mistake in mailbox-edit 2019-10-05 17:34:25 +02:00
heavygale 2e42cfbd5f Added sogo_access acl for domain admin
- new sogo_access acl is added for domain admins
- changing sogo_acces on a mailbox is only allowed if attempted by admin or by an domain admin with sogo_access acl.
- new Mailboxes are created with SOGo access if "$MAILBOX_DEFAULT_ATTRIBUTES['sogo_access'] = true;" AND if created by admin or domain admin with sogo_access acl. Otherwise sogo_access is forbidden for the new mailbox.
2019-10-05 17:29:16 +02:00
ntimo 2c7e9f49d5
[API] Added comments to defaults 2019-10-04 09:01:31 +02:00
André Peters a008855991
Merge pull request #2999 from ntimo/task/api-docs
[Nginx] Fix nginx config for API docs
2019-10-04 08:51:26 +02:00
André Peters 0c2dcef916
Merge pull request #3003 from ntimo/task/replace-die-with-exit
[Web] Replaced die(); with exit(); due to code conventions
2019-10-04 08:45:08 +02:00
andryyy 4c952dda3b
[Web] Remove old transport-map from mailbox.js 2019-10-04 08:44:31 +02:00
ntimo cb9ab928b3
[Web] Replaced die(); with exit(); due to code conventions 2019-10-04 08:40:24 +02:00
ntimo 6372df21fe
[API] Replaced die(); with exit(); due to code conventions 2019-10-04 08:37:30 +02:00
ntimo 08350d9a95
[API] Added missing route not found error for /get/logs/ 2019-10-03 20:58:56 +02:00
ntimo 2da55296b5
[API] Catch more cases where no api route exists 2019-10-03 20:52:09 +02:00
ntimo b9c244b746
[API] Only allow POST method for edit apis 2019-10-03 18:14:27 +02:00
ntimo 5fa456770f
[API] Removed hard coded status code 200 2019-10-03 17:25:56 +02:00
ntimo 416d5a12f8
[API] Unset POST when only GET is allowed 2019-10-03 15:06:08 +02:00
ntimo ab298741e3
[API] Added comments 2019-10-03 15:04:25 +02:00
ntimo 877c48db58
[API] Added missing die() 2019-10-03 14:42:30 +02:00
ntimo c4c9d2a3b4
[API] Fixed broken if 2019-10-03 14:39:38 +02:00
ntimo f393049273
[API] Make add and delete routes POST only 2019-10-03 14:36:10 +02:00
ntimo 948137b4b4
[API] Fixed only allow GET logic 2019-10-03 12:56:01 +02:00
ntimo c67e86756f
[API] Better check for GET method 2019-10-03 12:54:06 +02:00
ntimo 796853cae5
[API] Replace exit with die(); 2019-10-03 12:50:58 +02:00
ntimo 72f8c0a5bd
[API] Added proper status codes to API 2019-10-03 12:48:19 +02:00
ntimo 27ee8c3277
[API Docs] Added new oAuth endpoints 2019-10-03 12:47:07 +02:00
ntimo aa7d2037a1
[Web] Removed output.html 2019-10-03 11:08:28 +02:00
ntimo 6e07de8d4f
Merge branch 'master' into task/api-docs 2019-10-03 11:07:58 +02:00
ntimo ea55b2a2a7
[Web] Updated API docs 2019-10-03 11:06:26 +02:00
andryyy 65ce73f973
[Web] Remove mail address from examples of tls policy maps 2019-10-03 10:39:47 +02:00
ntimo 73772275c9
[Web] Added API docs html render 2019-10-02 22:13:12 +02:00
andryyy b5ac86f86d Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2019-10-02 19:40:37 +02:00
andryyy 6f92988914 Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2019-10-02 19:28:34 +02:00
heavygale 17f96fe36b fix available ≠ total
I had mistakenly kept the available disk space for the total disk space.
2019-10-02 19:26:32 +02:00
André Peters 4f6d407fdd
Revert "extend debug page to show assigned domain quota" 2019-10-02 19:23:09 +02:00
andryyy 23dcb68f50 Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2019-10-02 19:01:12 +02:00
andryyy 1c35002505
[Web] Do not allow to add domain admin for non existing domain
[Web] oAuth2 implementation (wip)
2019-10-02 19:00:36 +02:00
André Peters b727d240c2
Merge pull request #2989 from heavygale/patch-5
extend debug page to show assigned domain quota
2019-10-02 18:57:46 +02:00
ntimo 8b5be0b56d
[Web] Return 401 status code when API authentication fails 2019-10-02 13:05:12 +02:00
heavygale ecda554e53 finalizing disk usage rework
- 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()
2019-10-01 20:27:06 +02:00
heavygale 7c2a5ba37e uniform spelling for quota 2019-09-29 19:19:06 +02:00
heavygale f01e3e59c5 don't count assigned domain quota for inactive domains
now only summing up the assigned domain quota for active domains, and not subtracting disc base occupied by mailboxes of inactive domains (inactive_bytes)
2019-09-29 19:04:00 +02:00
heavygale 471ab05423 Merge remote-tracking branch 'upstream/master' into patch-5 2019-09-29 17:58:09 +02:00
heavygale 1e6a032d1e displaying assigned domain quota
adding the amount of assigned domain quota to the disk usage display as potentially used disk space
2019-09-29 17:45:36 +02:00
André Peters 1586f7942f
Merge pull request #2984 from Geitenijs/patch-5
Update lang.nl.php
2019-09-28 21:29:27 +02:00
Geitenijs 8893b8502c
Update lang.nl.php 2019-09-28 20:55:41 +02:00
andryyy 7a85abdb42
[Web] Prepare for oauth2
[Web] Some lib updates
[Web] Allow to add a footer
2019-09-28 20:00:04 +02:00
Geitenijs c3e313796e
Update lang.nl.php 2019-09-27 23:33:41 +02:00
andryyy 8b453ab803 [Web] Allow to set sogo_visible when adding an alias, fixes #2975 2019-09-24 19:12:45 +02:00
andryyy 14a2a266a1
[Web] Improve U2F process and fix Win 1903 hassle 2019-09-24 18:34:08 +02:00
andryyy 7cf2c0ad69
[Web] Changes to 502 status page 2019-09-24 07:06:33 +02:00
andryyy 9b7668d912
[Nginx] Custom 502 2019-09-24 06:53:13 +02:00
andryyy c3be04560b
[Web] mailbox.php uses dropups
[Web] Allow to set visibility of aliases in SOGo
[Web] Refresh window when session timed out
[Web] Increase default log lines and pagination trigger
[Web] Increase delay when filtering tables
2019-09-22 15:10:56 +02:00
André Peters fe38275cb5
Revert "Make is_valid_domain_name more strict" 2019-09-21 14:16:50 +02:00
andryyy 1207c6e865
[Web] Do not check hostname is is_valid_domain_name 2019-09-21 10:44:08 +02:00
André Peters 0dbc03a416
Merge pull request #2941 from patschi/domain-name-fix
Make is_valid_domain_name more strict
2019-09-19 15:03:51 +02:00
andryyy 0487f5ea1d
[Web] Add JVM memory indiator and add minor fixes 2019-09-17 20:11:53 +02:00
Patrik Kernstock 6b2f5a30d2
Slightly modified is_valid_domain_name for #1118 2019-09-15 20:40:07 +01:00
andryyy 62a386f94e
[Web] Remove invalid chars from sender for quota and quarantine notifications 2019-09-15 09:52:13 +02:00
andryyy bba8e4f70c
[Web] Change quarantine notification interval as admin when editing a mailbox 2019-09-12 08:28:50 +02:00
andryyy 261c2a5850
[Web] Default to hourly quarantine notifications for new mailboxes; [Web] Change "SOGo" link to "Webmail" 2019-09-12 08:28:05 +02:00
Filip Hajny 28a5fc1c2a One more awkward word 2019-09-05 21:56:01 +02:00
Filip Hajny 4eaf432bec Update cs lang definitions, clear typos, simplify wording, clear up confusions. 2019-09-05 21:49:43 +02:00
Tobias 70187836e8
Update admin.js
Fix "→" is not displayed when username is save with uppercase
See bevor:  https://i.tobias.bayern/9XGMoS5g.png
See after change: https://i.tobias.bayern/QvupZ23j.png
2019-09-05 19:08:41 +02:00
André Peters cdd91bcb9b
Update functions.mailbox.inc.php 2019-09-05 10:54:35 +02:00
andryyy 893ce5a789
[Web] Allow to add external sender addresses, can be disabled by domain admin ACL and is disabled by default 2019-09-02 11:11:41 +02:00
andryyy 46fadf95a2
[Web] Small CSS fixes and additions 2019-09-02 11:10:14 +02:00
andryyy ab42540769
[Web] Minor changes or fixes; [Web] Add multiple transport destinations at the same time - comma separated 2019-08-30 18:54:38 +02:00
andryyy 0d8a92a365
[Web] Show ratelimit inheritance
[Web] Do not allow TLS-wrapped next shops (SMTPS) in transports
[Web] Minor fixes or preparations
2019-08-25 16:02:58 +02:00
andryyy c69c2d9c13 Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2019-08-16 22:18:55 +02:00
andryyy 692614f79e
[Web] Fix loop in SPF lookup 2019-08-16 18:20:58 +02:00
andryyy 6e41fa9fc1
[Web] Update JQuery, todo: dont use migrate 2019-08-16 18:20:24 +02:00
Patrik Kernstock 409ecf7fd5
[Web] Fixed one more possible XSS
XSS might be possible when using a specific-crafted request (harder than previous ones). Might also easily cause JS errors and making the "mailcow UI"-logs not accessible anymore
2019-08-14 22:19:50 +02:00
Patrik Kernstock 4f25a3646e Fixed several other XSS's 2019-08-14 00:22:40 +02:00
andryyy 5fd00abf91 Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2019-08-13 21:12:30 +02:00
andryyy fab23cec2b
[Web] Fix XSS in call field 2019-08-13 21:12:24 +02:00
André Peters a41825dede
Merge pull request #2857 from mailcow/update-msg-removehash
Small info regarding hash deletion, fixes #2775
2019-08-13 21:07:35 +02:00
André Peters 32f293e55f
Update lang.en.php 2019-08-13 21:07:25 +02:00
Geitenijs badd6b5e7f Update lang.nl.php (#2850) 2019-08-13 20:11:24 +02:00
Patrik Kernstock a3315d9187 Rephrase EN 2019-08-13 19:53:26 +02:00
Patrik Kernstock 2b0795cc71 Small info regarding hash deletion, fixes #2775 2019-08-12 19:30:31 +02:00
andryyy 294e0bc07f
[Web] Cache validation result in Redis 2019-08-11 22:19:26 +02:00
heavygale 2d74d81cb1 htmlspecialchars for value attributes
Escaping htmlspecialchars in value attributes.
2019-08-10 19:36:03 +02:00
andryyy 03259d66bb
[Web] Minor fixes 2019-08-10 16:12:06 +02:00
andryyy d8dfd5061b
[Web] Minor fixes and changes 2019-08-10 15:57:07 +02:00
andryyy 9a500a7068
[Web] Verify OPTIONAL license plus minor fixes 2019-08-09 14:16:52 +02:00
andryyy cb9a63ec4d
[Web] Fix CSS, thanks to @irgendwr 2019-08-09 14:14:41 +02:00
André Peters c7eec72055
[Web] Language updates 2019-07-29 21:12:47 +02:00
andryyy 2193378982
[Web] unlimited_quota fix for domain admins 2019-07-29 16:16:31 +02:00
andryyy dadc66fe49
[Web] Minor changes to ip labels 2019-07-28 21:36:48 +02:00
Faisal Misle be4673c5f6 Update lang.es.php
minor update
2019-07-28 07:17:10 -05:00
Faisal Misle db8b7aaa04 Language updates
Spanish is 95% done, minor gramatical updates to english version
2019-07-28 07:13:31 -05:00
André Peters 2061181d82
Merge pull request #2810 from friedPotat0/quarantinetable
Minor adjustments to tables in UI
2019-07-27 19:40:43 +02:00
friedPotat0 c48ae234ce Restrict toggle for tbl with specific breakpoints 2019-07-27 19:07:01 +02:00
friedPotat0 d1153b470f Restrict row toggle for remaing tables 2019-07-27 18:57:58 +02:00
friedPotat0 1b54d75716 Prevent event propagation for remaining tables 2019-07-27 18:56:51 +02:00
friedPotat0 bcad71cfaa Add proper cursor to remaining UI tables 2019-07-27 18:50:58 +02:00
friedPotat0 36888645bc Set proper cursor for quarantine table rows 2019-07-27 17:17:56 +02:00
friedPotat0 fb1307daa9 Set proper cursor for footable toggle 2019-07-27 17:16:59 +02:00
friedPotat0 abf0548ca4 Prevent event propagation for footable toggle 2019-07-27 17:14:56 +02:00
friedPotat0 581f8c77c7 Restrict quarantine table row toggle 2019-07-27 16:49:53 +02:00
André Peters 857c225d07
Merge pull request #2804 from friedPotat0/buttonpointerevents
Fix pointer events for nested button elements
2019-07-27 15:59:26 +02:00
andryyy 85f20a901d
[Web] Remove top padding on login screen for small devices 2019-07-23 21:33:24 +02:00
andryyy 91edf275b9
[Web] Minor language change in lang.de 2019-07-23 19:53:11 +02:00
andryyy 45f31ba931
[Web] Handle score as string 2019-07-23 19:52:46 +02:00
friedPotat0 454ffac803 Fix pointer events for nested button elements 2019-07-23 05:48:29 +02:00
friedPotat0 d4f3e87a2f Add spam score to quarantine table 2019-07-23 04:22:28 +02:00
andryyy 3f741eb625
[Web] Disable user-scalable, set max-scale to 1 2019-07-22 21:11:25 +02:00
mkapra a5756716e0 Fixing duplicated port for profile downloading. 2019-07-17 08:59:49 +02:00
Geitenijs 448752cd94
Update lang.nl.php 2019-07-05 18:38:16 +02:00
andryyy cb4f025bb1
[Web] Add important info about disabled GAL 2019-07-05 15:37:28 +02:00
andryyy e71abf1895 Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2019-07-05 15:16:48 +02:00
andryyy 350811dadd [Web] Enable GAL by default 2019-07-05 15:16:11 +02:00
Sascha Henke d0ecd08ba0
Kleine Rechtschreibkorrektur
2 Rechtschreibfehler und eine Stiländerung
2019-07-04 08:30:39 +02:00
Braintelligence 61f950b473
Fix issue #2718
Proposal for a fix of issue #2718 .
Strip port from HTTP_HOST per @mkuron proposal: https://github.com/mailcow/mailcow-dockerized/issues/2718#issuecomment-506987422
2019-07-01 16:48:01 +02:00
andryyy f35bc07a30
[Web] Generate readable passwords 2019-06-20 10:18:09 +02:00
andryyy c7a85fc520
[Web] Fix BCC error message 2019-06-16 16:00:41 +02:00
andryyy 59798357f7
[Web] Fix SPF link 2019-06-16 16:00:14 +02:00
andryyy ffb008f72a Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2019-06-09 16:50:04 +02:00
andryyy 5ce6688c78
[Web] Show resource alias 2019-06-09 16:49:17 +02:00
Aiko Appeldorn 1634a486fc
[web] increased db version 2019-06-09 12:08:23 +02:00
Timo N 9325bb6f4e
Merge pull request #2594 from FELDSAM-INC/domain-default-mailbox-quota
Default quota for mailbox
2019-06-09 10:49:43 +02:00
andryyy 176f2a3f34
[Web] Allow to set max_age for quarantine items 2019-06-01 21:22:14 +02:00
andryyy 5f8dd69a2d
[Web] Fix lang strings for sieve pathes and sieve flow 2019-06-01 14:10:01 +02:00
andryyy 8537767443
[Web] Show error when connection to redis fails (instead of 5xx) 2019-05-28 15:18:27 +02:00
andryyy 2508ee5b69
[Web] Delete from sender_acl when deleting an alias 2019-05-26 09:39:04 +02:00
andryyy 6fffda5def
[Web] Remove file 2019-05-26 09:24:50 +02:00
andryyy d5612cf60f
[Web] More fixes for alias as sender_acl 2019-05-26 09:22:06 +02:00
andryyy 5087d5ce96
[Web] Allow aliases as send-as 2019-05-26 08:29:10 +02:00
andryyy db0ec130f5
[Web] Lang updates
[ACME] Typo
2019-05-22 23:47:45 +02:00
André Peters 9a114845d7
[Netfilter] Reworked by @Kraeutergarten 2019-05-22 22:49:40 +02:00
Evangelos Foutras e1a3313660 [Web] Fix showing domain with disabled sender check
If a mailbox is allowed to send as any address under its domain (+ alias
domains) and the domain itself has no aliases configured, no information
about this fact is shown to the user. That is to say, the "Do not check
sender access for the following domain(s) and its alias domains" field
under mailbox details is empty.

The above is happening because the second GROUP_CONCAT() returns NULL
making the enclosing CONCAT() return NULL as well. Fix this by using
CONCAT_WS() which correctly handles the case of zero domain aliases.

Furthermore, move the IFNULL() to the first GROUP_CONCAT() because
CONCAT_WS() returns an empty string when both GROUP_CONCAT()'s are
NULL. We can be certain that when the first GROUP_CONCAT() is NULL
the second one will be as well, so it's safe to use IFNULL() there.
2019-05-20 18:08:45 +03:00
Kraeutergarten b862ce2bfb Add hostnames for blacklist. 2019-05-20 09:02:40 +02:00
andryyy 5bb23a2664 [Web] Fix null ua in debug.js - fixes #2615 2019-05-18 15:35:00 +02:00
Kraeutergarten 4cc63ceeb7 Allow hostnames for fail2ban whitelist. 2019-05-17 19:38:34 +02:00
andryyy 885b79f06f
[Web] Add function to read F2B data via API 2019-05-17 11:21:25 +02:00
Kraeutergarten 7417dd3a85 Check if domain value is undefined or null. 2019-05-16 10:15:37 +02:00
Kraeutergarten 84a78dbd0d Adds only existing domains in table to the filter and removes additional ajax request. 2019-05-16 08:20:21 +02:00
andryyy 06193ca625
[Web] Write API logs when format is data binary 2019-05-12 15:22:00 +02:00
Kristián Feldsam b8b6450753 Default quota for mailbox
Signed-off-by: Kristián Feldsam <feldsam@gmail.com>
2019-05-11 11:16:40 +02:00