plain.dev 0.29.1__py3-none-any.whl → 0.29.2__py3-none-any.whl

plain/dev/cli.py

@@ -145,14 +145,13 @@ class Dev:
         self.plain_env = {
             "PYTHONUNBUFFERED": "true",
             "PLAIN_DEV": "true",
+            **os.environ,
         }
 
         if log_level:
             self.plain_env["PLAIN_LOG_LEVEL"] = log_level.upper()
             self.plain_env["APP_LOG_LEVEL"] = log_level.upper()
 
-        self.plain_env.update(os.environ)
-
         self.custom_process_env = {
             **self.plain_env,
             "PORT": str(self.port),
@@ -202,7 +201,7 @@ class Dev:
 
         self.symlink_plain_src()
         self.modify_hosts_file()
-        self.set_csrf_and_allowed_hosts()
+        self.set_allowed_hosts()
         self.run_preflight()
 
         # If we start services ourselves, we should manage the pidfile
@@ -355,22 +354,13 @@ class Dev:
                 )
                 sys.exit(1)
 
-    def set_csrf_and_allowed_hosts(self):
-        if "PLAIN_CSRF_TRUSTED_ORIGINS" not in os.environ:
-            csrf_trusted_origins = json.dumps(
-                [
-                    self.url,
-                ]
-            )
-            self.plain_env["PLAIN_CSRF_TRUSTED_ORIGINS"] = csrf_trusted_origins
-            self.custom_process_env["PLAIN_CSRF_TRUSTED_ORIGINS"] = csrf_trusted_origins
-            click.secho(
-                f"Automatically set PLAIN_CSRF_TRUSTED_ORIGINS={csrf_trusted_origins}",
-                dim=True,
-            )
-
+    def set_allowed_hosts(self):
         if "PLAIN_ALLOWED_HOSTS" not in os.environ:
-            allowed_hosts = json.dumps([self.hostname])
+            hostnames = [self.hostname]
+            if self.tunnel_url:
+                # Add the tunnel URL to the allowed hosts
+                hostnames.append(self.tunnel_url.split("://")[1])
+            allowed_hosts = json.dumps(hostnames)
             self.plain_env["PLAIN_ALLOWED_HOSTS"] = allowed_hosts
             self.custom_process_env["PLAIN_ALLOWED_HOSTS"] = allowed_hosts
             click.secho(

{plain_dev-0.29.1.dist-info → plain_dev-0.29.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.dev
-Version: 0.29.1
+Version: 0.29.2
 Summary: Local development tools for Plain.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-Expression: BSD-3-Clause

{plain_dev-0.29.1.dist-info → plain_dev-0.29.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 plain/dev/README.md,sha256=EQJ9lF-JQ9KQWJZ_j6CD3jbRquOLgDRlIPbgT7A2gG4,3658
 plain/dev/__init__.py,sha256=nRX1B0Br8gmqhJLqo5Z9PqzReDahBtbmwH6C-7hzuls,103
-plain/dev/cli.py,sha256=5rh-CSVmdcfBM6RrSD1SCUB0lYEb94NOmAd8LXicZr0,15678
+plain/dev/cli.py,sha256=TqL2eDM5_0Sv_GcIpT5O0sbrvWIgiwMU6ZPyLZJ9qUs,15324
 plain/dev/debug.py,sha256=Ka84K8zUdF0kMYNyqiLYDrdzU1jU8LSOkts3hcw_Gok,1005
 plain/dev/default_settings.py,sha256=uXWYORWP_aRDwXIFXdu5kHyiBFUZzARIJdhPeFaX35c,75
 plain/dev/entrypoints.py,sha256=diqNwA6eydUMtoO7p_rH-DtSYsw5-GBmjFe1Z5bHagc,579
@@ -24,8 +24,8 @@ plain/dev/poncho/process.py,sha256=JJOKy-C6vMCg7-6JMCtu6C649h7HmOBSJqDP_hnX49I,2
 plain/dev/precommit/__init__.py,sha256=9ByBOIdM8DebChjNz-RH2atdz4vWe8somlwNEsbhwh4,40
 plain/dev/precommit/cli.py,sha256=KVHcG3Y_JZJNu3_MLIrO5s6yMYQfAArIU5L0hNWZUjg,3441
 plain/dev/templates/dev/requests.html,sha256=kQKJZq5L77juuL_t8UjcAehEU61U4RXNnKaAET-wAm8,7627
-plain_dev-0.29.1.dist-info/METADATA,sha256=xKFUKIWICvxJCwQwdok-X13y8-_lP2CORyE9HBjRFbo,4163
-plain_dev-0.29.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain_dev-0.29.1.dist-info/entry_points.txt,sha256=zrcTOiFk_MLKsnYVlwVP7aMm1XLEqq7w4EBkJ-3ge-g,114
-plain_dev-0.29.1.dist-info/licenses/LICENSE,sha256=Cx4Dq9yR2fLHthf8Ke36B8QJvE1bZFXVzDIGE8wGzsY,4132
-plain_dev-0.29.1.dist-info/RECORD,,
+plain_dev-0.29.2.dist-info/METADATA,sha256=jgWka03LvNVb8qv2UcBRzqZMmxGOf_gGrQ_eqgJ-JHY,4163
+plain_dev-0.29.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain_dev-0.29.2.dist-info/entry_points.txt,sha256=zrcTOiFk_MLKsnYVlwVP7aMm1XLEqq7w4EBkJ-3ge-g,114
+plain_dev-0.29.2.dist-info/licenses/LICENSE,sha256=Cx4Dq9yR2fLHthf8Ke36B8QJvE1bZFXVzDIGE8wGzsY,4132
+plain_dev-0.29.2.dist-info/RECORD,,