lib: make sure portal's host is not empty

truenas · Oct 17, 2024 · a481e8f · a481e8f
1 parent 05eab60
commit a481e8f
Show file tree

Hide file tree

Showing 15 changed files with 7 additions and 5 deletions.
diff --git a/library/1.1.4/__init__.py → library/1.1.5/__init__.py b/library/1.1.4/__init__.py → library/1.1.5/__init__.py
diff --git a/library/1.1.4/environment.py → library/1.1.5/environment.py b/library/1.1.4/environment.py → library/1.1.5/environment.py
diff --git a/library/1.1.4/healthchecks.py → library/1.1.5/healthchecks.py b/library/1.1.4/healthchecks.py → library/1.1.5/healthchecks.py
diff --git a/library/1.1.4/mariadb.py → library/1.1.5/mariadb.py b/library/1.1.4/mariadb.py → library/1.1.5/mariadb.py
diff --git a/library/1.1.4/metadata.py → library/1.1.5/metadata.py b/library/1.1.4/metadata.py → library/1.1.5/metadata.py
@@ -40,6 +40,9 @@ def get_portals(portals: list):
  name = portal.get("name", "Web UI")
  scheme = portal.get("scheme", "http")
  path = portal.get("path", "/")
+ host = portal.get("host", "0.0.0.0")
+ if not host: # In case it is set to ""
+ host = "0.0.0.0"
 
  if not name:
  utils.throw_error("Expected [portal.name] to be set")
@@ -54,15 +57,13 @@ def get_portals(portals: list):
  if not portal.get("port"):
  utils.throw_error("Expected [portal.port] to be set")
  if not path.startswith("/"):
- utils.throw_error(
- f"Expected [portal.path] to start with /, got [{portal['path']}]"
- )
+ utils.throw_error(f"Expected [portal.path] to start with [/], got [{portal['path']}]")
 
  result.append(
  {
  "name": name,
  "scheme": scheme,
- "host": portal.get("host", "0.0.0.0"),
+ "host": host,
  "port": portal["port"],
  "path": path,
  }

diff --git a/library/1.1.4/network.py → library/1.1.5/network.py b/library/1.1.4/network.py → library/1.1.5/network.py
diff --git a/library/1.1.4/permissions.py → library/1.1.5/permissions.py b/library/1.1.4/permissions.py → library/1.1.5/permissions.py
diff --git a/library/1.1.4/ports.py → library/1.1.5/ports.py b/library/1.1.4/ports.py → library/1.1.5/ports.py
diff --git a/library/1.1.4/postgres.py → library/1.1.5/postgres.py b/library/1.1.4/postgres.py → library/1.1.5/postgres.py
diff --git a/library/1.1.4/redis.py → library/1.1.5/redis.py b/library/1.1.4/redis.py → library/1.1.5/redis.py
diff --git a/library/1.1.4/resources.py → library/1.1.5/resources.py b/library/1.1.4/resources.py → library/1.1.5/resources.py
diff --git a/library/1.1.4/security.py → library/1.1.5/security.py b/library/1.1.4/security.py → library/1.1.5/security.py
diff --git a/library/1.1.4/storage.py → library/1.1.5/storage.py b/library/1.1.4/storage.py → library/1.1.5/storage.py
diff --git a/library/1.1.4/utils.py → library/1.1.5/utils.py b/library/1.1.4/utils.py → library/1.1.5/utils.py
diff --git a/library/hashes.yaml b/library/hashes.yaml
@@ -1,2 +1,3 @@
 0.0.1: f074617a82a86d2a6cc78a4c8a4296fc9d168e456f12713e50c696557b302133
-1.1.4: 6e32ff5969906d9c3a10fea2b17fdd3197afb052d3432344da03188d8a907113
+1.1.5: ddd86a8541b457e46c684ffbea0c5dab549e139bf574efb0e9553e5e4f78bbe4
+2.0.0: 903dd80c3d8e5aee64b09612ba149f55fc6a8ab041357340d6f981f1748c618f