Merge pull request #801 from traPtitech/domain-availability

Domain availability
traPtitech · Dec 4, 2023 · ae4c3c0 · ae4c3c0
2 parents 399d043 + dda6f08
commit ae4c3c0
Show file tree

Hide file tree

Showing 9 changed files with 890 additions and 797 deletions.
diff --git a/api/proto/neoshowcase/protobuf/gateway.proto b/api/proto/neoshowcase/protobuf/gateway.proto
@@ -19,6 +19,8 @@ message AvailableDomain {
   string domain = 1;
   repeated string exclude_domains = 2;
   bool auth_available = 3;
+  // already_bound ドメインが他のアプリケーションによって専有されているか
+  bool already_bound = 4;
 }
 
 message AvailablePort {

diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go
diff --git a/dashboard/src/api/neoshowcase/protobuf/gateway_pb.ts b/dashboard/src/api/neoshowcase/protobuf/gateway_pb.ts
@@ -179,6 +179,13 @@ export class AvailableDomain extends Message<AvailableDomain> {
    */
   authAvailable = false;
 
+  /**
+   * already_bound ドメインが他のアプリケーションによって専有されているか
+   *
+   * @generated from field: bool already_bound = 4;
+   */
+  alreadyBound = false;
+
   constructor(data?: PartialMessage<AvailableDomain>) {
     super();
     proto3.util.initPartial(data, this);
@@ -190,6 +197,7 @@ export class AvailableDomain extends Message<AvailableDomain> {
     { no: 1, name: "domain", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 2, name: "exclude_domains", kind: "scalar", T: 9 /* ScalarType.STRING */, repeated: true },
     { no: 3, name: "auth_available", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
+    { no: 4, name: "already_bound", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): AvailableDomain {

diff --git a/dashboard/src/components/WebsiteSettings.tsx b/dashboard/src/components/WebsiteSettings.tsx
@@ -177,7 +177,7 @@ export const WebsiteSettings = (props: WebsiteSettingsProps) => {
       <AvailableDomainContainer>
         使用可能なホスト
         <AvailableDomainUl>
-          <For each={systemInfo()?.domains || []}>
+          <For each={systemInfo()?.domains.filter((ad) => !ad.alreadyBound) || []}>
             {(domain) => (
               <li>
                 {domain.domain}

diff --git a/pkg/domain/app_website.go b/pkg/domain/app_website.go
@@ -66,6 +66,7 @@ type AvailableDomain struct {
 	Domain         string
 	ExcludeDomains []string
 	AuthAvailable  bool
+	AlreadyBound   bool // Actual availability (whether domain is bound to a specific app or not)
 }
 
 type AvailableDomainSlice []*AvailableDomain
@@ -85,6 +86,19 @@ func (a *AvailableDomain) Validate() error {
 	return nil
 }
 
+func (a *AvailableDomain) SetAlreadyBound(existing []*Application) {
+	if strings.HasPrefix(a.Domain, "*.") {
+		// Wildcard domain cannot be bound to one app, it has infinite number of subdomains
+		a.AlreadyBound = false
+	} else {
+		a.AlreadyBound = lo.ContainsBy(existing, func(app *Application) bool {
+			return lo.ContainsBy(app.Websites, func(w *Website) bool {
+				return w.FQDN == a.Domain && w.PathPrefix == "/" // Intentional vague checking of http or https
+			})
+		})
+	}
+}
+
 func (a *AvailableDomain) Match(fqdn string) bool {
 	for _, excludeDomain := range a.ExcludeDomains {
 		if ContainsDomain(excludeDomain, fqdn) {

diff --git a/pkg/domain/app_website_test.go b/pkg/domain/app_website_test.go
@@ -66,6 +66,50 @@ func TestAvailableDomain_Validate(t *testing.T) {
 	}
 }
 
+func TestAvailableDomain_SetAlreadyBound(t *testing.T) {
+	tests := []struct {
+		name     string
+		domain   string
+		existing *Website
+		want     bool
+	}{
+		{
+			name:     "Wildcard cannot be bound to one app",
+			domain:   "*.example.com",
+			existing: &Website{FQDN: "app.example.com", PathPrefix: "/"},
+			want:     false,
+		},
+		{
+			name:     "Bound to an app",
+			domain:   "app.example.com",
+			existing: &Website{FQDN: "app.example.com", PathPrefix: "/"},
+			want:     true,
+		},
+		{
+			name:     "Bound to a different domain",
+			domain:   "app.example.com",
+			existing: &Website{FQDN: "app2.example.com", PathPrefix: "/"},
+			want:     false,
+		},
+		{
+			name:     "Bound to path subset",
+			domain:   "app.example.com",
+			existing: &Website{FQDN: "app.example.com", PathPrefix: "/prefix"},
+			want:     false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			a := &AvailableDomain{
+				Domain: tt.domain,
+			}
+			a.SetAlreadyBound([]*Application{{Websites: []*Website{tt.existing}}})
+			assert.Equal(t, tt.want, a.AlreadyBound)
+		})
+	}
+}
+
 func TestAvailableDomain_Match(t *testing.T) {
 	simpleTests := []struct {
 		name   string

diff --git a/pkg/infrastructure/grpc/controller_service.go b/pkg/infrastructure/grpc/controller_service.go
@@ -20,6 +20,7 @@ import (
 
 type ControllerService struct {
 	backend    domain.Backend
+	appRepo    domain.ApplicationRepository
 	fetcher    repofetcher.Service
 	cd         cdservice.Service
 	builder    domain.ControllerBuilderService
@@ -31,6 +32,7 @@ type ControllerService struct {
 
 func NewControllerService(
 	backend domain.Backend,
+	appRepo domain.ApplicationRepository,
 	fetcher repofetcher.Service,
 	cd cdservice.Service,
 	builder domain.ControllerBuilderService,
@@ -41,6 +43,7 @@ func NewControllerService(
 ) pbconnect.ControllerServiceHandler {
 	return &ControllerService{
 		backend:    backend,
+		appRepo:    appRepo,
 		fetcher:    fetcher,
 		cd:         cd,
 		builder:    builder,
@@ -53,7 +56,16 @@ func NewControllerService(
 
 func (s *ControllerService) GetSystemInfo(_ context.Context, _ *connect.Request[emptypb.Empty]) (*connect.Response[pb.SystemInfo], error) {
 	domains := s.backend.AvailableDomains()
+	existingApps, err := s.appRepo.GetApplications(context.Background(), domain.GetApplicationCondition{})
+	if err != nil {
+		return nil, err
+	}
+	for _, ad := range domains {
+		ad.SetAlreadyBound(existingApps)
+	}
+
 	ports := s.backend.AvailablePorts()
+
 	res := connect.NewResponse(&pb.SystemInfo{
 		PublicKey: domain.Base64EncodedPublicKey(s.pubKey.Signer.PublicKey()) + " neoshowcase",
 		Ssh: &pb.SSHInfo{