goinfinite · ntorga · Apr 1, 2025 · Mar 26, 2025 · Mar 26, 2025 · Mar 26, 2025
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -85,6 +85,7 @@
     "vhosts",
     "virtualhost",
     "webserver",
+    "zeroable",
     "zerolog",
     "Zerolog"
   ],

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,19 @@
 # Changelog
 
 ```log
+0.2.1 - 2025/04/01
+refactor: vhost and mapping infra implementation
+refactor: ssl watchdog
+refactor: delete service mappings
+feat: add mapping hostname and path to service mapping auto create
+feat: add support for wildcard vhosts
+feat: add custom response code to url mappings
+feat: add marketplace item reference to mappings
+fix: aliases addition replacing parent ssl
+fix: remove mappings and ssl files when vhost is deleted
+fix: move vhost aliases to parent row
+fix: remove vhost removal from ssl pair
+
 0.2.0 - 2025/03/25
 refactor(front): file manager with HTMX+Alpine.js
 fix: missing service name on mapping targetValue input

diff --git a/container/nginx/root/nginx.conf b/container/nginx/root/nginx.conf
@@ -44,8 +44,10 @@ http {
 
     ssl_stapling on;
     ssl_stapling_verify on;
-    resolver 8.8.8.8 9.9.9.9 1.1.1.1 valid=60s ipv6=off;
+    resolver 8.8.8.8 1.1.1.1 185.228.169.9 valid=60s ipv6=off;
     resolver_timeout 2s;
+
+    server_names_hash_bucket_size 128;
 
     include /app/conf/nginx/*.conf;
 }
diff --git a/src/domain/dto/createCustomService.go b/src/domain/dto/createCustomService.go
@@ -24,6 +24,8 @@ type CreateCustomService struct {
 	LogErrorPath      *valueObject.UnixFilePath   `json:"logErrorPath"`
 	AvatarUrl         *valueObject.Url            `json:"avatarUrl"`
 	AutoCreateMapping *bool                       `json:"autoCreateMapping"`
+	MappingHostname   *valueObject.Fqdn           `json:"mappingHostname"`
+	MappingPath       *valueObject.MappingPath    `json:"mappingPath"`
 	OperatorAccountId valueObject.AccountId       `json:"-"`
 	OperatorIpAddress valueObject.IpAddress       `json:"-"`
 }
@@ -43,6 +45,8 @@ func NewCreateCustomService(
 	logOutputPath, logErrorPath *valueObject.UnixFilePath,
 	avatarUrl *valueObject.Url,
 	autoCreateMapping *bool,
+	mappingHostname *valueObject.Fqdn,
+	mappingPath *valueObject.MappingPath,
 	operatorAccountId valueObject.AccountId,
 	operatorIpAddress valueObject.IpAddress,
 ) CreateCustomService {
@@ -68,6 +72,8 @@ func NewCreateCustomService(
 		LogErrorPath:      logErrorPath,
 		AvatarUrl:         avatarUrl,
 		AutoCreateMapping: autoCreateMapping,
+		MappingHostname:   mappingHostname,
+		MappingPath:       mappingPath,
 		OperatorAccountId: operatorAccountId,
 		OperatorIpAddress: operatorIpAddress,
 	}

diff --git a/src/domain/dto/createInstallableService.go b/src/domain/dto/createInstallableService.go
@@ -14,6 +14,8 @@ type CreateInstallableService struct {
 	AutoRestart       *bool                       `json:"autoRestart"`
 	MaxStartRetries   *uint                       `json:"maxStartRetries"`
 	AutoCreateMapping *bool                       `json:"autoCreateMapping"`
+	MappingHostname   *valueObject.Fqdn           `json:"mappingHostname"`
+	MappingPath       *valueObject.MappingPath    `json:"mappingPath"`
 	OperatorAccountId valueObject.AccountId       `json:"-"`
 	OperatorIpAddress valueObject.IpAddress       `json:"-"`
 }
@@ -30,6 +32,8 @@ func NewCreateInstallableService(
 	autoRestart *bool,
 	maxStartRetries *uint,
 	autoCreateMapping *bool,
+	mappingHostname *valueObject.Fqdn,
+	mappingPath *valueObject.MappingPath,
 	operatorAccountId valueObject.AccountId,
 	operatorIpAddress valueObject.IpAddress,
 ) CreateInstallableService {
@@ -45,6 +49,8 @@ func NewCreateInstallableService(
 		AutoRestart:       autoRestart,
 		MaxStartRetries:   maxStartRetries,
 		AutoCreateMapping: autoCreateMapping,
+		MappingHostname:   mappingHostname,
+		MappingPath:       mappingPath,
 		OperatorAccountId: operatorAccountId,
 		OperatorIpAddress: operatorIpAddress,
 	}

diff --git a/src/domain/dto/createPubliclyTrustedSslPair.go b/src/domain/dto/createPubliclyTrustedSslPair.go
@@ -0,0 +1,26 @@
+package dto
+
+import (
+	"github.com/goinfinite/os/src/domain/valueObject"
+)
+
+type CreatePubliclyTrustedSslPair struct {
+	CommonName        valueObject.Fqdn      `json:"commonName"`
+	AltNames          []valueObject.Fqdn    `json:"aliasesHostnames"`
+	OperatorAccountId valueObject.AccountId `json:"-"`
+	OperatorIpAddress valueObject.IpAddress `json:"-"`
+}
+
+func NewCreatePubliclyTrustedSslPair(
+	commonName valueObject.Fqdn,
+	altNames []valueObject.Fqdn,
+	operatorAccountId valueObject.AccountId,
+	operatorIpAddress valueObject.IpAddress,
+) CreatePubliclyTrustedSslPair {
+	return CreatePubliclyTrustedSslPair{
+		CommonName:        commonName,
+		AltNames:          altNames,
+		OperatorAccountId: operatorAccountId,
+		OperatorIpAddress: operatorIpAddress,
+	}
+}
diff --git a/src/domain/dto/createVirtualHost.go b/src/domain/dto/createVirtualHost.go
@@ -5,6 +5,7 @@ import "github.com/goinfinite/os/src/domain/valueObject"
 type CreateVirtualHost struct {
 	Hostname          valueObject.Fqdn            `json:"hostname"`
 	Type              valueObject.VirtualHostType `json:"type"`
+	IsWildcard        *bool                       `json:"isWildcard"`
 	ParentHostname    *valueObject.Fqdn           `json:"parentHostname"`
 	OperatorAccountId valueObject.AccountId       `json:"-"`
 	OperatorIpAddress valueObject.IpAddress       `json:"-"`
@@ -13,13 +14,15 @@ type CreateVirtualHost struct {
 func NewCreateVirtualHost(
 	hostname valueObject.Fqdn,
 	vhostType valueObject.VirtualHostType,
+	isWildcard *bool,
 	parentHostname *valueObject.Fqdn,
 	operatorAccountId valueObject.AccountId,
 	operatorIpAddress valueObject.IpAddress,
 ) CreateVirtualHost {
 	return CreateVirtualHost{
 		Hostname:          hostname,
 		Type:              vhostType,
+		IsWildcard:        isWildcard,
 		ParentHostname:    parentHostname,
 		OperatorAccountId: operatorAccountId,
 		OperatorIpAddress: operatorIpAddress,

diff --git a/src/domain/dto/deleteVirtualHost.go b/src/domain/dto/deleteVirtualHost.go
@@ -3,22 +3,19 @@ package dto
 import "github.com/goinfinite/os/src/domain/valueObject"
 
 type DeleteVirtualHost struct {
-	Hostname           valueObject.Fqdn      `json:"hostname"`
-	PrimaryVirtualHost valueObject.Fqdn      `json:"-"`
-	OperatorAccountId  valueObject.AccountId `json:"-"`
-	OperatorIpAddress  valueObject.IpAddress `json:"-"`
+	Hostname          valueObject.Fqdn      `json:"hostname"`
+	OperatorAccountId valueObject.AccountId `json:"-"`
+	OperatorIpAddress valueObject.IpAddress `json:"-"`
 }
 
 func NewDeleteVirtualHost(
 	hostname valueObject.Fqdn,
-	primaryVirtualHost valueObject.Fqdn,
 	operatorAccountId valueObject.AccountId,
 	operatorIpAddress valueObject.IpAddress,
 ) DeleteVirtualHost {
 	return DeleteVirtualHost{
-		Hostname:           hostname,
-		PrimaryVirtualHost: primaryVirtualHost,
-		OperatorAccountId:  operatorAccountId,
-		OperatorIpAddress:  operatorIpAddress,
+		Hostname:          hostname,
+		OperatorAccountId: operatorAccountId,
+		OperatorIpAddress: operatorIpAddress,
 	}
 }
diff --git a/src/domain/dto/pagination.go b/src/domain/dto/pagination.go
@@ -2,6 +2,16 @@ package dto
 
 import "github.com/goinfinite/os/src/domain/valueObject"
 
+var PaginationSingleItem = Pagination{
+	PageNumber:   0,
+	ItemsPerPage: 1,
+}
+
+var PaginationUnpaginated = Pagination{
+	PageNumber:   0,
+	ItemsPerPage: 1000,
+}
+
 type Pagination struct {
 	PageNumber    uint32                               `json:"pageNumber"`
 	ItemsPerPage  uint16                               `json:"itemsPerPage"`

diff --git a/src/domain/dto/readMappings.go b/src/domain/dto/readMappings.go
@@ -0,0 +1,24 @@
+package dto
+
+import (
+	"github.com/goinfinite/os/src/domain/entity"
+	"github.com/goinfinite/os/src/domain/valueObject"
+)
+
+type ReadMappingsRequest struct {
+	Pagination             Pagination                       `json:"pagination"`
+	MappingId              *valueObject.MappingId           `json:"mappingId"`
+	Hostname               *valueObject.Fqdn                `json:"hostname"`
+	MappingPath            *valueObject.MappingPath         `json:"mappingPath"`
+	MatchPattern           *valueObject.MappingMatchPattern `json:"matchPattern"`
+	TargetType             *valueObject.MappingTargetType   `json:"targetType"`
+	TargetValue            *valueObject.MappingTargetValue  `json:"targetValue"`
+	TargetHttpResponseCode *valueObject.HttpResponseCode    `json:"targetHttpResponseCode"`
+	CreatedBeforeAt        *valueObject.UnixTime            `json:"createdBeforeAt"`
+	CreatedAfterAt         *valueObject.UnixTime            `json:"createdAfterAt"`
+}
+
+type ReadMappingsResponse struct {
+	Pagination Pagination       `json:"pagination"`
+	Mappings   []entity.Mapping `json:"mappings"`
+}
diff --git a/src/domain/dto/readVirtualHosts.go b/src/domain/dto/readVirtualHosts.go
@@ -0,0 +1,31 @@
+package dto
+
+import (
+	"github.com/goinfinite/os/src/domain/entity"
+	"github.com/goinfinite/os/src/domain/valueObject"
+)
+
+type ReadVirtualHostsRequest struct {
+	Pagination       Pagination                   `json:"pagination"`
+	Hostname         *valueObject.Fqdn            `json:"hostname"`
+	VirtualHostType  *valueObject.VirtualHostType `json:"type"`
+	RootDirectory    *valueObject.UnixFilePath    `json:"rootDirectory"`
+	ParentHostname   *valueObject.Fqdn            `json:"parentHostname"`
+	WithMappings     *bool                        `json:"withMappings"`
+	IsWildcard       *bool                        `json:"isWildcard"`
+	IsPrimary        *bool                        `json:"-"`
+	AliasesHostnames []valueObject.Fqdn           `json:"aliasesHostnames"`
+	CreatedBeforeAt  *valueObject.UnixTime        `json:"createdBeforeAt"`
+	CreatedAfterAt   *valueObject.UnixTime        `json:"createdAfterAt"`
+}
+
+type VirtualHostWithMappings struct {
+	entity.VirtualHost
+	Mappings []entity.Mapping `json:"mappings"`
+}
+
+type ReadVirtualHostsResponse struct {
+	Pagination              Pagination                `json:"pagination"`
+	VirtualHosts            []entity.VirtualHost      `json:"virtualHosts"`
+	VirtualHostWithMappings []VirtualHostWithMappings `json:"virtualHostWithMappings"`
+}
diff --git a/src/domain/dto/replaceWithValidSsl.go b/src/domain/dto/replaceWithValidSsl.go
diff --git a/src/domain/dto/updateVirtualHost.go b/src/domain/dto/updateVirtualHost.go
@@ -0,0 +1,24 @@
+package dto
+
+import "github.com/goinfinite/os/src/domain/valueObject"
+
+type UpdateVirtualHost struct {
+	Hostname          valueObject.Fqdn      `json:"hostname"`
+	IsWildcard        *bool                 `json:"isWildcard"`
+	OperatorAccountId valueObject.AccountId `json:"-"`
+	OperatorIpAddress valueObject.IpAddress `json:"-"`
+}
+
+func NewUpdateVirtualHost(
+	hostname valueObject.Fqdn,
+	isWildcard *bool,
+	operatorAccountId valueObject.AccountId,
+	operatorIpAddress valueObject.IpAddress,
+) UpdateVirtualHost {
+	return UpdateVirtualHost{
+		Hostname:          hostname,
+		IsWildcard:        isWildcard,
+		OperatorAccountId: operatorAccountId,
+		OperatorIpAddress: operatorIpAddress,
+	}
+}
diff --git a/src/domain/dto/virtualHostWithMappings.go b/src/domain/dto/virtualHostWithMappings.go
diff --git a/src/domain/entity/mapping.go b/src/domain/entity/mapping.go
@@ -3,13 +3,17 @@ package entity
 import "github.com/goinfinite/os/src/domain/valueObject"
 
 type Mapping struct {
-	Id                     valueObject.MappingId           `json:"id"`
-	Hostname               valueObject.Fqdn                `json:"-"`
-	Path                   valueObject.MappingPath         `json:"path"`
-	MatchPattern           valueObject.MappingMatchPattern `json:"matchPattern"`
-	TargetType             valueObject.MappingTargetType   `json:"targetType"`
-	TargetValue            *valueObject.MappingTargetValue `json:"targetValue"`
-	TargetHttpResponseCode *valueObject.HttpResponseCode   `json:"targetHttpResponseCode"`
+	Id                           valueObject.MappingId            `json:"id"`
+	Hostname                     valueObject.Fqdn                 `json:"-"`
+	Path                         valueObject.MappingPath          `json:"path"`
+	MatchPattern                 valueObject.MappingMatchPattern  `json:"matchPattern"`
+	TargetType                   valueObject.MappingTargetType    `json:"targetType"`
+	TargetValue                  *valueObject.MappingTargetValue  `json:"targetValue"`
+	TargetHttpResponseCode       *valueObject.HttpResponseCode    `json:"targetHttpResponseCode"`
+	MarketplaceInstalledItemId   *valueObject.MarketplaceItemId   `json:"marketplaceInstalledItemId"`
+	MarketplaceInstalledItemName *valueObject.MarketplaceItemName `json:"marketplaceInstalledItemName"`
+	CreatedAt                    valueObject.UnixTime             `json:"createdAt"`
+	UpdatedAt                    valueObject.UnixTime             `json:"updatedAt"`
 }
 
 func NewMapping(
@@ -20,14 +24,22 @@ func NewMapping(
 	targetType valueObject.MappingTargetType,
 	targetValue *valueObject.MappingTargetValue,
 	targetHttpResponseCode *valueObject.HttpResponseCode,
+	marketplaceInstalledItemId *valueObject.MarketplaceItemId,
+	marketplaceInstalledItemName *valueObject.MarketplaceItemName,
+	createdAt valueObject.UnixTime,
+	updatedAt valueObject.UnixTime,
 ) Mapping {
 	return Mapping{
-		Id:                     id,
-		Hostname:               hostname,
-		Path:                   path,
-		MatchPattern:           matchPattern,
-		TargetType:             targetType,
-		TargetValue:            targetValue,
-		TargetHttpResponseCode: targetHttpResponseCode,
+		Id:                           id,
+		Hostname:                     hostname,
+		Path:                         path,
+		MatchPattern:                 matchPattern,
+		TargetType:                   targetType,
+		TargetValue:                  targetValue,
+		TargetHttpResponseCode:       targetHttpResponseCode,
+		MarketplaceInstalledItemId:   marketplaceInstalledItemId,
+		MarketplaceInstalledItemName: marketplaceInstalledItemName,
+		CreatedAt:                    createdAt,
+		UpdatedAt:                    updatedAt,
 	}
 }