-
Notifications
You must be signed in to change notification settings - Fork 102
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into PHRAS-3857-csrf-form-token
- Loading branch information
Showing
12 changed files
with
181 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| ## Security headers for Nginx ## | ||
| add_header Strict-Transport-Security "max-age=15768000" always; | ||
| add_header X-Content-Type-Options "nosniff" always; | ||
| add_header X-Frame-Options "SAMEORIGIN" always; | ||
| add_header X-Xss-Protection "1; mode=block" always; | ||
| add_header Referrer-Policy strict-origin-when-cross-origin; | ||
| add_header Content-Security-Policy "$GATEWAY_CSP"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| <?php | ||
|
|
||
| use Alchemy\Phrasea\Application; | ||
| use Alchemy\Phrasea\Core\Configuration\PropertyAccess; | ||
|
|
||
| class patch_418RC6 implements patchInterface | ||
| { | ||
| /** @var string */ | ||
| private $release = '4.1.8-rc6'; | ||
|
|
||
| /** @var array */ | ||
| private $concern = [base::APPLICATION_BOX]; | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function get_release() | ||
| { | ||
| return $this->release; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function getDoctrineMigrations() | ||
| { | ||
| return []; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function require_all_upgrades() | ||
| { | ||
| return false; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function concern() | ||
| { | ||
| return $this->concern; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function apply(base $base, Application $app) | ||
| { | ||
| if ($base->get_base_type() === base::DATA_BOX) { | ||
| $this->patch_databox($base, $app); | ||
| } elseif ($base->get_base_type() === base::APPLICATION_BOX) { | ||
| $this->patch_appbox($base, $app); | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| private function patch_databox(databox $databox, Application $app) | ||
| { | ||
| } | ||
|
|
||
| private function patch_appbox(base $appbox, Application $app) | ||
| { | ||
| /** @var PropertyAccess $conf */ | ||
| $conf = $app['conf']; | ||
|
|
||
| // PHRAS-3889 | ||
| if (!$conf->has(['workers', 'writeMetadatas', 'acceptedMimeType'])) { | ||
| $defaultAcceptedMimeType = [ | ||
| 'image/jpeg', | ||
| 'image/png', | ||
| 'application/postscript', | ||
| 'application/pdf', | ||
| 'image/tiff' | ||
| ]; | ||
|
|
||
| $conf->set(['workers', 'writeMetadatas', 'acceptedMimeType'], $defaultAcceptedMimeType); | ||
| } | ||
|
|
||
| // PHRAS-3896 | ||
| if ($conf->get(['main', 'search-engine', 'options', 'populate_order']) != 'RECORD_ID') { | ||
| $conf->set(['main', 'search-engine', 'options', 'populate_order'], 'RECORD_ID'); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters