mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 14:18:27 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Lucas Bartholemy 2023-04-20 12:01:36 +02:00
commit 5a5321a0eb
10 changed files with 517 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -6,7 +6,9 @@ HumHub Changelog
- Fix #6196: Use class names for default logging targets in default common config
- Fix #6202: Invite by link is not possible for a user already invited by email
- Fix #5718: Fix profile field "Country" to use js plugin Select2
- Enh #6214: Improve SoftDelete implementation
- Enh #6214: Improved SoftDelete implementation
- Fix #6221: Improved SaaS handling in installer
- Fix #6232: Fix Error DateValidator::parseDateValuePHP in php8.2
1.14.0-beta.2 (March 28, 2023)
------------------------------
@ -58,6 +60,7 @@ HumHub Changelog
--------------------
- Fix #6195: Fix `ModuleManager` disabling logging when no modules set
1.13.2 (March 27, 2023)
-----------------------
- Fix #5965: Suppress log warning 'Invalid session auth key attempted for user'

458
protected/humhub/components/validators/DateValidator.php Normal file
View File

@ -0,0 +1,458 @@
<?php
namespace humhub\components\validators;
use DateTime;
use DateTimeZone;
use Exception;
use IntlDateFormatter;
use Yii;
use yii\base\InvalidConfigException;
use yii\helpers\FormatConverter;
use yii\validators\Validator;
/**
* todo: Remove after Yii 2.0.48 release
*/
class DateValidator extends Validator
{
/**
* Constant for specifying the validation [[type]] as a date value, used for validation with intl short format.
* @since 2.0.8
* @see type
*/
const TYPE_DATE = 'date';
/**
* Constant for specifying the validation [[type]] as a datetime value, used for validation with intl short format.
* @since 2.0.8
* @see type
*/
const TYPE_DATETIME = 'datetime';
/**
* Constant for specifying the validation [[type]] as a time value, used for validation with intl short format.
* @since 2.0.8
* @see type
*/
const TYPE_TIME = 'time';
/**
* @var string the type of the validator. Indicates, whether a date, time or datetime value should be validated.
* This property influences the default value of [[format]] and also sets the correct behavior when [[format]] is one of the intl
* short formats, `short`, `medium`, `long`, or `full`.
*
* This is only effective when the [PHP intl extension](https://www.php.net/manual/en/book.intl.php) is installed.
*
* This property can be set to the following values:
*
* - [[TYPE_DATE]] - (default) for validating date values only, that means only values that do not include a time range are valid.
* - [[TYPE_DATETIME]] - for validating datetime values, that contain a date part as well as a time part.
* - [[TYPE_TIME]] - for validating time values, that contain no date information.
*
* @since 2.0.8
*/
public $type = self::TYPE_DATE;
/**
* @var string|null the date format that the value being validated should follow.
* This can be a date time pattern as described in the [ICU manual](https://unicode-org.github.io/icu/userguide/format_parse/datetime/#datetime-format-syntax).
*
* Alternatively this can be a string prefixed with `php:` representing a format that can be recognized by the PHP Datetime class.
* Please refer to <https://www.php.net/manual/en/datetime.createfromformat.php> on supported formats.
*
* If this property is not set, the default value will be obtained from `Yii::$app->formatter->dateFormat`, see [[\yii\i18n\Formatter::dateFormat]] for details.
* Since version 2.0.8 the default value will be determined from different formats of the formatter class,
* dependent on the value of [[type]]:
*
* - if type is [[TYPE_DATE]], the default value will be taken from [[\yii\i18n\Formatter::dateFormat]],
* - if type is [[TYPE_DATETIME]], it will be taken from [[\yii\i18n\Formatter::datetimeFormat]],
* - and if type is [[TYPE_TIME]], it will be [[\yii\i18n\Formatter::timeFormat]].
*
* Here are some example values:
*
* ```php
* 'MM/dd/yyyy' // date in ICU format
* 'php:m/d/Y' // the same date in PHP format
* 'MM/dd/yyyy HH:mm' // not only dates but also times can be validated
* ```
*
* **Note:** the underlying date parsers being used vary dependent on the format. If you use the ICU format and
* the [PHP intl extension](https://www.php.net/manual/en/book.intl.php) is installed, the [IntlDateFormatter](https://www.php.net/manual/en/intldateformatter.parse.php)
* is used to parse the input value. In all other cases the PHP [DateTime](https://www.php.net/manual/en/datetime.createfromformat.php) class
* is used. The IntlDateFormatter has the advantage that it can parse international dates like `12. Mai 2015` or `12 мая 2014`, while the
* PHP parser is limited to English only. The PHP parser however is more strict about the input format as it will not accept
* `12.05.05` for the format `php:d.m.Y`, but the IntlDateFormatter will accept it for the format `dd.MM.yyyy`.
* If you need to use the IntlDateFormatter you can avoid this problem by specifying a [[min|minimum date]].
*/
public $format;
/**
* @var string|null the locale ID that is used to localize the date parsing.
* This is only effective when the [PHP intl extension](https://www.php.net/manual/en/book.intl.php) is installed.
* If not set, the locale of the [[\yii\base\Application::formatter|formatter]] will be used.
* See also [[\yii\i18n\Formatter::locale]].
*/
public $locale;
/**
* @var string|null the timezone to use for parsing date and time values.
* This can be any value that may be passed to [date_default_timezone_set()](https://www.php.net/manual/en/function.date-default-timezone-set.php)
* e.g. `UTC`, `Europe/Berlin` or `America/Chicago`.
* Refer to the [php manual](https://www.php.net/manual/en/timezones.php) for available timezones.
* If this property is not set, [[\yii\base\Application::timeZone]] will be used.
*/
public $timeZone;
/**
* @var string|null the name of the attribute to receive the parsing result.
* When this property is not null and the validation is successful, the named attribute will
* receive the parsing result.
*
* This can be the same attribute as the one being validated. If this is the case,
* the original value will be overwritten with the timestamp value after successful validation.
*
* Note, that when using this property, the input value will be converted to a unix timestamp, which by definition
* is in [[$defaultTimeZone|default UTC time zone]], so a conversion from the [[$timeZone|input time zone]] to
* the default one will be performed. If you want to change the default time zone, set the [[$defaultTimeZone]] property.
* When defining [[$timestampAttributeFormat]] you can further control the conversion by setting
* [[$timestampAttributeTimeZone]] to a different value than `'UTC'`.
*
* @see timestampAttributeFormat
* @see timestampAttributeTimeZone
*/
public $timestampAttribute;
/**
* @var string|null the format to use when populating the [[timestampAttribute]].
* The format can be specified in the same way as for [[format]].
*
* If not set, [[timestampAttribute]] will receive a UNIX timestamp.
* If [[timestampAttribute]] is not set, this property will be ignored.
* @see format
* @see timestampAttribute
* @since 2.0.4
*/
public $timestampAttributeFormat;
/**
* @var string the timezone to use when populating the [[timestampAttribute]] with [[timestampAttributeFormat]]. Defaults to `UTC`.
*
* This can be any value that may be passed to [date_default_timezone_set()](https://www.php.net/manual/en/function.date-default-timezone-set.php)
* e.g. `UTC`, `Europe/Berlin` or `America/Chicago`.
* Refer to the [php manual](https://www.php.net/manual/en/timezones.php) for available timezones.
*
* If [[timestampAttributeFormat]] is not set, this property will be ignored.
* @see timestampAttributeFormat
* @since 2.0.4
*/
public $timestampAttributeTimeZone = 'UTC';
/**
* @var int|string|null upper limit of the date. Defaults to null, meaning no upper limit.
* This can be a unix timestamp or a string representing a date time value.
* If this property is a string, [[format]] will be used to parse it.
* @see tooBig for the customized message used when the date is too big.
* @since 2.0.4
*/
public $max;
/**
* @var int|string|null lower limit of the date. Defaults to null, meaning no lower limit.
* This can be a unix timestamp or a string representing a date time value.
* If this property is a string, [[format]] will be used to parse it.
* @see tooSmall for the customized message used when the date is too small.
* @since 2.0.4
*/
public $min;
/**
* @var string user-defined error message used when the value is bigger than [[max]].
* @since 2.0.4
*/
public $tooBig;
/**
* @var string user-defined error message used when the value is smaller than [[min]].
* @since 2.0.4
*/
public $tooSmall;
/**
* @var string|null user friendly value of upper limit to display in the error message.
* If this property is null, the value of [[max]] will be used (before parsing).
* @since 2.0.4
*/
public $maxString;
/**
* @var string|null user friendly value of lower limit to display in the error message.
* If this property is null, the value of [[min]] will be used (before parsing).
* @since 2.0.4
*/
public $minString;
/**
* @var bool set this parameter to true if you need strict date format validation (e.g. only such dates pass
* validation for the following format 'yyyy-MM-dd': '0011-03-25', '2019-04-30' etc. and not '18-05-15',
* '2017-Mar-14' etc. which pass validation if this parameter is set to false)
* @since 2.0.22
*/
public $strictDateFormat = false;
/**
* @var string the default timezone used for parsing when no time parts are provided in the format.
* See [[timestampAttributeTimeZone]] for more description.
* @since 2.0.39
*/
public $defaultTimeZone = 'UTC';
/**
* @var array map of short format names to IntlDateFormatter constant values.
*/
private $_dateFormats = [
'short' => 3, // IntlDateFormatter::SHORT,
'medium' => 2, // IntlDateFormatter::MEDIUM,
'long' => 1, // IntlDateFormatter::LONG,
'full' => 0, // IntlDateFormatter::FULL,
];
/**
* {@inheritdoc}
*/
public function init()
{
parent::init();
if ($this->message === null) {
$this->message = Yii::t('yii', 'The format of {attribute} is invalid.');
}
if ($this->format === null) {
if ($this->type === self::TYPE_DATE) {
$this->format = Yii::$app->formatter->dateFormat;
} elseif ($this->type === self::TYPE_DATETIME) {
$this->format = Yii::$app->formatter->datetimeFormat;
} elseif ($this->type === self::TYPE_TIME) {
$this->format = Yii::$app->formatter->timeFormat;
} else {
throw new InvalidConfigException('Unknown validation type set for DateValidator::$type: ' . $this->type);
}
}
if ($this->locale === null) {
$this->locale = Yii::$app->language;
}
if ($this->timeZone === null) {
$this->timeZone = Yii::$app->timeZone;
}
if ($this->min !== null && $this->tooSmall === null) {
$this->tooSmall = Yii::t('yii', '{attribute} must be no less than {min}.');
}
if ($this->max !== null && $this->tooBig === null) {
$this->tooBig = Yii::t('yii', '{attribute} must be no greater than {max}.');
}
if ($this->maxString === null) {
$this->maxString = (string)$this->max;
}
if ($this->minString === null) {
$this->minString = (string)$this->min;
}
if ($this->max !== null && is_string($this->max)) {
$timestamp = $this->parseDateValue($this->max);
if ($timestamp === false) {
throw new InvalidConfigException("Invalid max date value: {$this->max}");
}
$this->max = $timestamp;
}
if ($this->min !== null && is_string($this->min)) {
$timestamp = $this->parseDateValue($this->min);
if ($timestamp === false) {
throw new InvalidConfigException("Invalid min date value: {$this->min}");
}
$this->min = $timestamp;
}
}
/**
* {@inheritdoc}
*/
public function validateAttribute($model, $attribute)
{
$value = $model->$attribute;
if ($this->isEmpty($value)) {
if ($this->timestampAttribute !== null) {
$model->{$this->timestampAttribute} = null;
}
return;
}
$timestamp = $this->parseDateValue($value);
if ($timestamp === false) {
if ($this->timestampAttribute === $attribute) {
if ($this->timestampAttributeFormat === null) {
if (is_int($value)) {
return;
}
} elseif ($this->parseDateValueFormat($value, $this->timestampAttributeFormat) !== false) {
return;
}
}
$this->addError($model, $attribute, $this->message, []);
} elseif ($this->min !== null && $timestamp < $this->min) {
$this->addError($model, $attribute, $this->tooSmall, ['min' => $this->minString]);
} elseif ($this->max !== null && $timestamp > $this->max) {
$this->addError($model, $attribute, $this->tooBig, ['max' => $this->maxString]);
} elseif ($this->timestampAttribute !== null) {
if ($this->timestampAttributeFormat === null) {
$model->{$this->timestampAttribute} = $timestamp;
} else {
$model->{$this->timestampAttribute} = $this->formatTimestamp($timestamp, $this->timestampAttributeFormat);
}
}
}
/**
* {@inheritdoc}
*/
protected function validateValue($value)
{
$timestamp = $this->parseDateValue($value);
if ($timestamp === false) {
return [$this->message, []];
} elseif ($this->min !== null && $timestamp < $this->min) {
return [$this->tooSmall, ['min' => $this->minString]];
} elseif ($this->max !== null && $timestamp > $this->max) {
return [$this->tooBig, ['max' => $this->maxString]];
}
return null;
}
/**
* Parses date string into UNIX timestamp.
*
* @param mixed $value string representing date
* @return int|false a UNIX timestamp or `false` on failure.
*/
protected function parseDateValue($value)
{
// TODO consider merging these methods into single one at 2.1
return $this->parseDateValueFormat($value, $this->format);
}
/**
* Parses date string into UNIX timestamp.
*
* @param mixed $value string representing date
* @param string $format expected date format
* @return int|false a UNIX timestamp or `false` on failure.
* @throws InvalidConfigException
*/
private function parseDateValueFormat($value, $format)
{
if (is_array($value)) {
return false;
}
if (strncmp($format, 'php:', 4) === 0) {
$format = substr($format, 4);
} else {
if (extension_loaded('intl')) {
return $this->parseDateValueIntl($value, $format);
}
// fallback to PHP if intl is not installed
$format = FormatConverter::convertDateIcuToPhp($format, 'date');
}
return $this->parseDateValuePHP($value, $format);
}
/**
* Parses a date value using the IntlDateFormatter::parse().
* @param string $value string representing date
* @param string $format the expected date format
* @return int|bool a UNIX timestamp or `false` on failure.
* @throws InvalidConfigException
*/
private function parseDateValueIntl($value, $format)
{
$formatter = $this->getIntlDateFormatter($format);
// enable strict parsing to avoid getting invalid date values
$formatter->setLenient(false);
// There should not be a warning thrown by parse() but this seems to be the case on windows so we suppress it here
// See https://github.com/yiisoft/yii2/issues/5962 and https://bugs.php.net/bug.php?id=68528
$parsePos = 0;
$parsedDate = @$formatter->parse($value, $parsePos);
$valueLength = mb_strlen($value, Yii::$app ? Yii::$app->charset : 'UTF-8');
if ($parsedDate === false || $parsePos !== $valueLength || ($this->strictDateFormat && $formatter->format($parsedDate) !== $value)) {
return false;
}
return $parsedDate;
}
/**
* Creates IntlDateFormatter
*
* @param $format string date format
* @return IntlDateFormatter
* @throws InvalidConfigException
*/
private function getIntlDateFormatter($format)
{
if (!isset($this->_dateFormats[$format])) {
// if no time was provided in the format string set timezone to default one to match yii\i18n\Formatter::formatDateTimeValue()
$timezone = strpbrk($format, 'ahHkKmsSA') !== false ? $this->timeZone : $this->defaultTimeZone;
return new IntlDateFormatter($this->locale, IntlDateFormatter::NONE, IntlDateFormatter::NONE, $timezone, null, $format);
}
if ($this->type === self::TYPE_DATE) {
$dateType = $this->_dateFormats[$format];
$timeType = IntlDateFormatter::NONE;
$timeZone = $this->defaultTimeZone;
} elseif ($this->type === self::TYPE_DATETIME) {
$dateType = $this->_dateFormats[$format];
$timeType = $this->_dateFormats[$format];
$timeZone = $this->timeZone;
} elseif ($this->type === self::TYPE_TIME) {
$dateType = IntlDateFormatter::NONE;
$timeType = $this->_dateFormats[$format];
$timeZone = $this->timeZone;
} else {
throw new InvalidConfigException('Unknown validation type set for DateValidator::$type: ' . $this->type);
}
return new IntlDateFormatter($this->locale, $dateType, $timeType, $timeZone);
}
/**
* Parses a date value using the DateTime::createFromFormat().
* @param string $value string representing date
* @param string $format the expected date format
* @return int|bool a UNIX timestamp or `false` on failure.
*/
private function parseDateValuePHP($value, $format)
{
$hasTimeInfo = strpbrk($format, 'HhGgisU') !== false;
// if no time was provided in the format string set timezone to default one to match yii\i18n\Formatter::formatDateTimeValue()
$timezone = $hasTimeInfo ? $this->timeZone : $this->defaultTimeZone;
$date = DateTime::createFromFormat($format, $value, new DateTimeZone($timezone));
$errors = DateTime::getLastErrors();
if ($date === false || ($errors !== false && ($errors['error_count'] || $errors['warning_count'])) || ($this->strictDateFormat && $date->format($format) !== $value)) {
return false;
}
if (!$hasTimeInfo) {
// if no time was provided in the format string set time to 0 to get a simple date timestamp
$date->setTime(0, 0, 0);
}
return $date->getTimestamp();
}
/**
* Formats a timestamp using the specified format.
* @param int $timestamp
* @param string $format
* @return string
* @throws Exception
*/
private function formatTimestamp($timestamp, $format)
{
if (strncmp($format, 'php:', 4) === 0) {
$format = substr($format, 4);
} else {
$format = FormatConverter::convertDateIcuToPhp($format, 'date');
}
$date = new DateTime();
$date->setTimestamp($timestamp);
$date->setTimezone(new DateTimeZone($this->timestampAttributeTimeZone));
return $date->format($format);
}
}

