Mutagen as the default sync mechanism. Security adjustments (#87)

* Mutagen as the default sync mechanism. Security adjustments
spryker-shop · Feb 22, 2021 · bb2a019 · bb2a019
1 parent 26ba184
commit bb2a019
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 28 deletions.
diff --git a/.git.docker b/.git.docker
@@ -1 +1 @@
-c0b4cc0f08f6e4cf0d1af8a41371690359b58955
+8fe744337b33113dc18affc7d1992202cc8c519f
diff --git a/.travis.yml b/.travis.yml
@@ -300,7 +300,6 @@ before_install:
   - phpenv config-add config/Shared/ci/travis/travis.php.ini
   - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - phpenv config-rm xdebug.ini
-  - composer global require hirak/prestissimo
 
 install:
   - chmod -R a+x config/Shared/ci/travis/

diff --git a/composer.json b/composer.json
@@ -191,7 +191,7 @@
     "codeception/module-webdriver": "^1.0",
     "composer/package-versions-deprecated": "^1.10",
     "fzaninotto/faker": "^1.6",
-    "jakoch/phantomjs-installer": "^2.1.0",
+    "jakoch/phantomjs-installer": "^3.0.0",
     "myclabs/deep-copy": "~1.8.1",
     "pdepend/pdepend": "^2.2.4",
     "phpunit/phpunit": "^7.0.0",

diff --git a/composer.lock b/composer.lock
diff --git a/...hared/common/config_oauth-development.php → config/Shared/common/config_oauth-devvm.php b/...hared/common/config_oauth-development.php → config/Shared/common/config_oauth-devvm.php
diff --git a/config/Shared/config_default-ci.php b/config/Shared/config_default-ci.php
@@ -84,7 +84,7 @@
 // ------------------------------ AUTHENTICATION ------------------------------
 // ----------------------------------------------------------------------------
 
-require 'common/config_oauth-development.php';
+require 'common/config_oauth-devvm.php';
 
 // ----------------------------------------------------------------------------
 // ------------------------------ SERVICES ------------------------------------

diff --git a/config/Shared/config_default-development.php b/config/Shared/config_default-development.php
@@ -99,7 +99,7 @@
 // ------------------------------ AUTHENTICATION ------------------------------
 // ----------------------------------------------------------------------------
 
-require 'common/config_oauth-development.php';
+require 'common/config_oauth-devvm.php';
 
 // ----------------------------------------------------------------------------
 // ------------------------------ SERVICES ------------------------------------

diff --git a/config/Shared/config_default-devtest.php b/config/Shared/config_default-devtest.php
@@ -84,7 +84,7 @@
 // ------------------------------ AUTHENTICATION ------------------------------
 // ----------------------------------------------------------------------------
 
-require 'common/config_oauth-development.php';
+require 'common/config_oauth-devvm.php';
 
 // ----------------------------------------------------------------------------
 // ------------------------------ SERVICES ------------------------------------

diff --git a/config/Shared/config_default-docker.demo.php b/config/Shared/config_default-docker.demo.php
@@ -4,12 +4,6 @@
 // ############################## DEMO/TESTING CONFIGURATION ##################
 // ############################################################################
 
-// ----------------------------------------------------------------------------
-// ------------------------------ AUTHENTICATION ------------------------------
-// ----------------------------------------------------------------------------
-
-require 'common/config_oauth-development.php';
-
 // ----------------------------------------------------------------------------
 // ------------------------------ OMS -----------------------------------------
 // ----------------------------------------------------------------------------

diff --git a/config/Shared/config_default-docker.dev.php b/config/Shared/config_default-docker.dev.php
@@ -63,12 +63,6 @@
 $config[ErrorHandlerConstants::IS_PRETTY_ERROR_HANDLER_ENABLED] = (bool)getenv('SPRYKER_DEBUG_ENABLED');
 $config[ErrorHandlerConstants::ERROR_LEVEL] = getenv('SPRYKER_DEBUG_DEPRECATIONS_ENABLED') ? E_ALL : $config[ErrorHandlerConstants::ERROR_LEVEL];
 
-// ----------------------------------------------------------------------------
-// ------------------------------ AUTHENTICATION ------------------------------
-// ----------------------------------------------------------------------------
-
-require 'common/config_oauth-development.php';
-
 // ----------------------------------------------------------------------------
 // ------------------------------ SERVICES ------------------------------------
 // ----------------------------------------------------------------------------

diff --git a/config/Shared/config_default.php b/config/Shared/config_default.php
@@ -29,6 +29,7 @@
 use Spryker\Shared\Monitoring\MonitoringConstants;
 use Spryker\Shared\Newsletter\NewsletterConstants;
 use Spryker\Shared\Oauth\OauthConstants;
+use Spryker\Shared\OauthCryptography\OauthCryptographyConstants;
 use Spryker\Shared\Oms\OmsConstants;
 use Spryker\Shared\ProductManagement\ProductManagementConstants;
 use Spryker\Shared\Propel\PropelConstants;
@@ -166,8 +167,18 @@
 
 // >>> OAUTH
 
-$config[OauthConstants::PRIVATE_KEY_PATH] = getenv('SPRYKER_OAUTH_KEY_PRIVATE') ?: null;
-$config[OauthConstants::PUBLIC_KEY_PATH] = getenv('SPRYKER_OAUTH_KEY_PUBLIC') ?: null;
+$config[OauthConstants::PRIVATE_KEY_PATH] = str_replace(
+    '__LINE__',
+    PHP_EOL,
+    getenv('SPRYKER_OAUTH_KEY_PRIVATE') ?: ''
+) ?: null;
+$config[OauthConstants::PUBLIC_KEY_PATH]
+    = $config[OauthCryptographyConstants::PUBLIC_KEY_PATH]
+    = str_replace(
+        '__LINE__',
+        PHP_EOL,
+        getenv('SPRYKER_OAUTH_KEY_PUBLIC') ?: ''
+    ) ?: null;
 $config[OauthConstants::ENCRYPTION_KEY] = getenv('SPRYKER_OAUTH_ENCRYPTION_KEY') ?: null;
 $config[OauthConstants::OAUTH_CLIENT_IDENTIFIER] = getenv('SPRYKER_OAUTH_CLIENT_IDENTIFIER') ?: null;
 $config[OauthConstants::OAUTH_CLIENT_SECRET] = getenv('SPRYKER_OAUTH_CLIENT_SECRET') ?: null;

diff --git a/deploy.dev.yml b/deploy.dev.yml
@@ -189,5 +189,8 @@ docker:
 
         docker-sync:
             platforms:
-                - macos
                 - windows
+
+        mutagen:
+            platform:
+                - macos
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		c0b4cc0f08f6e4cf0d1af8a41371690359b58955
		8fe744337b33113dc18affc7d1992202cc8c519f