git subrepo commit mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "308860af"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "3f1a5af8"
git-subrepo: version: "0.4.5"
origin: "???"
commit: "???"
Change-Id: I5d51c14b45db54fe706be40a591ddbfcea50d4b0
diff --git a/mailcow/src/mailcow-dockerized/data/web/inc/prerequisites.inc.php b/mailcow/src/mailcow-dockerized/data/web/inc/prerequisites.inc.php
index a5eb2c8..b3b1cc1 100644
--- a/mailcow/src/mailcow-dockerized/data/web/inc/prerequisites.inc.php
+++ b/mailcow/src/mailcow-dockerized/data/web/inc/prerequisites.inc.php
@@ -2,6 +2,8 @@
// check for development mode
$DEV_MODE = (getenv('DEV_MODE') == 'y');
+// check for demo mode
+$DEMO_MODE = (getenv('DEMO_MODE') == 'y');
// Slave does not serve UI
/* if (!preg_match('/y|yes/i', getenv('MASTER'))) {
@@ -10,11 +12,17 @@
}*/
require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/vars.inc.php';
+
$default_autodiscover_config = $autodiscover_config;
if (file_exists($_SERVER['DOCUMENT_ROOT'] . '/inc/vars.local.inc.php')) {
include_once $_SERVER['DOCUMENT_ROOT'] . '/inc/vars.local.inc.php';
}
+
+// auto-generated by generate-config.sh and update.sh
+if (file_exists($_SERVER['DOCUMENT_ROOT'] . '/inc/app_info.inc.php')) {
+ require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/app_info.inc.php';
+}
unset($https_port);
$autodiscover_config = array_merge($default_autodiscover_config, $autodiscover_config);
@@ -38,40 +46,18 @@
require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/lib/array_merge_real.php';
-// Minify JS
-use MatthiasMullie\Minify;
-$js_minifier = new JSminifierExtended();
-$js_dir = array_diff(scandir('/web/js/build'), array('..', '.'));
-foreach ($js_dir as $js_file) {
- $js_minifier->add('/web/js/build/' . $js_file);
-}
-
-// Minify CSS
-$css_minifier = new CSSminifierExtended();
-$css_dir = array_diff(scandir('/web/css/build'), array('..', '.'));
-foreach ($css_dir as $css_file) {
- $css_minifier->add('/web/css/build/' . $css_file);
-}
-
// U2F API + T/HOTP API
+// u2f - deprecated, should be removed
$u2f = new u2flib_server\U2F('https://' . $_SERVER['HTTP_HOST']);
$qrprovider = new RobThree\Auth\Providers\Qr\QRServerProvider();
$tfa = new RobThree\Auth\TwoFactorAuth($OTP_LABEL, 6, 30, 'sha1', $qrprovider);
// FIDO2
+$server_name = parse_url('https://' . $_SERVER['HTTP_HOST'], PHP_URL_HOST);
$formats = $GLOBALS['FIDO2_FORMATS'];
-$WebAuthn = new \WebAuthn\WebAuthn('WebAuthn Library', $_SERVER['HTTP_HOST'], $formats);
-$WebAuthn->addRootCertificates($_SERVER['DOCUMENT_ROOT'] . '/inc/lib/WebAuthn/rootCertificates/solo.pem');
-$WebAuthn->addRootCertificates($_SERVER['DOCUMENT_ROOT'] . '/inc/lib/WebAuthn/rootCertificates/apple.pem');
-$WebAuthn->addRootCertificates($_SERVER['DOCUMENT_ROOT'] . '/inc/lib/WebAuthn/rootCertificates/nitro.pem');
-$WebAuthn->addRootCertificates($_SERVER['DOCUMENT_ROOT'] . '/inc/lib/WebAuthn/rootCertificates/yubico.pem');
-$WebAuthn->addRootCertificates($_SERVER['DOCUMENT_ROOT'] . '/inc/lib/WebAuthn/rootCertificates/hypersecu.pem');
-$WebAuthn->addRootCertificates($_SERVER['DOCUMENT_ROOT'] . '/inc/lib/WebAuthn/rootCertificates/globalSign.pem');
-$WebAuthn->addRootCertificates($_SERVER['DOCUMENT_ROOT'] . '/inc/lib/WebAuthn/rootCertificates/googleHardware.pem');
-$WebAuthn->addRootCertificates($_SERVER['DOCUMENT_ROOT'] . '/inc/lib/WebAuthn/rootCertificates/microsoftTpmCollection.pem');
-$WebAuthn->addRootCertificates($_SERVER['DOCUMENT_ROOT'] . '/inc/lib/WebAuthn/rootCertificates/huawei.pem');
-$WebAuthn->addRootCertificates($_SERVER['DOCUMENT_ROOT'] . '/inc/lib/WebAuthn/rootCertificates/trustkey.pem');
-$WebAuthn->addRootCertificates($_SERVER['DOCUMENT_ROOT'] . '/inc/lib/WebAuthn/rootCertificates/bsi.pem');
+$WebAuthn = new lbuchs\WebAuthn\WebAuthn('WebAuthn Library', $server_name, $formats);
+// only include root ca's when needed
+if (getenv('WEBAUTHN_ONLY_TRUSTED_VENDORS') == 'y') $WebAuthn->addRootCertificates($_SERVER['DOCUMENT_ROOT'] . '/inc/lib/WebAuthn/rootCertificates');
// Redis
$redis = new Redis();
@@ -196,9 +182,65 @@
// Set language
if (!isset($_SESSION['mailcow_locale']) && !isset($_COOKIE['mailcow_locale'])) {
if ($DETECT_LANGUAGE && isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
- $header_lang = strtolower(substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2));
- if (array_key_exists($header_lang, $AVAILABLE_LANGUAGES)) {
- $_SESSION['mailcow_locale'] = $header_lang;
+ // regex inspired from @GabrielAnderson on http://stackoverflow.com/questions/6038236/http-accept-language
+ preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})*)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $lang_parse);
+
+ $langs = $lang_parse[1];
+ $ranks = $lang_parse[4];
+
+ // (create an associative array 'language' => 'preference')
+ $lang2pref = array();
+ for ($i=0; $i<count($langs); $i++) {
+ $lang2pref[strtolower($langs[$i])] = (float) (!empty($ranks[$i]) ? $ranks[$i] : 1);
+ }
+
+ // (comparison function for uksort)
+ $cmpLangs = function ($a, $b) use ($lang2pref) {
+ if ($lang2pref[$a] > $lang2pref[$b])
+ return -1;
+ elseif ($lang2pref[$a] < $lang2pref[$b])
+ return 1;
+ elseif (strlen($a) > strlen($b))
+ return -1;
+ elseif (strlen($a) < strlen($b))
+ return 1;
+ else
+ return 0;
+ };
+
+ // sort the languages by prefered language and by the most specific region
+ uksort($lang2pref, $cmpLangs);
+
+ // generate language array without the region part
+ $AVAILABLE_BASE_LANGUAGES=array();
+ foreach ($AVAILABLE_LANGUAGES as $code => $lang) {
+ $base_code = substr($code, 0, 2);
+ if (!array_key_exists($base_code, $AVAILABLE_BASE_LANGUAGES)) {
+ $AVAILABLE_BASE_LANGUAGES[$base_code] = $code;
+ }
+ }
+
+ // Find a perfect match or partial match
+ // Match en-gb or en
+ foreach ($lang2pref as $lang => $q) {
+ if (array_key_exists($lang, $AVAILABLE_LANGUAGES)) {
+ $_SESSION['mailcow_locale'] = $lang;
+ break;
+ } elseif (array_key_exists($lang, $AVAILABLE_BASE_LANGUAGES)) {
+ $_SESSION['mailcow_locale'] = $AVAILABLE_BASE_LANGUAGES[$lang];
+ break;
+ }
+ }
+
+ // Try suggest match
+ // e.g. suggest en-gb when only en-us is provided
+ if (!isset($_SESSION['mailcow_locale'])) {
+ foreach ($lang2pref as $lang => $q) {
+ if (array_key_exists(substr($lang, 0, 2), $AVAILABLE_BASE_LANGUAGES)) {
+ $_SESSION['mailcow_locale'] = $AVAILABLE_BASE_LANGUAGES[substr($lang, 0, 2)];
+ break;
+ }
+ }
}
}
else {
@@ -216,13 +258,14 @@
/*
* load language
*/
-$lang = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . '/lang/lang.en.json'), true);
+$lang = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . '/lang/lang.en-gb.json'), true);
$langFile = $_SERVER['DOCUMENT_ROOT'] . '/lang/lang.'.$_SESSION['mailcow_locale'].'.json';
if(file_exists($langFile)) {
$lang = array_merge_real($lang, json_decode(file_get_contents($langFile), true));
}
+
require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/functions.acl.inc.php';
require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/functions.address_rewriting.inc.php';
require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/functions.admin.inc.php';
@@ -257,4 +300,29 @@
// }
acl('to_session');
}
+
+// init frontend
+// Minify JS
+use MatthiasMullie\Minify;
+$js_minifier = new JSminifierExtended();
+$js_dir = array_diff(scandir('/web/js/build'), array('..', '.'));
+// Minify CSS
+$css_minifier = new CSSminifierExtended();
+$css_dir = array_diff(scandir('/web/css/build'), array('..', '.'));
+// get customized ui data
$UI_TEXTS = customize('get', 'ui_texts');
+
+
+// minify bootstrap theme
+if (file_exists('/web/css/themes/'.$UI_THEME.'-bootstrap.css'))
+ $css_minifier->add('/web/css/themes/'.$UI_THEME.'-bootstrap.css');
+else
+ $css_minifier->add('/web/css/themes/lumen-bootstrap.css');
+// minify css build files
+foreach ($css_dir as $css_file) {
+ $css_minifier->add('/web/css/build/' . $css_file);
+}
+// minify js build files
+foreach ($js_dir as $js_file) {
+ $js_minifier->add('/web/js/build/' . $js_file);
+}