6
protected/humhub/config/common.php
View File

@ -269,6 +269,12 @@ $config = [
'enablePjax' => true,
'dailyCronExecutionTime' => '18:00',
],
'container' => [
'definitions' => [
//todo: Remove after Yii 2.0.48 release
\yii\validators\DateValidator::class => humhub\components\validators\DateValidator::class,
]
]
];
return $config;

2
protected/humhub/modules/installer/controllers/IndexController.php
View File

@ -41,7 +41,7 @@ class IndexController extends Controller
public function actionGo()
{
if ($this->module->checkDBConnection()) {
return $this->redirect(['setup/init']);
return $this->redirect(['setup/finalize']);
} else {
return $this->redirect(['setup/prerequisites']);
}

71
protected/humhub/modules/installer/controllers/SetupController.php
View File

@ -8,30 +8,28 @@
namespace humhub\modules\installer\controllers;
use humhub\commands\MigrateController;
use humhub\components\access\ControllerAccess;
use humhub\components\Controller;
use humhub\libs\DynamicConfig;
use humhub\modules\admin\widgets\PrerequisitesList;
use humhub\modules\installer\forms\CronForm;
use humhub\modules\installer\forms\DatabaseForm;
use humhub\modules\installer\Module;
use Yii;
/**
* SetupController checks prerequisites and is responsible for database
* connection and schema setup.
* SetupController checks prerequisites and is responsible for database connection and schema setup.
*
* @property Module $module
* @since 0.5
*/
class SetupController extends Controller
{
/**
* Allow guest access independently from guest mode setting.
*
* @var string
* @inheritdoc
*/
public $access = ControllerAccess::class;
const PASSWORD_PLACEHOLDER = 'n0thingToSeeHere!';
public function actionIndex()
@ -120,7 +118,8 @@ class SetupController extends Controller
DynamicConfig::save($config);
return $this->redirect(['init']);
return $this->redirect(['migrate']);
} catch (\Exception $e) {
$errorMessage = $e->getMessage();
}
@ -130,32 +129,18 @@ class SetupController extends Controller
return $this->render('database', ['model' => $model, 'errorMessage' => $errorMessage]);
}
/**
* The init action imports the database structure & initial data
*/
public function actionInit()
{
public function actionMigrate()
{
if (!$this->module->checkDBConnection()) {
return $this->redirect(['/installer/setup/database']);
return $this->redirect(['/installer/setup/database', 'dbFailed' => 1]);
}
// Flush Caches
Yii::$app->cache->flush();
// Disable max execution time to avoid timeouts during database installation
@ini_set('max_execution_time', 0);
// Migrate Up Database
\humhub\commands\MigrateController::webMigrateAll();
DynamicConfig::rewrite();
$this->module->setDatabaseInstalled();
return $this->redirect(['/installer/setup/cron']);
$this->initDatabase();
return $this->redirect(['cron']);
}
/**
* Crontab
*/
@ -171,4 +156,34 @@ class SetupController extends Controller
{
return $this->render('pretty-urls');
}
public function actionFinalize()
{
if (!$this->module->checkDBConnection()) {
return $this->redirect(['/installer/setup/database', 'dbFailed' => 1]);
}
// Start the migration a second time here to retry any migrations aborted by timeouts.
// In addition, in SaaS hosting, no setup step is required and only this action is executed directly.
$this->initDatabase();
return $this->redirect(['/installer/config']);
}
private function initDatabase()
{
// Flush Caches
Yii::$app->cache->flush();
// Disable max execution time to avoid timeouts during database installation
@ini_set('max_execution_time', 0);
// Migrate Up Database
MigrateController::webMigrateAll();
DynamicConfig::rewrite();
$this->module->setDatabaseInstalled();
}
}

