diff --git a/package-lock.json b/package-lock.json index d4daa2e..efddb01 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "passky-server", - "version": "8.1.1", + "version": "8.1.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "passky-server", - "version": "8.1.1", + "version": "8.1.2", "license": "GPL-3.0", "devDependencies": { "tailwindcss": "^3.2.4" diff --git a/package.json b/package.json index 1cac3b1..cc77fca 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "passky-server", "description": "Server for Passky (password manager)", - "version": "8.1.1", + "version": "8.1.2", "main": "tailwind.config.js", "scripts": { "build": "npx tailwindcss -i ./tailwind.css -o ./server/src/website/css/tailwind.min.css --minify" diff --git a/server/docker/etc/s6-overlay/scripts/runas-user b/server/docker/etc/s6-overlay/scripts/runas-user index f4c9151..ccc1301 100644 --- a/server/docker/etc/s6-overlay/scripts/runas-user +++ b/server/docker/etc/s6-overlay/scripts/runas-user @@ -33,6 +33,10 @@ if [[ -z $ACCOUNT_PREMIUM ]]; then ACCOUNT_PREMIUM=-1 fi +if [[ -z $LIMITER_ENABLED ]]; then + LIMITER_ENABLED=true +fi + echo ' -------------------------------------------- Settings diff --git a/server/src/Settings.php b/server/src/Settings.php index 0f586b7..d969878 100644 --- a/server/src/Settings.php +++ b/server/src/Settings.php @@ -9,7 +9,7 @@ // Try to load .env file and make it available for getenv to use. try{ - (new DevCoder\DotEnv(ROOT . '/.env'))->load(); + (new DevCoder\DotEnv(ROOT . '/.env', array(DevCoder\Processor\QuotedProcessor::class)))->load(); }catch(Exception $ignored){} class Settings{ @@ -21,7 +21,7 @@ class Settings{ */ public static function getVersion() : string{ - return '8.1.1'; + return '8.1.2'; } public static function getLocation() : string{ @@ -89,7 +89,8 @@ public static function getDBPassword() : string{ } public static function getDBSSL() : bool{ - return getenv('MYSQL_SSL', true) === 'true'; + $enabled = getenv('MYSQL_SSL', true) ?: getenv('MYSQL_SSL') ?: 'false'; + return in_array($enabled, array('true', '1'), true); } public static function getDBSSLCA() : string{ @@ -165,7 +166,8 @@ public static function getRedisLocalPassword() : string{ */ public static function getMail() : bool{ - return getenv('MAIL_ENABLED', true) === 'true'; + $enabled = getenv('MAIL_ENABLED', true) ?: getenv('MAIL_ENABLED') ?: 'false'; + return in_array($enabled, array('true', '1'), true); } public static function getMailHost() : string{ @@ -185,7 +187,8 @@ public static function getMailPassword() : string{ } public static function getMailTLS() : bool{ - return getenv('MAIL_USE_TLS', true) === 'true'; + $enabled = getenv('MAIL_USE_TLS', true) ?: getenv('MAIL_USE_TLS') ?: 'false'; + return in_array($enabled, array('true', '1'), true); } /* @@ -227,7 +230,8 @@ public static function getYubiId() : int{ */ public static function getLimiter() : bool{ - return getenv('LIMITER_ENABLED', true) === 'true'; + $enabled = getenv('LIMITER_ENABLED', true) ?: getenv('LIMITER_ENABLED') ?: 'true'; + return in_array($enabled, array('true', '1'), true); } public static function getLimiterGetInfo() : int{