From f65f15af0172c94a03507920134ede18610c9613 Mon Sep 17 00:00:00 2001 From: Teagan glenn Date: Sat, 29 Jun 2024 22:46:21 +0000 Subject: [PATCH] feat(streams): Remove schema for host,ipv4,ipv6 with port --- backend/schema/endpoints/streams.json | 34 +-------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/backend/schema/endpoints/streams.json b/backend/schema/endpoints/streams.json index b0773525..da3de83e 100644 --- a/backend/schema/endpoints/streams.json +++ b/backend/schema/endpoints/streams.json @@ -20,18 +20,6 @@ "minimum": 1, "maximum": 65535 }, - "domain_name_port": { - "type": "string", - "pattern": "^(?:[^.*:]+\\.?)+[^.]:(?:(?:6553[0-5])|(?:655[0-2][0-9])|(?:65[0-4][0-9]{2})|(?:6[0-4][0-9]{3})|(?:[1-5][0-9]{4})|(?:[0-9]{1,4}))$" - }, - "ipv4_port": { - "type": "string", - "pattern": "^(?:\\b25[0-5]|\\b2[0-4][0-9]|\\b[01]?[0-9][0-9]?)(?:\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}:(?:(?:6553[0-5])|(?:655[0-2][0-9])|(?:65[0-4][0-9]{2})|(?:6[0-4][0-9]{3})|(?:[1-5][0-9]{4})|(?:[0-9]{1,4}))$" - }, - "ipv6_port": { - "type": "string", - "pattern": "^(?:(?:[0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|(?:[0-9a-fA-F]{1,4}:){1,7}:|(?:[0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|(?:[0-9a-fA-F]{1,4}:){1,5}(?::[0-9a-fA-F]{1,4}){1,2}|(?:[0-9a-fA-F]{1,4}:){1,4}(?::[0-9a-fA-F]{1,4}){1,3}|(?:[0-9a-fA-F]{1,4}:){1,3}(?::[0-9a-fA-F]{1,4}){1,4}|(?:[0-9a-fA-F]{1,4}:){1,2}(?::[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:(?:(?::[0-9a-fA-F]{1,4}){1,6})|:(?:(?::[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(?::[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(?:ffff(:0{1,4}){0,1}:){0,1}(?:(?:25[0-5]|(?:2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(?:25[0-5]|(?:2[0-4]|1{0,1}[0-9]){0,1}[0-9])|(?:[0-9a-fA-F]{1,4}:){1,4}:(?:(?:25[0-5]|(?:2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(?:25[0-5]|(?:2[0-4]|1{0,1}[0-9]){0,1}[0-9])):(?:(?:6553[0-5])|(?:655[0-2][0-9])|(?:65[0-4][0-9]{2})|(?:6[0-4][0-9]{3})|(?:[1-5][0-9]{4})|(?:[0-9]{1,4}))$" - }, "host": { "anyOf": [ { @@ -47,19 +35,6 @@ } ] }, - "host_port": { - "anyOf": [ - { - "$ref": "#/definitions/domain_name_port" - }, - { - "$ref": "#/definitions/ipv4_port" - }, - { - "$ref": "#/definitions/ipv6_port" - } - ] - }, "forwarding_hosts": { "anyOf": [ { @@ -71,14 +46,7 @@ "maxItems": 15, "uniqueItems": true, "items": { - "anyOf": [ - { - "$ref": "#/definitions/host" - }, - { - "$ref": "#/definitions/host_port" - } - ] + "$ref": "#/definitions/host" } } ]