2
protected/humhub/modules/installer/views/setup/cron.php
View File

@ -37,7 +37,7 @@ use yii\bootstrap\Html;
<p><?= Yii::t('InstallerModule.base', 'This topic is covered in more detail in our <a href="{link}" target="_blank">documentation</a>. If you have trouble setting up the job scheduling described in the documentation, please contact your server administrator for support.', ['link' => 'https://docs.humhub.org/docs/admin/cron-jobs']); ?></p>
<hr>
<?= Html::a(Yii::t('base', 'Next'), ['/installer/setup/pretty-urls'], ['class' => 'btn btn-primary']) ?>
<?= Html::a(Yii::t('base', 'Next'), ['pretty-urls'], ['class' => 'btn btn-primary']) ?>
</div>
</div>

2
protected/humhub/modules/installer/views/setup/pretty-urls.php
View File

@ -34,7 +34,7 @@ use yii\helpers\Url;
<p><?= Yii::t('InstallerModule.base', 'Our documentation provides a more detailed look into <a href="{link}" target="_blank">Pretty URLs</a>.', ['link' => 'https://docs.humhub.org/docs/admin/installation/#pretty-urls']); ?></p>
<hr>
<?= Html::a(Yii::t('base', 'Next'), Url::to(['/installer/config/index']), ['class' => 'btn btn-primary']) ?>
<?= Html::a(Yii::t('base', 'Next'), ['finalize'], ['class' => 'btn btn-primary']) ?>
</div>
</div>

2
protected/humhub/modules/ldap/authclient/LdapAuth.php
View File

@ -581,7 +581,7 @@ class LdapAuth extends BaseFormAuth implements AutoSyncUsers, SyncAttributes, Ap
}
/**
* @inheridoc
* @inheritdoc
*/
public function beforeSerialize(): void
{

2
protected/humhub/modules/tour/Module.php
View File

@ -20,7 +20,7 @@ class Module extends \humhub\components\Module
public $acceptableNames = ['interface', 'administration', 'profile', 'spaces'];
/**
* @inheridoc
* @inheritdoc
*/
public $isCoreModule = true;

2
protected/humhub/modules/ui/filter/models/Filter.php
View File

@ -55,7 +55,7 @@ abstract class Filter extends Model
}
/**
* @inheridoc
* @inheritdoc
*/
public function load($data, $formName = null)
{