akanealw/Charon
1
0
Fork 0
Code Issues Pull Requests Actions 16 Packages Projects Releases Wiki Activity

fix: update access list handling in ProxyHostService and forms to support access_list structure

Browse Source
This commit is contained in:
GitHub Actions
2026-02-28 05:11:33 +00:00
parent b04b94e429
commit cdf7948575
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/internal/services/proxyhost_service.go
View File

@@ -227,7 +227,7 @@ func (s *ProxyHostService) GetByID(id uint) (*models.ProxyHost, error) {
// GetByUUID finds a proxy host by UUID.
func (s *ProxyHostService) GetByUUID(uuidStr string) (*models.ProxyHost, error) {
var host models.ProxyHost
if err := s.db.Preload("Locations").Preload("Certificate").Preload("SecurityHeaderProfile").Where("uuid = ?", uuidStr).First(&host).Error; err != nil {
if err := s.db.Preload("Locations").Preload("Certificate").Preload("AccessList").Preload("SecurityHeaderProfile").Where("uuid = ?", uuidStr).First(&host).Error; err != nil {
return nil, err
}
return &host, nil
@@ -236,7 +236,7 @@ func (s *ProxyHostService) GetByUUID(uuidStr string) (*models.ProxyHost, error)
// List returns all proxy hosts.
func (s *ProxyHostService) List() ([]models.ProxyHost, error) {
var hosts []models.ProxyHost
if err := s.db.Preload("Locations").Preload("Certificate").Preload("SecurityHeaderProfile").Order("updated_at desc").Find(&hosts).Error; err != nil {
if err := s.db.Preload("Locations").Preload("Certificate").Preload("AccessList").Preload("SecurityHeaderProfile").Order("updated_at desc").Find(&hosts).Error; err != nil {
return nil, err
}
return hosts, nil

6
frontend/src/api/proxyHosts.ts
View File

@@ -43,6 +43,12 @@ export interface ProxyHost {
certificate_id?: number | null;
certificate?: Certificate | null;
access_list_id?: number | string | null;
access_list?: {
uuid: string;
name: string;
description: string;
type: string;
} | null;
security_header_profile_id?: number | null;
dns_provider_id?: number | null;
security_header_profile?: {

2
frontend/src/components/ProxyHostForm.tsx
View File

@@ -123,7 +123,7 @@ function buildInitialFormData(host?: ProxyHost): Partial<ProxyHost> & {
advanced_config: host?.advanced_config || '',
enabled: host?.enabled ?? true,
certificate_id: host?.certificate_id,
access_list_id: host?.access_list_id,
access_list_id: host?.access_list?.uuid ?? host?.access_list_id,
security_header_profile_id: host?.security_header_profile_id,
dns_provider_id: host?.dns_provider_id || null,
}