DYNR/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-03-31 06:24:18 -04:00
Code Issues Packages Projects Releases 10 Wiki Activity

[management, proxy] Add require_subdomain capability for proxy clusters (#5628)

Browse Source
This commit is contained in:
Viktor Liu
2026-03-20 18:29:50 +08:00
committed by GitHub
parent ab77508950
commit b550a2face
19 changed files with 419 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shared/management/http/api/openapi.yml
View File

@@ -3336,6 +3336,10 @@ components:
type: boolean
description: Whether the cluster supports binding arbitrary TCP/UDP ports
example: true
require_subdomain:
type: boolean
description: Whether a subdomain label is required in front of this domain. When true, the domain cannot be used bare.
example: false
required:
- id
- domain

3
shared/management/http/api/types.gen.go
View File

@@ -3406,6 +3406,9 @@ type ReverseProxyDomain struct {
// Id Domain ID
Id string `json:"id"`
// RequireSubdomain Whether a subdomain label is required in front of this domain. When true, the domain cannot be used bare.
RequireSubdomain *bool `json:"require_subdomain,omitempty"`
// SupportsCustomPorts Whether the cluster supports binding arbitrary TCP/UDP ports
SupportsCustomPorts *bool `json:"supports_custom_ports,omitempty"`

22
shared/management/proto/proxy_service.pb.go
View File

@@ -181,8 +181,11 @@ type ProxyCapabilities struct {
state protoimpl.MessageState `protogen:"open.v1"`
// Whether the proxy can bind arbitrary ports for TCP/UDP/TLS services.
SupportsCustomPorts *bool `protobuf:"varint,1,opt,name=supports_custom_ports,json=supportsCustomPorts,proto3,oneof" json:"supports_custom_ports,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
// Whether the proxy requires a subdomain label in front of its cluster domain.
// When true, tenants cannot use the cluster domain bare.
RequireSubdomain *bool `protobuf:"varint,2,opt,name=require_subdomain,json=requireSubdomain,proto3,oneof" json:"require_subdomain,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
func (x *ProxyCapabilities) Reset() {
@@ -222,6 +225,13 @@ func (x *ProxyCapabilities) GetSupportsCustomPorts() bool {
return false
}
func (x *ProxyCapabilities) GetRequireSubdomain() bool {
if x != nil && x.RequireSubdomain != nil {
return *x.RequireSubdomain
}
return false
}
// GetMappingUpdateRequest is sent to initialise a mapping stream.
type GetMappingUpdateRequest struct {
state protoimpl.MessageState `protogen:"open.v1"`
@@ -1872,10 +1882,12 @@ var File_proxy_service_proto protoreflect.FileDescriptor
const file_proxy_service_proto_rawDesc = "" +
"\n" +
"\x13proxy_service.proto\x12\n" +
"management\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"f\n" +
"management\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xae\x01\n" +
"\x11ProxyCapabilities\x127\n" +
"\x15supports_custom_ports\x18\x01 \x01(\bH\x00R\x13supportsCustomPorts\x88\x01\x01B\x18\n" +
"\x16_supports_custom_ports\"\xe6\x01\n" +
"\x15supports_custom_ports\x18\x01 \x01(\bH\x00R\x13supportsCustomPorts\x88\x01\x01\x120\n" +
"\x11require_subdomain\x18\x02 \x01(\bH\x01R\x10requireSubdomain\x88\x01\x01B\x18\n" +
"\x16_supports_custom_portsB\x14\n" +
"\x12_require_subdomain\"\xe6\x01\n" +
"\x17GetMappingUpdateRequest\x12\x19\n" +
"\bproxy_id\x18\x01 \x01(\tR\aproxyId\x12\x18\n" +
"\aversion\x18\x02 \x01(\tR\aversion\x129\n" +

3
shared/management/proto/proxy_service.proto
View File

@@ -31,6 +31,9 @@ service ProxyService {
message ProxyCapabilities {
// Whether the proxy can bind arbitrary ports for TCP/UDP/TLS services.
optional bool supports_custom_ports = 1;
// Whether the proxy requires a subdomain label in front of its cluster domain.
// When true, accounts cannot use the cluster domain bare.
optional bool require_subdomain = 2;
}
// GetMappingUpdateRequest is sent to initialise a mapping stream.