Skip to content
Snippets Groups Projects
Verified Commit d1721377 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3277025 by Spokje, longwave: For additional security you should declare...

Issue #3277025 by Spokje, longwave: For additional security you should declare the allow-plugins config with a list of packages names that are allowed to run code

(cherry picked from commit 8b44468e)
parent 7d583738
No related branches found
No related tags found
22 merge requests!12482Issue #3291780 by longwave, xjm: guzzlehttp/guzzle 6.5.8 requires guzzlehttp/psr7 ^1.9,!8357Issue #2994000 by Lendude, Pasqualle, quietone, pameeela: Notice in logs when...,!4488Issue #3376281: Random machine names no longer need to be wrapped in strtolower(),!3149Issue #3282285: Email "" does not comply with addr-spec of RFC 2822,!3000Issue #793660: Check for failure of hook_install,!2940Issue #3320240: Entity count query returns a string instead of int,!2937Issue #3315245: Order of languages overrides default language fallback,!2877Issue #3056652 by yogeshmpawar, mashermike, aalin, ranjith_kumar_k_u: Link...,!2804URL of image field formatter use absolute URL option.,!2749Issue #3309024: Focus on the wrong submit button after AJAX submit,!2692Issue #3284010 by _shY, mherchel, Abhijith S: "Create content" link within...,!2608Issue #2430379 by quietone, znerol, larowlan: Add explicit test for session...,!2575Issue #3198340 by alexpott, xjm, cilefen, Mile23, mmjvb, catch, longwave, mfb,...,!2555Issue #3277148 by rpayanm, andregp, joachim, Farnoosh, Athrylith, Jingting:...,!2554Issue #3277148 by rpayanm, andregp, joachim, Farnoosh, Athrylith, Jingting:...,!2539Issue #3299806 by BenStallings: Include uuid field in d7_node migration, if present.,!2453Issue #332796 by voleger, dww, Steve Dondley, ykhadilkar, Dave Reid,...,!2426Issue #3278314 by acbramley: InlineBlockUsageInterface::getUsage can return...,!1627Issue #3082958: Add gitignore(s) to composer-ready project templates,!1014Issue #3226806: Move filter implementations from filter.module to plugin classes,!939Issue #2971209: Allow the MediaLibraryUiBuilder service to use an alternative view display,!88Issue #3163299: Ajax exposed filters not working for multiple instances of the same Views block placed on one page
...@@ -218,14 +218,11 @@ public function testUnmanagedGitIgnoreWhenGitNotAvailable() { ...@@ -218,14 +218,11 @@ public function testUnmanagedGitIgnoreWhenGitNotAvailable() {
exec('git --help', $output, $status); exec('git --help', $output, $status);
$this->assertEquals(127, $status); $this->assertEquals(127, $status);
// Run the scaffold command. // Run the scaffold command.
$output = []; $output = $this->mustExec('composer drupal:scaffold 2>&1', NULL);
exec('composer drupal:scaffold', $output, $status);
putenv('PATH=' . $oldPath . ':' . getenv('PATH')); putenv('PATH=' . $oldPath . ':' . getenv('PATH'));
$expected = <<<EOT $expected = <<<EOT
0
Scaffolding files for fixtures/drupal-assets-fixture: Scaffolding files for fixtures/drupal-assets-fixture:
- Copy [web-root]/.csslintrc from assets/.csslintrc - Copy [web-root]/.csslintrc from assets/.csslintrc
- Copy [web-root]/.editorconfig from assets/.editorconfig - Copy [web-root]/.editorconfig from assets/.editorconfig
...@@ -247,8 +244,9 @@ public function testUnmanagedGitIgnoreWhenGitNotAvailable() { ...@@ -247,8 +244,9 @@ public function testUnmanagedGitIgnoreWhenGitNotAvailable() {
Scaffolding files for fixtures/drupal-composer-drupal-project: Scaffolding files for fixtures/drupal-composer-drupal-project:
- Skip [web-root]/.htaccess: disabled - Skip [web-root]/.htaccess: disabled
- Copy [web-root]/robots.txt from assets/robots-default.txt - Copy [web-root]/robots.txt from assets/robots-default.txt
EOT; EOT;
$this->assertEquals($expected, $status . "\n\n" . implode("\n", $output)); $this->assertEquals($expected, $output);
$this->assertFileExists($sut . '/docroot/index.php'); $this->assertFileExists($sut . '/docroot/index.php');
$this->assertFileDoesNotExist($sut . '/docroot/sites/default/.gitignore'); $this->assertFileDoesNotExist($sut . '/docroot/sites/default/.gitignore');
} }
......
...@@ -39,6 +39,11 @@ ...@@ -39,6 +39,11 @@
"fixtures/drupal-core-fixture": "*", "fixtures/drupal-core-fixture": "*",
"fixtures/scaffold-override-fixture": "*" "fixtures/scaffold-override-fixture": "*"
}, },
"config": {
"allow-plugins": {
"drupal/core-composer-scaffold": true
}
},
"extra": { "extra": {
"drupal-scaffold": { "drupal-scaffold": {
"allowed-packages": [ "allowed-packages": [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment