Le lien de réinitialisation du mot de passe n’est pas valide ou a expiré.
' : '
';
if(isset($details['fields'])) foreach($details['fields'] as $fieldName => $fieldSpec) {
$fieldTitle = $fieldSpec['title'];
- $fieldType = ($fieldName == 'password') ? 'password' : 'text';
- // values
- $defaultValue = (isset($fieldSpec['default'])) ? $fieldSpec['default'] : null;
- if($usingEnv && isset($fieldSpec['envVar']) && $envVar = getenv($fieldSpec['envVar'])) {
- $value = $envVar;
- } else {
- $value = (isset($databaseConfig[$fieldName]) && $databaseConfig['type'] == $class) ? $databaseConfig[$fieldName] : $defaultValue;
- }
+ $fieldType = ($fieldName === 'password') ? 'password' : 'text';
+ // Get display value
+ if (isset($databaseConfig[$fieldName]) && $databaseConfig['type'] == $class) {
+ $value = $databaseConfig[$fieldName];
+ } elseif (isset($fieldSpec['default'])) {
+ $value = $fieldSpec['default'];
+ } else {
+ $value = null;
+ }
// attributes
$attrs = array(
diff --git a/src/Dev/Install/install5.php b/src/Dev/Install/install5.php
index d238e9259..6bf86d49d 100755
--- a/src/Dev/Install/install5.php
+++ b/src/Dev/Install/install5.php
@@ -56,8 +56,8 @@ foreach ($databaseClasses as $class => $details) {
// Build config from config / environment / request
$config = new InstallConfig();
-$databaseConfig = $config->getDatabaseConfig($_REQUEST, $databaseClasses);
-$adminConfig = $config->getAdminConfig($_REQUEST);
+$databaseConfig = $config->getDatabaseConfig($_REQUEST, $databaseClasses, true);
+$adminConfig = $config->getAdminConfig($_REQUEST, true);
$alreadyInstalled = $config->alreadyInstalled();
$silverstripe_version = $config->getFrameworkVersion();
$sendStats = $config->canSendStats($_REQUEST);
@@ -107,22 +107,6 @@ if ($installFromCli && ($req->hasErrors() || $dbReq->hasErrors())) {
// Path to client resources (copied through silverstripe/vendor-plugin)
$clientPath = 'resources/silverstripe/framework/src/Dev/Install/client';
-
-// config-form.html vars (placeholder to prevent deletion)
-[
- $theme,
- $clientPath,
- $adminConfig,
- $usingEnv,
- $silverstripe_version,
- $locale,
- $locales,
- $webserverConfigFile,
- $hasErrorOtherThanDatabase,
- $hasOnlyWarnings, // If warnings but not errors
- $phpIniLocation
-];
-
// If already installed, ensure the user clicked "reinstall"
$expectedArg = $alreadyInstalled ? 'reinstall' : 'go';
if ((isset($_REQUEST[$expectedArg]) || $installFromCli)
@@ -142,7 +126,27 @@ if ((isset($_REQUEST[$expectedArg]) || $installFromCli)
'admin' => $adminConfig,
'stats' => $sendStats,
]);
- // Show the config form
-} else {
- include(__DIR__ . '/config-form.html');
+ return;
}
+
+// Sanitise config prior to rendering config-form.html
+$databaseConfig = $config->getDatabaseConfig($_REQUEST, $databaseClasses, false);
+$adminConfig = $config->getAdminConfig($_REQUEST, false);
+
+// config-form.html vars (placeholder to prevent deletion)
+[
+ $theme,
+ $clientPath,
+ $adminConfig,
+ $databaseConfig,
+ $usingEnv,
+ $silverstripe_version,
+ $locale,
+ $locales,
+ $webserverConfigFile,
+ $hasErrorOtherThanDatabase,
+ $hasOnlyWarnings, // If warnings but not errors
+ $phpIniLocation,
+];
+
+include(__DIR__ . '/config-form.html');
diff --git a/src/Forms/GridField/GridFieldExportButton.php b/src/Forms/GridField/GridFieldExportButton.php
index 5254070e3..c9d65e036 100644
--- a/src/Forms/GridField/GridFieldExportButton.php
+++ b/src/Forms/GridField/GridFieldExportButton.php
@@ -4,6 +4,7 @@ namespace SilverStripe\Forms\GridField;
use SilverStripe\Control\HTTPRequest;
use SilverStripe\Control\HTTPResponse;
+use SilverStripe\Core\Config\Config;
use SilverStripe\ORM\DataObject;
/**
@@ -11,7 +12,6 @@ use SilverStripe\ORM\DataObject;
*/
class GridFieldExportButton implements GridField_HTMLProvider, GridField_ActionProvider, GridField_URLHandler
{
-
/**
* @var array Map of a property name on the exported objects, with values being the column title in the CSV file.
* Note that titles are only used when {@link $csvHasHeader} is set to TRUE.
@@ -38,6 +38,15 @@ class GridFieldExportButton implements GridField_HTMLProvider, GridField_ActionP
*/
protected $targetFragment;
+ /**
+ * Set to true to disable XLS sanitisation
+ * [SS-2017-007] Ensure all cells with leading [@=+] have a leading tab
+ *
+ * @config
+ * @var bool
+ */
+ private static $xls_export_disabled = false;
+
/**
* @param string $targetFragment The HTML fragment to write the button into
* @param array $exportColumns The columns to include in the export
@@ -170,7 +179,7 @@ class GridFieldExportButton implements GridField_HTMLProvider, GridField_ActionP
}
//Remove GridFieldPaginator as we're going to export the entire list.
- $gridField->getConfig()->removeComponentsByType('SilverStripe\\Forms\\GridField\\GridFieldPaginator');
+ $gridField->getConfig()->removeComponentsByType(GridFieldPaginator::class);
$items = $gridField->getManipulatedList();
@@ -203,6 +212,12 @@ class GridFieldExportButton implements GridField_HTMLProvider, GridField_ActionP
}
}
+ // [SS-2017-007] Sanitise XLS executable column values with a leading tab
+ if (!Config::inst()->get(get_class($this), 'xls_export_disabled')
+ && preg_match('/^[-@=+].*/', $value)
+ ) {
+ $value = "\t" . $value;
+ }
$columnData[] = $value;
}
diff --git a/src/Forms/HTMLEditor/TinyMCEConfig.php b/src/Forms/HTMLEditor/TinyMCEConfig.php
index a2f90546c..1c06c8a09 100644
--- a/src/Forms/HTMLEditor/TinyMCEConfig.php
+++ b/src/Forms/HTMLEditor/TinyMCEConfig.php
@@ -34,7 +34,7 @@ class TinyMCEConfig extends HTMLEditorConfig
'cy_GB' => 'cy',
'da_DK' => 'da',
'da_GL' => 'da',
- 'de_AT' => 'de',
+ 'de_AT' => 'de_AT',
'de_BE' => 'de',
'de_CH' => 'de',
'de_DE' => 'de',
@@ -56,7 +56,7 @@ class TinyMCEConfig extends HTMLEditorConfig
'es_GQ' => 'es',
'es_GT' => 'es',
'es_HN' => 'es',
- 'es_MX' => 'es',
+ 'es_MX' => 'es_MX',
'es_NI' => 'es',
'es_PA' => 'es',
'es_PE' => 'es',
@@ -69,11 +69,9 @@ class TinyMCEConfig extends HTMLEditorConfig
'es_AD' => 'es',
'es_BZ' => 'es',
'es_US' => 'es',
- 'fa_AF' => 'fa',
- 'fa_IR' => 'fa',
- 'fa_PK' => 'fa',
- 'fi_FI' => 'fi',
- 'fi_SE' => 'fi',
+ 'fa_AF' => 'fa_IR',
+ 'fa_IR' => 'fa_IR',
+ 'fa_PK' => 'fa_IR',
'fr_BE' => 'fr_FR',
'fr_BF' => 'fr_FR',
'fr_BI' => 'fr_FR',
@@ -117,12 +115,11 @@ class TinyMCEConfig extends HTMLEditorConfig
'fr_YT' => 'fr_FR',
'fr_GB' => 'fr_FR',
'fr_US' => 'fr_FR',
- 'he_IL' => 'he',
- 'hu_HU' => 'hu',
- 'hu_AT' => 'hu',
- 'hu_RO' => 'hu',
- 'hu_RS' => 'hu',
- 'is_IS' => 'is',
+ 'he_IL' => 'he_IL',
+ 'hu_HU' => 'hu_HU',
+ 'hu_AT' => 'hu_HU',
+ 'hu_RO' => 'hu_HU',
+ 'hu_RS' => 'hu_HU',
'it_CH' => 'it',
'it_IT' => 'it',
'it_SM' => 'it',
@@ -131,28 +128,26 @@ class TinyMCEConfig extends HTMLEditorConfig
'it_US' => 'it',
'it_VA' => 'it',
'ja_JP' => 'ja',
- 'ko_KP' => 'ko',
- 'ko_KR' => 'ko',
- 'ko_CN' => 'ko',
- 'mi_NZ' => 'mi_NZ',
- 'nb_NO' => 'nb',
- 'nb_SJ' => 'nb',
+ 'ko_KP' => 'ko_KR',
+ 'ko_KR' => 'ko_KR',
+ 'ko_CN' => 'ko_KR',
+ 'nb_NO' => 'nb_NO',
+ 'nb_SJ' => 'nb_NO',
'nl_AN' => 'nl',
'nl_AW' => 'nl',
'nl_BE' => 'nl',
'nl_NL' => 'nl',
'nl_SR' => 'nl',
- 'nn_NO' => 'nn',
'pl_PL' => 'pl',
'pl_UA' => 'pl',
- 'pt_AO' => 'pt',
- 'pt_BR' => 'pt',
- 'pt_CV' => 'pt',
- 'pt_GW' => 'pt',
- 'pt_MZ' => 'pt',
- 'pt_PT' => 'pt',
- 'pt_ST' => 'pt',
- 'pt_TL' => 'pt',
+ 'pt_AO' => 'pt_PT',
+ 'pt_BR' => 'pt_BR',
+ 'pt_CV' => 'pt_PT',
+ 'pt_GW' => 'pt_PT',
+ 'pt_MZ' => 'pt_PT',
+ 'pt_PT' => 'pt_PT',
+ 'pt_ST' => 'pt_PT',
+ 'pt_TL' => 'pt_PT',
'ro_MD' => 'ro',
'ro_RO' => 'ro',
'ro_RS' => 'ro',
@@ -162,31 +157,26 @@ class TinyMCEConfig extends HTMLEditorConfig
'ru_RU' => 'ru',
'ru_SJ' => 'ru',
'ru_UA' => 'ru',
- 'si_LK' => 'si',
'sk_SK' => 'sk',
'sk_RS' => 'sk',
- 'sq_AL' => 'sq',
- 'sr_BA' => 'sr',
- 'sr_ME' => 'sr',
- 'sr_RS' => 'sr',
- 'sv_FI' => 'sv',
- 'sv_SE' => 'sv',
+ 'sv_FI' => 'sv_SE',
+ 'sv_SE' => 'sv_SE',
'tr_CY' => 'tr',
- 'tr_TR' => 'tr',
+ 'tr_TR' => 'tr_TR',
'tr_DE' => 'tr',
'tr_MK' => 'tr',
- 'uk_UA' => 'uk',
- 'vi_VN' => 'vi',
- 'vi_US' => 'vi',
- 'zh_CN' => 'zh-cn',
- 'zh_HK' => 'zh-cn',
- 'zh_MO' => 'zh-cn',
- 'zh_SG' => 'zh-cn',
- 'zh_TW' => 'zh-tw',
- 'zh_ID' => 'zh-cn',
- 'zh_MY' => 'zh-cn',
- 'zh_TH' => 'zh-cn',
- 'zh_US' => 'zn-cn',
+ 'uk_UA' => 'uk_UA',
+ 'vi_VN' => 'vi_VN',
+ 'vi_US' => 'vi_VN',
+ 'zh_CN' => 'zh_CN',
+ 'zh_HK' => 'zh_CN',
+ 'zh_MO' => 'zh_CN',
+ 'zh_SG' => 'zh_CN',
+ 'zh_TW' => 'zh_TW',
+ 'zh_ID' => 'zh_CN',
+ 'zh_MY' => 'zh_CN',
+ 'zh_TH' => 'zh_CN',
+ 'zh_US' => 'zh_CN',
];
/**
diff --git a/src/ORM/Connect/MySQLDatabase.php b/src/ORM/Connect/MySQLDatabase.php
index ad9730709..051ab965f 100644
--- a/src/ORM/Connect/MySQLDatabase.php
+++ b/src/ORM/Connect/MySQLDatabase.php
@@ -2,6 +2,8 @@
namespace SilverStripe\ORM\Connect;
+use SilverStripe\Assets\File;
+use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\Core\Config\Configurable;
use SilverStripe\Core\Convert;
use SilverStripe\ORM\PaginatedList;
@@ -144,7 +146,7 @@ class MySQLDatabase extends Database
* @param bool $booleanSearch
* @param string $alternativeFileFilter
* @param bool $invertedMatch
- * @return \SilverStripe\ORM\PaginatedList
+ * @return PaginatedList
* @throws Exception
*/
public function searchEngine(
@@ -158,10 +160,8 @@ class MySQLDatabase extends Database
$alternativeFileFilter = "",
$invertedMatch = false
) {
- $pageClass = 'SilverStripe\\CMS\\Model\\SiteTree';
- $fileClass = 'SilverStripe\\Assets\\File';
- $pageTable = DataObject::getSchema()->tableName($pageClass);
- $fileTable = DataObject::getSchema()->tableName($fileClass);
+ $pageClass = SiteTree::class;
+ $fileClass = File::class;
if (!class_exists($pageClass)) {
throw new Exception('MySQLDatabase->searchEngine() requires "SiteTree" class');
}
@@ -194,12 +194,13 @@ class MySQLDatabase extends Database
// File.ShowInSearch was added later, keep the database driver backwards compatible
// by checking for its existence first
+ $fileTable = DataObject::getSchema()->tableName($fileClass);
$fields = $this->getSchemaManager()->fieldList($fileTable);
if (array_key_exists('ShowInSearch', $fields)) {
$extraFilters[$fileClass] .= " AND ShowInSearch <> 0";
}
- $limit = $start . ", " . (int) $pageLength;
+ $limit = (int)$start . ", " . (int)$pageLength;
$notMatch = $invertedMatch
? "NOT "
@@ -257,7 +258,6 @@ class MySQLDatabase extends Database
$queryParameters = array();
$totalCount = 0;
foreach ($lists as $class => $list) {
- $table = DataObject::getSchema()->tableName($class);
/** @var SQLSelect $query */
$query = $list->dataQuery()->query();
diff --git a/src/ORM/DataObject.php b/src/ORM/DataObject.php
index e44328871..2a2cb4092 100644
--- a/src/ORM/DataObject.php
+++ b/src/ORM/DataObject.php
@@ -2,35 +2,36 @@
namespace SilverStripe\ORM;
+use BadMethodCallException;
+use Exception;
+use InvalidArgumentException;
+use LogicException;
+use SilverStripe\Control\HTTP;
use SilverStripe\Core\ClassInfo;
use SilverStripe\Core\Config\Config;
use SilverStripe\Core\Injector\Injector;
use SilverStripe\Core\Resettable;
-use SilverStripe\Dev\Deprecation;
use SilverStripe\Dev\Debug;
-use SilverStripe\Control\HTTP;
+use SilverStripe\Dev\Deprecation;
use SilverStripe\Forms\FieldList;
use SilverStripe\Forms\FormField;
use SilverStripe\Forms\FormScaffolder;
use SilverStripe\i18n\i18n;
use SilverStripe\i18n\i18nEntityProvider;
use SilverStripe\ORM\Connect\MySQLSchemaManager;
-use SilverStripe\ORM\Filters\SearchFilter;
-use SilverStripe\ORM\Search\SearchContext;
-use SilverStripe\ORM\Queries\SQLInsert;
-use SilverStripe\ORM\Queries\SQLDelete;
-use SilverStripe\ORM\FieldType\DBField;
-use SilverStripe\ORM\FieldType\DBDatetime;
-use SilverStripe\ORM\FieldType\DBComposite;
use SilverStripe\ORM\FieldType\DBClassName;
+use SilverStripe\ORM\FieldType\DBComposite;
+use SilverStripe\ORM\FieldType\DBDatetime;
+use SilverStripe\ORM\FieldType\DBField;
+use SilverStripe\ORM\Filters\SearchFilter;
+use SilverStripe\ORM\Queries\SQLDelete;
+use SilverStripe\ORM\Queries\SQLInsert;
+use SilverStripe\ORM\Search\SearchContext;
use SilverStripe\Security\Member;
use SilverStripe\Security\Permission;
use SilverStripe\Security\Security;
+use SilverStripe\View\SSViewer;
use SilverStripe\View\ViewableData;
-use LogicException;
-use InvalidArgumentException;
-use BadMethodCallException;
-use Exception;
use stdClass;
/**
@@ -2154,6 +2155,11 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
return $untabbedFields;
}
+ public function getViewerTemplates($suffix = '')
+ {
+ return SSViewer::get_templates_by_class(static::class, $suffix, $this->baseClass());
+ }
+
/**
* Gets the value of a field.
* Called by {@link __get()} and any getFieldName() methods you might create.
diff --git a/src/ORM/DataObjectSchema.php b/src/ORM/DataObjectSchema.php
index 34890d759..aa136cb65 100644
--- a/src/ORM/DataObjectSchema.php
+++ b/src/ORM/DataObjectSchema.php
@@ -138,11 +138,11 @@ class DataObjectSchema
*/
public function baseDataClass($class)
{
- $class = ClassInfo::class_name($class);
$current = $class;
while ($next = get_parent_class($current)) {
if ($next === DataObject::class) {
- return $current;
+ // Only use ClassInfo::class_name() to format the class if we've not used get_parent_class()
+ return ($current === $class) ? ClassInfo::class_name($current) : $current;
}
$current = $next;
}
@@ -201,6 +201,11 @@ class DataObjectSchema
$db = [];
$classes = $uninherited ? [$class] : ClassInfo::ancestry($class);
foreach ($classes as $tableClass) {
+ // Skip irrelevant parent classes
+ if (!is_subclass_of($tableClass, DataObject::class)) {
+ continue;
+ }
+
// Find all fields on this class
$fields = $this->databaseFields($tableClass, false);
// Merge with composite fields
@@ -394,6 +399,10 @@ class DataObjectSchema
*/
public function classHasTable($class)
{
+ if (!is_subclass_of($class, DataObject::class)) {
+ return false;
+ }
+
$fields = $this->databaseFields($class, false);
return !empty($fields);
}
diff --git a/src/ORM/PaginatedList.php b/src/ORM/PaginatedList.php
index 7df431e5a..548861eae 100644
--- a/src/ORM/PaginatedList.php
+++ b/src/ORM/PaginatedList.php
@@ -87,7 +87,7 @@ class PaginatedList extends ListDecorator
*/
public function setPageLength($length)
{
- $this->pageLength = $length;
+ $this->pageLength = (int)$length;
return $this;
}
@@ -99,7 +99,7 @@ class PaginatedList extends ListDecorator
*/
public function setCurrentPage($page)
{
- $this->pageStart = ($page - 1) * $this->getPageLength();
+ $this->pageStart = ((int)$page - 1) * $this->getPageLength();
return $this;
}
@@ -134,7 +134,7 @@ class PaginatedList extends ListDecorator
*/
public function setPageStart($start)
{
- $this->pageStart = $start;
+ $this->pageStart = (int)$start;
return $this;
}
@@ -161,7 +161,7 @@ class PaginatedList extends ListDecorator
*/
public function setTotalItems($items)
{
- $this->totalItems = $items;
+ $this->totalItems = (int)$items;
return $this;
}
diff --git a/src/Security/LoginAttempt.php b/src/Security/LoginAttempt.php
index 8117359cb..f3e631792 100644
--- a/src/Security/LoginAttempt.php
+++ b/src/Security/LoginAttempt.php
@@ -2,6 +2,7 @@
namespace SilverStripe\Security;
+use SilverStripe\ORM\DataList;
use SilverStripe\ORM\DataObject;
/**
@@ -14,11 +15,11 @@ use SilverStripe\ORM\DataObject;
* complies with your privacy standards. We're logging
* username and IP.
*
- * @property string Email Email address used for login attempt
- * @property string Status Status of the login attempt, either 'Success' or 'Failure'
- * @property string IP IP address of user attempting to login
- *
- * @property int MemberID ID of the Member, only if Member with Email exists
+ * @property string $Email Email address used for login attempt. @deprecated 3.0...5.0
+ * @property string $EmailHashed sha1 hashed Email address used for login attempt
+ * @property string $Status Status of the login attempt, either 'Success' or 'Failure'
+ * @property string $IP IP address of user attempting to login
+ * @property int $MemberID ID of the Member, only if Member with Email exists
*
* @method Member Member() Member object of the user trying to log in, only if Member with Email exists
*/
@@ -35,7 +36,8 @@ class LoginAttempt extends DataObject
const FAILURE = 'Failure';
private static $db = array(
- 'Email' => 'Varchar(255)',
+ 'Email' => 'Varchar(255)', // Remove in 5.0
+ 'EmailHashed' => 'Varchar(255)',
'Status' => "Enum('Success,Failure')",
'IP' => 'Varchar(255)',
);
@@ -55,9 +57,37 @@ class LoginAttempt extends DataObject
{
$labels = parent::fieldLabels($includerelations);
$labels['Email'] = _t(__CLASS__.'.Email', 'Email Address');
+ $labels['EmailHashed'] = _t(__CLASS__.'.EmailHashed', 'Email Address (hashed)');
$labels['Status'] = _t(__CLASS__.'.Status', 'Status');
$labels['IP'] = _t(__CLASS__.'.IP', 'IP Address');
return $labels;
}
+
+ /**
+ * Set email used for this attempt
+ *
+ * @param string $email
+ * @return $this
+ */
+ public function setEmail($email)
+ {
+ // Store hashed email only
+ $this->EmailHashed = sha1($email);
+ return $this;
+ }
+
+ /**
+ * Get all login attempts for the given email address
+ *
+ * @param string $email
+ * @return DataList|LoginAttempt[]
+ */
+ public static function getByEmail($email)
+ {
+ return static::get()->filterAny(array(
+ 'Email' => $email,
+ 'EmailHashed' => sha1($email),
+ ));
+ }
}
diff --git a/src/Security/Member.php b/src/Security/Member.php
index a861b7ba4..34adbb98e 100644
--- a/src/Security/Member.php
+++ b/src/Security/Member.php
@@ -384,8 +384,7 @@ class Member extends DataObject
}
$idField = static::config()->get('unique_identifier_field');
- $attempts = LoginAttempt::get()
- ->filter('Email', $this->{$idField})
+ $attempts = LoginAttempt::getByEmail($this->{$idField})
->sort('Created', 'DESC')
->limit($maxAttempts);
diff --git a/src/View/ViewableData.php b/src/View/ViewableData.php
index 79d3a239f..317cb51db 100644
--- a/src/View/ViewableData.php
+++ b/src/View/ViewableData.php
@@ -2,25 +2,26 @@
namespace SilverStripe\View;
+use ArrayIterator;
use Exception;
+use InvalidArgumentException;
+use IteratorAggregate;
+use LogicException;
+use SilverStripe\Core\ClassInfo;
use SilverStripe\Core\Config\Config;
use SilverStripe\Core\Config\Configurable;
+use SilverStripe\Core\Convert;
use SilverStripe\Core\Extensible;
use SilverStripe\Core\Injector\Injectable;
+use SilverStripe\Core\Injector\Injector;
use SilverStripe\Core\Manifest\ModuleResourceLoader;
+use SilverStripe\Dev\Debug;
use SilverStripe\Dev\Deprecation;
use SilverStripe\ORM\ArrayLib;
use SilverStripe\ORM\FieldType\DBField;
use SilverStripe\ORM\FieldType\DBHTMLText;
-use SilverStripe\Core\ClassInfo;
-use SilverStripe\Core\Convert;
-use SilverStripe\Core\Injector\Injector;
-use SilverStripe\Dev\Debug;
-use IteratorAggregate;
-use LogicException;
-use InvalidArgumentException;
+use SilverStripe\View\SSViewer;
use UnexpectedValueException;
-use ArrayIterator;
/**
* A ViewableData object is any object that can be rendered into a template/view.
@@ -578,6 +579,17 @@ class ViewableData implements IteratorAggregate
// UTILITY METHODS -------------------------------------------------------------------------------------------------
+ /**
+ * Find appropriate templates for SSViewer to use to render this object
+ *
+ * @param string $suffix
+ * @return array
+ */
+ public function getViewerTemplates($suffix = '')
+ {
+ return SSViewer::get_templates_by_class(static::class, $suffix, self::class);
+ }
+
/**
* When rendering some objects it is necessary to iterate over the object being rendered, to do this, you need
* access to itself.
diff --git a/tests/php/Dev/CSVParserTest.php b/tests/php/Dev/CSVParserTest.php
index 0e06b0363..6d596ae0d 100644
--- a/tests/php/Dev/CSVParserTest.php
+++ b/tests/php/Dev/CSVParserTest.php
@@ -29,31 +29,44 @@ class CSVParserTest extends SapphireTest
$firstNames = $birthdays = $biographies = $registered = array();
foreach ($csv as $record) {
/* Each row in the CSV file will be keyed with the header row */
- $this->assertEquals(array('FirstName','Biography','Birthday','IsRegistered'), array_keys($record));
+ $this->assertEquals(
+ ['FirstName','Biography','Birthday','IsRegistered'],
+ array_keys($record)
+ );
$firstNames[] = $record['FirstName'];
$biographies[] = $record['Biography'];
$birthdays[] = $record['Birthday'];
$registered[] = $record['IsRegistered'];
}
- $this->assertEquals(array('John','Jane','Jamie','Järg'), $firstNames);
+ $this->assertEquals(
+ ['John','Jane','Jamie','Järg','Jacob'],
+ $firstNames
+ );
$this->assertEquals(
- array(
- "He's a good guy",
- "She is awesome." . PHP_EOL
- . "So awesome that she gets multiple rows and \"escaped\" strings in her biography",
- "Pretty old, with an escaped comma",
- "Unicode FTW"),
+ [
+ "He's a good guy",
+ "She is awesome."
+ . PHP_EOL
+ . "So awesome that she gets multiple rows and \"escaped\" strings in her biography",
+ "Pretty old, with an escaped comma",
+ "Unicode FTW",
+ "Likes leading tabs in his biography",
+ ],
$biographies
);
$this->assertEquals([
"1988-01-31",
"1982-01-31",
"1882-01-31",
- "1982-06-30"
+ "1982-06-30",
+ "2000-04-30",
], $birthdays);
- $this->assertEquals(array('1', '0', '1', '1'), $registered);
+ $this->assertEquals(
+ ['1', '0', '1', '1', '0'],
+ $registered
+ );
}
public function testParsingWithHeadersAndColumnMap()
@@ -62,41 +75,43 @@ class CSVParserTest extends SapphireTest
$csv = new CSVParser($this->csvPath . 'PlayersWithHeader.csv');
/* We can set up column remapping. The keys are case-insensitive. */
- $csv->mapColumns(
- array(
+ $csv->mapColumns([
'FirstName' => '__fn',
'bIoGrApHy' => '__BG',
- )
- );
+ ]);
$firstNames = $birthdays = $biographies = $registered = array();
foreach ($csv as $record) {
/* Each row in the CSV file will be keyed with the renamed columns. Any unmapped column names will be
* left as-is. */
- $this->assertEquals(array('__fn','__BG','Birthday','IsRegistered'), array_keys($record));
+ $this->assertEquals(['__fn','__BG','Birthday','IsRegistered'], array_keys($record));
$firstNames[] = $record['__fn'];
$biographies[] = $record['__BG'];
$birthdays[] = $record['Birthday'];
$registered[] = $record['IsRegistered'];
}
- $this->assertEquals(array('John','Jane','Jamie','Järg'), $firstNames);
+ $this->assertEquals(['John','Jane','Jamie','Järg','Jacob'], $firstNames);
$this->assertEquals(
- array(
- "He's a good guy",
- "She is awesome."
- . PHP_EOL . "So awesome that she gets multiple rows and \"escaped\" strings in her biography",
- "Pretty old, with an escaped comma",
- "Unicode FTW"),
+ [
+ "He's a good guy",
+ "She is awesome."
+ . PHP_EOL
+ . "So awesome that she gets multiple rows and \"escaped\" strings in her biography",
+ "Pretty old, with an escaped comma",
+ "Unicode FTW",
+ "Likes leading tabs in his biography",
+ ],
$biographies
);
$this->assertEquals([
"1988-01-31",
"1982-01-31",
"1882-01-31",
- "1982-06-30"
+ "1982-06-30",
+ "2000-04-30",
], $birthdays);
- $this->assertEquals(array('1', '0', '1', '1'), $registered);
+ $this->assertEquals(array('1', '0', '1', '1', '0'), $registered);
}
public function testParsingWithExplicitHeaderRow()
@@ -117,15 +132,18 @@ class CSVParserTest extends SapphireTest
}
/* And the first row will be returned in the data */
- $this->assertEquals(array('FirstName','John','Jane','Jamie','Järg'), $firstNames);
+ $this->assertEquals(['FirstName','John','Jane','Jamie','Järg','Jacob'], $firstNames);
$this->assertEquals(
- array(
- 'Biography',
- "He's a good guy",
- "She is awesome." . PHP_EOL
- . "So awesome that she gets multiple rows and \"escaped\" strings in her biography",
- "Pretty old, with an escaped comma",
- "Unicode FTW"),
+ [
+ 'Biography',
+ "He's a good guy",
+ "She is awesome."
+ . PHP_EOL
+ . "So awesome that she gets multiple rows and \"escaped\" strings in her biography",
+ "Pretty old, with an escaped comma",
+ "Unicode FTW",
+ "Likes leading tabs in his biography"
+ ],
$biographies
);
$this->assertEquals([
@@ -133,8 +151,9 @@ class CSVParserTest extends SapphireTest
"1988-01-31",
"1982-01-31",
"1882-01-31",
- "1982-06-30"
+ "1982-06-30",
+ "2000-04-30",
], $birthdays);
- $this->assertEquals(array('IsRegistered', '1', '0', '1', '1'), $registered);
+ $this->assertEquals(['IsRegistered', '1', '0', '1', '1', '0'], $registered);
}
}
diff --git a/tests/php/Dev/CsvBulkLoaderTest.php b/tests/php/Dev/CsvBulkLoaderTest.php
index 7e4ff93e1..e6cd461c1 100644
--- a/tests/php/Dev/CsvBulkLoaderTest.php
+++ b/tests/php/Dev/CsvBulkLoaderTest.php
@@ -50,7 +50,7 @@ class CsvBulkLoaderTest extends SapphireTest
$results = $loader->load($filepath);
// Test that right amount of columns was imported
- $this->assertEquals(4, $results->Count(), 'Test correct count of imported data');
+ $this->assertEquals(5, $results->Count(), 'Test correct count of imported data');
// Test that columns were correctly imported
$obj = DataObject::get_one(
@@ -76,7 +76,7 @@ class CsvBulkLoaderTest extends SapphireTest
$filepath = $this->csvPath . 'PlayersWithHeader.csv';
$loader->deleteExistingRecords = true;
$results1 = $loader->load($filepath);
- $this->assertEquals(4, $results1->Count(), 'Test correct count of imported data on first load');
+ $this->assertEquals(5, $results1->Count(), 'Test correct count of imported data on first load');
//delete existing data before doing second CSV import
$results2 = $loader->load($filepath);
@@ -84,7 +84,7 @@ class CsvBulkLoaderTest extends SapphireTest
$resultDataObject = DataObject::get(Player::class);
$this->assertEquals(
- 4,
+ 5,
$resultDataObject->count(),
'Test if existing data is deleted before new data is added'
);
diff --git a/tests/php/Dev/CsvBulkLoaderTest/csv/PlayersWithHeader.csv b/tests/php/Dev/CsvBulkLoaderTest/csv/PlayersWithHeader.csv
index 25a868cb8..604d9541e 100644
--- a/tests/php/Dev/CsvBulkLoaderTest/csv/PlayersWithHeader.csv
+++ b/tests/php/Dev/CsvBulkLoaderTest/csv/PlayersWithHeader.csv
@@ -4,3 +4,4 @@
So awesome that she gets multiple rows and \"escaped\" strings in her biography","1982-01-31","0"
"Jamie","Pretty old\, with an escaped comma","1882-01-31","1"
"Järg","Unicode FTW","1982-06-30","1"
+"Jacob"," Likes leading tabs in his biography","2000-04-30","0"
diff --git a/tests/php/Forms/GridField/GridFieldExportButtonTest.php b/tests/php/Forms/GridField/GridFieldExportButtonTest.php
index be46e1702..0f6b42323 100644
--- a/tests/php/Forms/GridField/GridFieldExportButtonTest.php
+++ b/tests/php/Forms/GridField/GridFieldExportButtonTest.php
@@ -12,22 +12,27 @@ use SilverStripe\Forms\GridField\GridFieldConfig;
use SilverStripe\Forms\GridField\GridFieldExportButton;
use SilverStripe\Forms\GridField\GridField;
use SilverStripe\Forms\GridField\GridFieldPaginator;
+use SilverStripe\ORM\FieldType\DBField;
class GridFieldExportButtonTest extends SapphireTest
{
+ /**
+ * @var DataList
+ */
protected $list;
+ /**
+ * @var GridField
+ */
protected $gridField;
- protected $form;
-
protected static $fixture_file = 'GridFieldExportButtonTest.yml';
- protected static $extra_dataobjects = array(
+ protected static $extra_dataobjects = [
Team::class,
NoView::class,
- );
+ ];
protected function setUp()
{
@@ -44,7 +49,7 @@ class GridFieldExportButtonTest extends SapphireTest
$list = new DataList(NoView::class);
$button = new GridFieldExportButton();
- $button->setExportColumns(array('Name' => 'My Name'));
+ $button->setExportColumns(['Name' => 'My Name']);
$config = GridFieldConfig::create()->addComponent(new GridFieldExportButton());
$gridField = new GridField('testfield', 'testfield', $list, $config);
@@ -58,7 +63,7 @@ class GridFieldExportButtonTest extends SapphireTest
public function testGenerateFileDataBasicFields()
{
$button = new GridFieldExportButton();
- $button->setExportColumns(array('Name' => 'My Name'));
+ $button->setExportColumns(['Name' => 'My Name']);
$this->assertEquals(
'"My Name"'."\n".
@@ -68,17 +73,32 @@ class GridFieldExportButtonTest extends SapphireTest
);
}
+ public function testXLSSanitisation()
+ {
+ // Create risky object
+ $object = new Team();
+ $object->Name = '=SUM(1, 2)';
+ $object->write();
+
+ // Export
+ $button = new GridFieldExportButton();
+ $button->setExportColumns(['Name' => 'My Name']);
+
+ $this->assertEquals(
+ "\"My Name\"\n\"\t=SUM(1, 2)\"\nTest\nTest2\n",
+ $button->generateExportFileData($this->gridField)
+ );
+ }
+
public function testGenerateFileDataAnonymousFunctionField()
{
$button = new GridFieldExportButton();
- $button->setExportColumns(
- array(
+ $button->setExportColumns([
'Name' => 'Name',
- 'City' => function ($obj) {
+ 'City' => function (DBField $obj) {
return $obj->getValue() . ' city';
}
- )
- );
+ ]);
$this->assertEquals(
'Name,City'."\n".
@@ -91,12 +111,10 @@ class GridFieldExportButtonTest extends SapphireTest
public function testBuiltInFunctionNameCanBeUsedAsHeader()
{
$button = new GridFieldExportButton();
- $button->setExportColumns(
- array(
+ $button->setExportColumns([
'Name' => 'Name',
- 'City' => 'strtolower'
- )
- );
+ 'City' => 'strtolower',
+ ]);
$this->assertEquals(
'Name,strtolower'."\n".
@@ -109,12 +127,10 @@ class GridFieldExportButtonTest extends SapphireTest
public function testNoCsvHeaders()
{
$button = new GridFieldExportButton();
- $button->setExportColumns(
- array(
+ $button->setExportColumns([
'Name' => 'Name',
- 'City' => 'City'
- )
- );
+ 'City' => 'City',
+ ]);
$button->setCsvHasHeader(false);
$this->assertEquals(
@@ -132,9 +148,7 @@ class GridFieldExportButtonTest extends SapphireTest
//Create an ArrayList 1 greater the Paginator's default 15 rows
$arrayList = new ArrayList();
for ($i = 1; $i <= 16; $i++) {
- $dataobject = new DataObject(
- array ( 'ID' => $i )
- );
+ $dataobject = new DataObject(['ID' => $i]);
$arrayList->add($dataobject);
}
$this->gridField->setList($arrayList);
@@ -164,11 +178,9 @@ class GridFieldExportButtonTest extends SapphireTest
public function testZeroValue()
{
$button = new GridFieldExportButton();
- $button->setExportColumns(
- array(
+ $button->setExportColumns([
'RugbyTeamNumber' => 'Rugby Team Number'
- )
- );
+ ]);
$this->assertEquals(
"\"Rugby Team Number\"\n2\n0\n",
diff --git a/tests/php/Forms/HTMLEditor/TinyMCEConfigTest.php b/tests/php/Forms/HTMLEditor/TinyMCEConfigTest.php
new file mode 100644
index 000000000..7178945a3
--- /dev/null
+++ b/tests/php/Forms/HTMLEditor/TinyMCEConfigTest.php
@@ -0,0 +1,40 @@
+get('base_dir');
+ if (!$configDir) {
+ $this->markTestSkipped("Test skipped without TinyMCE resources folder being installed");
+ }
+
+ $langs = Director::baseFolder().'/'.ModuleResourceLoader::resourcePath($configDir).'/langs';
+
+ // Test all langs exist as real files
+ foreach (TinyMCEConfig::config()->get('tinymce_lang') as $locale => $resource) {
+ // Check valid
+ $this->assertFileExists(
+ "{$langs}/{$resource}.js",
+ "Locale code {$locale} maps to {$resource}.js which exists"
+ );
+ // Check we don't simplify to locale when a specific version exists
+ if (strpos($resource, '_') === false) {
+ $this->assertFileNotExists(
+ "{$langs}/{$locale}.js",
+ "Locale code {$locale} doesn't map to simple {$resource}.js when a better {$locale}.js is available"
+ );
+ }
+ }
+ }
+}
diff --git a/tests/php/ORM/DataObjectTest.php b/tests/php/ORM/DataObjectTest.php
index cf6290094..36b41fd99 100644
--- a/tests/php/ORM/DataObjectTest.php
+++ b/tests/php/ORM/DataObjectTest.php
@@ -1342,10 +1342,7 @@ class DataObjectTest extends SapphireTest
$this->assertFalse($schema->classHasTable(DataObject::class));
$this->assertFalse($schema->classHasTable(ViewableData::class));
- // Invalid class
- $this->expectException(ReflectionException::class);
- $this->expectExceptionMessage('Class ThisIsntADataObject does not exist');
-
+ /* Invalid class name */
$this->assertFalse($schema->classHasTable("ThisIsntADataObject"));
}
diff --git a/tests/php/Security/MemberAuthenticatorTest.php b/tests/php/Security/MemberAuthenticatorTest.php
index 6a203681f..3aa4e1d0e 100644
--- a/tests/php/Security/MemberAuthenticatorTest.php
+++ b/tests/php/Security/MemberAuthenticatorTest.php
@@ -265,7 +265,8 @@ class MemberAuthenticatorTest extends SapphireTest
$this->assertNull($member);
$this->assertCount(1, LoginAttempt::get());
$attempt = LoginAttempt::get()->first();
- $this->assertEquals($email, $attempt->Email);
+ $this->assertEmpty($attempt->Email); // Doesn't store potentially sensitive data
+ $this->assertEquals(sha1($email), $attempt->EmailHashed);
$this->assertEquals(LoginAttempt::FAILURE, $attempt->Status);
}
diff --git a/tests/php/Security/SecurityTest.php b/tests/php/Security/SecurityTest.php
index 49e9a51e5..469371ec0 100644
--- a/tests/php/Security/SecurityTest.php
+++ b/tests/php/Security/SecurityTest.php
@@ -3,7 +3,6 @@
namespace SilverStripe\Security\Tests;
use Page;
-use PageController;
use SilverStripe\Control\Controller;
use SilverStripe\Control\Director;
use SilverStripe\Control\HTTPRequest;
@@ -615,34 +614,21 @@ class SecurityTest extends FunctionalTest
/* UNSUCCESSFUL ATTEMPTS WITH WRONG PASSWORD FOR EXISTING USER ARE LOGGED */
$this->doTestLoginForm('testuser@example.com', 'wrongpassword');
/** @var LoginAttempt $attempt */
- $attempt = DataObject::get_one(
- LoginAttempt::class,
- array(
- '"LoginAttempt"."Email"' => 'testuser@example.com'
- )
- );
+ $attempt = LoginAttempt::getByEmail('testuser@example.com')->first();
$this->assertInstanceOf(LoginAttempt::class, $attempt);
- $member = DataObject::get_one(
- Member::class,
- array(
- '"Member"."Email"' => 'testuser@example.com'
- )
- );
+ $member = Member::get()->filter('Email', 'testuser@example.com')->first();
$this->assertEquals($attempt->Status, 'Failure');
- $this->assertEquals($attempt->Email, 'testuser@example.com');
+ $this->assertEmpty($attempt->Email); // Doesn't store potentially sensitive data
+ $this->assertEquals($attempt->EmailHashed, sha1('testuser@example.com'));
$this->assertEquals($attempt->Member()->toMap(), $member->toMap());
/* UNSUCCESSFUL ATTEMPTS WITH NONEXISTING USER ARE LOGGED */
$this->doTestLoginForm('wronguser@silverstripe.com', 'wrongpassword');
- $attempt = DataObject::get_one(
- LoginAttempt::class,
- array(
- '"LoginAttempt"."Email"' => 'wronguser@silverstripe.com'
- )
- );
- $this->assertTrue(is_object($attempt));
+ $attempt = LoginAttempt::getByEmail('wronguser@silverstripe.com')->first();
+ $this->assertInstanceOf(LoginAttempt::class, $attempt);
$this->assertEquals($attempt->Status, 'Failure');
- $this->assertEquals($attempt->Email, 'wronguser@silverstripe.com');
+ $this->assertEmpty($attempt->Email); // Doesn't store potentially sensitive data
+ $this->assertEquals($attempt->EmailHashed, sha1('wronguser@silverstripe.com'));
$this->assertNotEmpty($this->getValidationResult()->getMessages(), 'An invalid email returns a message.');
}
@@ -653,22 +639,12 @@ class SecurityTest extends FunctionalTest
/* SUCCESSFUL ATTEMPTS ARE LOGGED */
$this->doTestLoginForm('testuser@example.com', '1nitialPassword');
/** @var LoginAttempt $attempt */
- $attempt = DataObject::get_one(
- LoginAttempt::class,
- array(
- '"LoginAttempt"."Email"' => 'testuser@example.com'
- )
- );
- /** @var Member $member */
- $member = DataObject::get_one(
- Member::class,
- array(
- '"Member"."Email"' => 'testuser@example.com'
- )
- );
- $this->assertTrue(is_object($attempt));
+ $attempt = LoginAttempt::getByEmail('testuser@example.com')->first();
+ $member = Member::get()->filter('Email', 'testuser@example.com')->first();
+ $this->assertInstanceOf(LoginAttempt::class, $attempt);
$this->assertEquals($attempt->Status, 'Success');
- $this->assertEquals($attempt->Email, 'testuser@example.com');
+ $this->assertEmpty($attempt->Email); // Doesn't store potentially sensitive data
+ $this->assertEquals($attempt->EmailHashed, sha1('testuser@example.com'));
$this->assertEquals($attempt->Member()->toMap(), $member->toMap());
}
@@ -725,6 +701,7 @@ class SecurityTest extends FunctionalTest
// Ensure page shares the same controller as security
$securityClass = Config::inst()->get(Security::class, 'page_class');
+ /** @var Page $securityPage */
$securityPage = new $securityClass();
$this->assertInstanceOf($securityPage->getControllerName(), $result);
$this->assertEquals($request, $result->getRequest());