Updated Dotenv::getSettings to prepend & append start/end chars to each pattern. Updated Dotenv::getSettings to construct trusted_host_patterns based on DOMAINS if

  `TRUSTED_HOST_PATTERNS` environment variable is not set. Updated `SHIELD` variable to serve as the default username/password for the prompt if filled.

Author: dl-unleashed-technologies

CHANGELOG.md

@@ -4,6 +4,15 @@ Updates should follow the [Keep a CHANGELOG](https://keepachangelog.com/) princi
 
 ## [Unreleased][unreleased]
 
+## [0.2.0] - 2022-03-14
+
+### Changed
+
+- *Updated `Dotenv::getSettings` to prepend & append start/end chars to each pattern.*
+- Updated `Dotenv::getSettings` to construct `trusted_host_patterns` based on `DOMAINS` if
+  `TRUSTED_HOST_PATTERNS` environment variable is not set.
+- Updated `SHIELD` variable to serve as the default username/password for the prompt if filled.
+
 ## [0.1.17] - 2022-01-27
 
 ### Fixed
@@ -126,7 +135,8 @@ Updates should follow the [Keep a CHANGELOG](https://keepachangelog.com/) princi
 
 **Initial release!**
 
-[unreleased]: https://github.com/unleashedtech/dotenv-drupal/compare/0.1.17...main
+[unreleased]: https://github.com/unleashedtech/dotenv-drupal/compare/0.2.0...main
+[0.2.0]: https://github.com/unleashedtech/dotenv-drupal/compare/0.1.17...0.2.0
 [0.1.17]: https://github.com/unleashedtech/dotenv-drupal/compare/0.1.16...0.1.17
 [0.1.16]: https://github.com/unleashedtech/dotenv-drupal/compare/0.1.15...0.1.16
 [0.1.15]: https://github.com/unleashedtech/dotenv-drupal/compare/0.1.14...0.1.15

README.md

@@ -195,16 +195,24 @@ MAILGUN_URL=https://[email protected]
 ```
 
 #### SHIELD
-A boolean allowing the enabling/disabling of Shield module auth functionality.
+A string allowing the enabling/disabling of Shield module auth functionality.
+
+If empty, shield will not be enabled.
+
+If filled, the string will be used as username & password by default.
 
 Note: _Make sure the "Enable Shield" checkbox is checked in Drupal & that config is committed._
 
 ##### SHIELD_USERNAME
 The username for Shield to require, if enabled.
 
+This package will use the value of `SHIELD` as username, by default.
+
 ##### SHIELD_PASSWORD
 The password for Shield to require, if enabled.
 
+This package will use the value of `SHIELD` as password, by default.
+
 ##### SHIELD_MESSAGE
 The _public_ message Shield should show in the auth prompt if enabled.
 
@@ -236,7 +244,11 @@ so the shorter DSN can be used.
 Streamlined environment-dependent configuration of _one_ Solr core is supported at this time.
 
 #### TRUSTED_HOST_PATTERNS
-A CSV list of patterns specifying [trusted hosts](https://www.drupal.org/docs/installing-drupal/trusted-host-settings#s-protecting-in-drupal-8).
+Optional. A CSV list of patterns specifying [trusted hosts](https://www.drupal.org/docs/installing-drupal/trusted-host-settings#s-protecting-in-drupal-8). If this
+variable is not set, this package will populate Drupal's `trusted_host_patterns` array
+based on the value of [DOMAINS](#domains).
+
+Start (`^`) & end (`$`) characters are added to every pattern, by default.
 
 #### Configuration Conclusion
 With these few Environment Variables, you will be able to configure Drupal in a streamlined

composer.json

@@ -13,6 +13,6 @@
         "psr-4": { "UnleashedTech\\Drupal\\Dotenv\\": "src/" }
     },
     "extra": {
-        "branch-alias": { "dev-main": "1.0-dev" }
+        "branch-alias": { "dev-main": "2.0-dev" }
     }
 }

src/Dotenv.php

@@ -115,7 +115,7 @@ public function getConfig(): array
 
         // Default to having shield enabled.
         if (isset($_SERVER['SHIELD'])) {
-            $config['shield.settings']['shield_enable'] = (bool)$_SERVER['SHIELD'];
+            $config['shield.settings']['shield_enable'] = (bool) $_SERVER['SHIELD'];
         } else {
             $config['shield.settings']['shield_enable'] = TRUE;
         }
@@ -174,9 +174,15 @@ public function getConfig(): array
             if (isset($_SERVER['SHIELD_USERNAME'])) {
                 $config['shield.settings']['credentials']['shield']['user'] = $_SERVER['SHIELD_USERNAME'];
             }
+            else {
+                $config['shield.settings']['credentials']['shield']['user'] = $_SERVER['SHIELD'];
+            }
             if (isset($_SERVER['SHIELD_PASSWORD'])) {
                 $config['shield.settings']['credentials']['shield']['pass'] = $_SERVER['SHIELD_PASSWORD'];
             }
+            else {
+                $config['shield.settings']['credentials']['shield']['pass'] = $_SERVER['SHIELD'];
+            }
             if (isset($_SERVER['SHIELD_MESSAGE'])) {
                 $config['shield.settings']['print'] = $_SERVER['SHIELD_MESSAGE'];
             }
@@ -282,7 +288,14 @@ public function getSettings(): array
             $settings['hash_salt'] = $_SERVER['HASH_SALT'];
         }
         if (isset($_SERVER['TRUSTED_HOST_PATTERNS'])) {
-            $settings['trusted_host_patterns'] = explode(',', $_SERVER['TRUSTED_HOST_PATTERNS']);
+            foreach (explode(',', $_SERVER['TRUSTED_HOST_PATTERNS']) as $pattern) {
+                $settings['trusted_host_patterns'][] = '^' . $pattern . '$';
+            }
+        }
+        else {
+            foreach ($this->getDomains() as $domain) {
+                $settings['trusted_host_patterns'][] = '^' . str_replace('.', '\.', $domain) . '$';
+            }
         }
 
         switch ($envName) {
@@ -313,6 +326,16 @@ public function getSettings(): array
         return $settings;
     }
 
+    /**
+     * Gets the domains for this environment.
+     *
+     * @return array
+     *   The domains for this environment.
+     */
+    public function getDomains(): array {
+        return \explode(',', $_SERVER['DOMAINS'] ?? 'default.example');
+    }
+
     /**
      * Gets the Drupal-multi-site $sites array, based on environment variables.
      *
@@ -321,7 +344,7 @@ public function getSettings(): array
      */
     public function getSites(): array
     {
-        $domains   = \explode(',', $_SERVER['DOMAINS'] ?? 'default.example');
+        $domains   = $this->getDomains();
         $siteNames = \explode(',', $_SERVER['SITES'] ?? 'default');
         $sites     = [];
         foreach ($siteNames as $siteName) {