From af06f803c56756e395359ffacbfaf2e8370b93a0 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Fri, 1 Jun 2018 15:25:04 +1200 Subject: [PATCH 1/4] FIX Re-enable Behat using chromedriver and silverstripe/recipe-testing --- .travis.yml | 36 +++++++++++++++++++++--------------- behat.yml | 12 +++++++----- composer.json | 5 +---- 3 files changed, 29 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index a1270c5..8fc253e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,47 +1,53 @@ language: php -addons: - firefox: "31.0" - dist: trusty +before_install: + - sudo apt-get update + - sudo apt-get install chromium-chromedriver + env: global: - - COMPOSER_ROOT_VERSION="4.0.x-dev" + - COMPOSER_ROOT_VERSION="2.0.x-dev" - DISPLAY=":99" - XVFBARGS=":99 -ac -screen 0 1024x768x16" + - SS_BASE_URL="http://localhost:8080/" + - SS_ENVIRONMENT_TYPE="dev" matrix: include: - php: 5.6 env: DB=MYSQL INSTALLER_VERSION=4.0.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1 - - php: 7.1 + - php: 7.0 env: DB=PGSQL INSTALLER_VERSION=4.1.x-dev PHPUNIT_TEST=1 + - php: 7.1 + env: DB=MYSQL INSTALLER_VERSION=4.1.x-dev BEHAT_TEST=1 - php: 7.2 env: DB=MYSQL INSTALLER_VERSION=4.2.x-dev PHPUNIT_COVERAGE_TEST=1 - - php: 7.0 - env: DB=MYSQL INSTALLER_VERSION=4.x-dev BEHAT_TEST=1 - allow_failures: - - php: 7.0 + - php: 7.2 env: DB=MYSQL INSTALLER_VERSION=4.x-dev BEHAT_TEST=1 before_script: + # Extra $PATH + - export PATH=/usr/lib/chromium-browser/:$PATH + + # Init PHP - phpenv rehash - phpenv config-rm xdebug.ini - echo 'memory_limit = 2G' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini + + # Install composer - composer validate - - composer require silverstripe/installer $INSTALLER_VERSION --no-update + - composer require silverstripe/installer:"$INSTALLER_VERSION" silverstripe/recipe-testing:^1 --no-update - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.0.x-dev; fi - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile - - echo "SS_BASE_URL=http://localhost:8080/" >> .env # Behat bootstrapping - - if [[ $BEHAT_TEST ]]; then echo "" >> .env && echo "SS_BASE_URL=http://localhost:8080/" >> .env; fi - if [[ $BEHAT_TEST ]]; then mkdir artifacts; fi + - if [[ $BEHAT_TEST ]]; then cp composer.lock artifacts/; fi - if [[ $BEHAT_TEST ]]; then sh -e /etc/init.d/xvfb start; sleep 3; fi - - if [[ $BEHAT_TEST ]]; then (vendor/bin/selenium-server-standalone > artifacts/selenium.log 2>&1 &); fi - - if [[ $BEHAT_TEST ]]; then (vendor/bin/serve --bootstrap-file cms/tests/behat/serve-bootstrap.php &> artifacts/serve.log &); fi - + - if [[ $BEHAT_TEST ]]; then (chromedriver > artifacts/chromedriver.log 2>&1 &); fi + - if [[ $BEHAT_TEST ]]; then (vendor/bin/serve --bootstrap-file vendor/silverstripe/cms/tests/behat/serve-bootstrap.php &> artifacts/serve.log &); fi script: - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi diff --git a/behat.yml b/behat.yml index 8db3ded..38e7b19 100644 --- a/behat.yml +++ b/behat.yml @@ -12,15 +12,17 @@ default: - SilverStripe\CMS\Tests\Behaviour\LoginContext - SilverStripe\CMS\Tests\Behaviour\ThemeContext - SilverStripe\CMS\Tests\Behaviour\FixtureContext: - # Note: double indent for args is intentional + # Note: double indent for args is intentional - %paths.modules.subsites%/tests/behat/features/files/ extensions: SilverStripe\BehatExtension\MinkExtension: - default_session: selenium2 - javascript_session: selenium2 - selenium2: - browser: firefox + default_session: facebook_web_driver + javascript_session: facebook_web_driver + facebook_web_driver: + browser: chrome + wd_host: "http://127.0.0.1:9515" #chromedriver port + browser_name: chrome SilverStripe\BehatExtension\Extension: screenshot_path: %paths.base%/artifacts/screenshots diff --git a/composer.json b/composer.json index 23e8331..4f8576f 100644 --- a/composer.json +++ b/composer.json @@ -24,10 +24,7 @@ }, "require-dev": { "phpunit/phpunit": "^5.7", - "squizlabs/php_codesniffer": "^3.0", - "silverstripe/behat-extension": "^3", - "silverstripe/serve": "^2.0", - "se/selenium-server-standalone": "2.41.0" + "squizlabs/php_codesniffer": "^3.0" }, "autoload": { "psr-4": { From c30c0d94eb265635c65650705a5c96762e79d5d6 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Thu, 7 Jun 2018 16:00:52 +1200 Subject: [PATCH 2/4] Increase memory limit in Travis configuration --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8fc253e..7c1453e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ before_script: # Init PHP - phpenv rehash - phpenv config-rm xdebug.ini - - echo 'memory_limit = 2G' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini + - echo 'memory_limit=3G' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini # Install composer - composer validate From 8222f619f8465d09b8cd43b63fc5caf8d04d1757 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Fri, 1 Jun 2018 15:11:25 +1200 Subject: [PATCH 3/4] FIX Use correct table name for Group model when performing DB upgrades from older versions --- src/Extensions/GroupSubsites.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Extensions/GroupSubsites.php b/src/Extensions/GroupSubsites.php index 2d138b4..3251a89 100644 --- a/src/Extensions/GroupSubsites.php +++ b/src/Extensions/GroupSubsites.php @@ -9,6 +9,7 @@ use SilverStripe\Forms\FieldList; use SilverStripe\Forms\OptionsetField; use SilverStripe\Forms\ReadonlyField; use SilverStripe\ORM\DataExtension; +use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DataQuery; use SilverStripe\ORM\DB; use SilverStripe\ORM\Queries\SQLSelect; @@ -45,31 +46,31 @@ class GroupSubsites extends DataExtension implements PermissionProvider return; } // Migration for Group.SubsiteID data from when Groups only had a single subsite - $ownerClass = get_class($this->owner); - $schema = $ownerClass::getSchema(); - $groupFields = DB::field_list($schema->tableName(Group::class)); + $schema = DataObject::getSchema(); + $groupTable = $schema->tableName(Group::class); + $groupFields = DB::field_list($groupTable); // Detection of SubsiteID field is the trigger for old-style-subsiteID migration if (isset($groupFields['SubsiteID'])) { // Migrate subsite-specific data DB::query('INSERT INTO "Group_Subsites" ("GroupID", "SubsiteID") - SELECT "ID", "SubsiteID" FROM "Group" WHERE "SubsiteID" > 0'); + SELECT "ID", "SubsiteID" FROM "' . $groupTable . '" WHERE "SubsiteID" > 0'); // Migrate global-access data - DB::query('UPDATE "Group" SET "AccessAllSubsites" = 1 WHERE "SubsiteID" = 0'); + DB::query('UPDATE "' . $groupTable . '" SET "AccessAllSubsites" = 1 WHERE "SubsiteID" = 0'); // Move the field out of the way so that this migration doesn't get executed again - DB::get_schema()->renameField(Group::class, 'SubsiteID', '_obsolete_SubsiteID'); + DB::get_schema()->renameField($groupTable, 'SubsiteID', '_obsolete_SubsiteID'); // No subsite access on anything means that we've just installed the subsites module. // Make all previous groups global-access groups } else { - if (!DB::query('SELECT "Group"."ID" FROM "Group" + if (!DB::query('SELECT "Group"."ID" FROM "' . $groupTable . '" LEFT JOIN "Group_Subsites" ON "Group_Subsites"."GroupID" = "Group"."ID" AND "Group_Subsites"."SubsiteID" > 0 WHERE "AccessAllSubsites" = 1 OR "Group_Subsites"."GroupID" IS NOT NULL ')->value() ) { - DB::query('UPDATE "Group" SET "AccessAllSubsites" = 1'); + DB::query('UPDATE "' . $groupTable . '" SET "AccessAllSubsites" = 1'); } } } From b6ba567ee5c947358fee47adaa6b4f931b000789 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Fri, 1 Jun 2018 13:42:23 +1200 Subject: [PATCH 4/4] FIX Do not make subsite based file permission decisions when no subsite is set --- src/Extensions/FileSubsites.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Extensions/FileSubsites.php b/src/Extensions/FileSubsites.php index e0e5a3b..37a9522 100644 --- a/src/Extensions/FileSubsites.php +++ b/src/Extensions/FileSubsites.php @@ -2,6 +2,7 @@ namespace SilverStripe\Subsites\Extensions; +use SilverStripe\Assets\File; use SilverStripe\ORM\DataExtension; use SilverStripe\ORM\DataQuery; use SilverStripe\ORM\Queries\SQLSelect; @@ -106,16 +107,21 @@ class FileSubsites extends DataExtension public function canEdit($member = null) { + // Opt out of making opinions if no subsite ID is set yet + if (!$this->owner->SubsiteID) { + return null; + } + // Check the CMS_ACCESS_SecurityAdmin privileges on the subsite that owns this group $subsiteID = SubsiteState::singleton()->getSubsiteId(); if ($subsiteID && $subsiteID == $this->owner->SubsiteID) { return true; } - return SubsiteState::singleton()->withState(function ($newState) { + return SubsiteState::singleton()->withState(function (SubsiteState $newState) use ($member) { $newState->setSubsiteId($this->owner->SubsiteID); - return Permission::check(['CMS_ACCESS_AssetAdmin', 'CMS_ACCESS_LeftAndMain']); + return $this->owner->getPermissionChecker()->canEdit($this->owner->ID, $member); }); }