-
-
Notifications
You must be signed in to change notification settings - Fork 0
Proxy Host ACL and Security Headers drop down hotfix #776
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
75d945f
fix: ensure ACL and Security Headers dropdown selections persist corr…
actions-user c9e4916
fix: update SelectContent styles to improve z-index and pointer event…
actions-user 5c0185d
Merge branch 'development' into feature/beta-release
Wikid82 2024ad1
fix: enhance AccessListSelector and ProxyHostForm to support UUID-onl…
actions-user 5c4a558
chore: enhance ACL handling in dropdowns and add emergency token flows
actions-user 6ed8d80
fix: update getOptionToken to handle string IDs correctly
actions-user bf58392
fix: improve ID parsing logic in AccessListSelector and ProxyHostForm…
actions-user 0ff19f6
fix: update resolveAccessListToken to handle accessLists and improve …
actions-user b04b94e
fix: enhance access list handling in ProxyHostHandler and forms to su…
actions-user cdf7948
fix: update access list handling in ProxyHostService and forms to sup…
actions-user 5fe1cf9
fix: enhance security header profile handling in ProxyHost to support…
actions-user be279ba
fix: update oxc-resolver package versions to 11.19.1 in package-lock.…
actions-user 25443d3
fix(deps): update module github.com/gin-gonic/gin to v1.12.0
renovate[bot] de7861a
Merge pull request #777 from Wikid82/renovate/feature/beta-release-no…
Wikid82 89281c4
fix: add UUID validation in resolveSecurityHeaderProfileReference method
actions-user 10f5e5d
chore: enhance coverage for AccessListSelector and ProxyHostForm comp…
actions-user File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -130,6 +130,7 @@ func generateForwardHostWarnings(forwardHost string) []ProxyHostWarning { | |
| // ProxyHostHandler handles CRUD operations for proxy hosts. | ||
| type ProxyHostHandler struct { | ||
| service *services.ProxyHostService | ||
| db *gorm.DB | ||
| caddyManager *caddy.Manager | ||
| notificationService *services.NotificationService | ||
| uptimeService *services.UptimeService | ||
|
|
@@ -183,6 +184,74 @@ func parseNullableUintField(value any, fieldName string) (*uint, bool, error) { | |
| } | ||
| } | ||
|
|
||
| func (h *ProxyHostHandler) resolveAccessListReference(value any) (*uint, error) { | ||
| if value == nil { | ||
| return nil, nil | ||
| } | ||
|
|
||
| parsedID, _, parseErr := parseNullableUintField(value, "access_list_id") | ||
| if parseErr == nil { | ||
| return parsedID, nil | ||
| } | ||
|
|
||
| uuidValue, isString := value.(string) | ||
| if !isString { | ||
| return nil, parseErr | ||
| } | ||
|
|
||
| trimmed := strings.TrimSpace(uuidValue) | ||
| if trimmed == "" { | ||
| return nil, nil | ||
| } | ||
|
|
||
| var acl models.AccessList | ||
| if err := h.db.Select("id").Where("uuid = ?", trimmed).First(&acl).Error; err != nil { | ||
| if err == gorm.ErrRecordNotFound { | ||
| return nil, fmt.Errorf("access list not found") | ||
| } | ||
| return nil, fmt.Errorf("failed to resolve access list") | ||
| } | ||
|
|
||
| id := acl.ID | ||
| return &id, nil | ||
|
Comment on lines
+202
to
+216
|
||
| } | ||
|
|
||
| func (h *ProxyHostHandler) resolveSecurityHeaderProfileReference(value any) (*uint, error) { | ||
| if value == nil { | ||
| return nil, nil | ||
| } | ||
|
|
||
| parsedID, _, parseErr := parseNullableUintField(value, "security_header_profile_id") | ||
| if parseErr == nil { | ||
| return parsedID, nil | ||
| } | ||
|
|
||
| uuidValue, isString := value.(string) | ||
| if !isString { | ||
| return nil, parseErr | ||
| } | ||
|
|
||
| trimmed := strings.TrimSpace(uuidValue) | ||
| if trimmed == "" { | ||
| return nil, nil | ||
| } | ||
|
|
||
| if _, err := uuid.Parse(trimmed); err != nil { | ||
| return nil, parseErr | ||
| } | ||
|
|
||
| var profile models.SecurityHeaderProfile | ||
| if err := h.db.Select("id").Where("uuid = ?", trimmed).First(&profile).Error; err != nil { | ||
| if err == gorm.ErrRecordNotFound { | ||
|
Comment on lines
+209
to
+245
|
||
| return nil, fmt.Errorf("security header profile not found") | ||
| } | ||
| return nil, fmt.Errorf("failed to resolve security header profile") | ||
| } | ||
|
|
||
| id := profile.ID | ||
| return &id, nil | ||
| } | ||
|
|
||
| func parseForwardPortField(value any) (int, error) { | ||
| switch v := value.(type) { | ||
| case float64: | ||
|
|
@@ -221,6 +290,7 @@ func parseForwardPortField(value any) (int, error) { | |
| func NewProxyHostHandler(db *gorm.DB, caddyManager *caddy.Manager, ns *services.NotificationService, uptimeService *services.UptimeService) *ProxyHostHandler { | ||
| return &ProxyHostHandler{ | ||
| service: services.NewProxyHostService(db), | ||
| db: db, | ||
| caddyManager: caddyManager, | ||
| notificationService: ns, | ||
| uptimeService: uptimeService, | ||
|
|
@@ -252,8 +322,38 @@ func (h *ProxyHostHandler) List(c *gin.Context) { | |
|
|
||
| // Create creates a new proxy host. | ||
| func (h *ProxyHostHandler) Create(c *gin.Context) { | ||
| var payload map[string]any | ||
| if err := c.ShouldBindJSON(&payload); err != nil { | ||
| c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) | ||
| return | ||
| } | ||
|
|
||
| if rawAccessListRef, ok := payload["access_list_id"]; ok { | ||
| resolvedAccessListID, resolveErr := h.resolveAccessListReference(rawAccessListRef) | ||
| if resolveErr != nil { | ||
| c.JSON(http.StatusBadRequest, gin.H{"error": resolveErr.Error()}) | ||
| return | ||
| } | ||
| payload["access_list_id"] = resolvedAccessListID | ||
| } | ||
|
|
||
| if rawSecurityHeaderRef, ok := payload["security_header_profile_id"]; ok { | ||
| resolvedSecurityHeaderID, resolveErr := h.resolveSecurityHeaderProfileReference(rawSecurityHeaderRef) | ||
| if resolveErr != nil { | ||
| c.JSON(http.StatusBadRequest, gin.H{"error": resolveErr.Error()}) | ||
| return | ||
| } | ||
| payload["security_header_profile_id"] = resolvedSecurityHeaderID | ||
| } | ||
|
|
||
| payloadBytes, marshalErr := json.Marshal(payload) | ||
| if marshalErr != nil { | ||
| c.JSON(http.StatusBadRequest, gin.H{"error": "invalid request payload"}) | ||
| return | ||
| } | ||
|
|
||
| var host models.ProxyHost | ||
| if err := c.ShouldBindJSON(&host); err != nil { | ||
| if err := json.Unmarshal(payloadBytes, &host); err != nil { | ||
| c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) | ||
| return | ||
| } | ||
|
|
@@ -430,12 +530,12 @@ func (h *ProxyHostHandler) Update(c *gin.Context) { | |
| host.CertificateID = parsedID | ||
| } | ||
| if v, ok := payload["access_list_id"]; ok { | ||
| parsedID, _, parseErr := parseNullableUintField(v, "access_list_id") | ||
| if parseErr != nil { | ||
| c.JSON(http.StatusBadRequest, gin.H{"error": parseErr.Error()}) | ||
| resolvedAccessListID, resolveErr := h.resolveAccessListReference(v) | ||
| if resolveErr != nil { | ||
| c.JSON(http.StatusBadRequest, gin.H{"error": resolveErr.Error()}) | ||
| return | ||
| } | ||
| host.AccessListID = parsedID | ||
| host.AccessListID = resolvedAccessListID | ||
| } | ||
|
|
||
| if v, ok := payload["dns_provider_id"]; ok { | ||
|
|
@@ -453,54 +553,12 @@ func (h *ProxyHostHandler) Update(c *gin.Context) { | |
|
|
||
| // Security Header Profile: update only if provided | ||
| if v, ok := payload["security_header_profile_id"]; ok { | ||
| logger := middleware.GetRequestLogger(c) | ||
| // Sanitize user-provided values for log injection protection (CWE-117) | ||
| safeUUID := sanitizeForLog(uuidStr) | ||
| logger.WithField("host_uuid", safeUUID).WithField("raw_value", sanitizeForLog(fmt.Sprintf("%v", v))).Debug("Processing security_header_profile_id update") | ||
|
|
||
| if v == nil { | ||
| logger.WithField("host_uuid", safeUUID).Debug("Setting security_header_profile_id to nil") | ||
| host.SecurityHeaderProfileID = nil | ||
| } else { | ||
| conversionSuccess := false | ||
| switch t := v.(type) { | ||
| case float64: | ||
| logger.Debug("Received security_header_profile_id as float64") | ||
| if id, ok := safeFloat64ToUint(t); ok { | ||
| host.SecurityHeaderProfileID = &id | ||
| conversionSuccess = true | ||
| logger.Info("Successfully converted security_header_profile_id from float64") | ||
| } else { | ||
| logger.Warn("Failed to convert security_header_profile_id from float64: value is negative or not a valid uint") | ||
| } | ||
| case int: | ||
| logger.Debug("Received security_header_profile_id as int") | ||
| if id, ok := safeIntToUint(t); ok { | ||
| host.SecurityHeaderProfileID = &id | ||
| conversionSuccess = true | ||
| logger.Info("Successfully converted security_header_profile_id from int") | ||
| } else { | ||
| logger.Warn("Failed to convert security_header_profile_id from int: value is negative") | ||
| } | ||
| case string: | ||
| logger.Debug("Received security_header_profile_id as string") | ||
| if n, err := strconv.ParseUint(t, 10, 32); err == nil { | ||
| id := uint(n) | ||
| host.SecurityHeaderProfileID = &id | ||
| conversionSuccess = true | ||
| logger.WithField("host_uuid", safeUUID).WithField("profile_id", id).Info("Successfully converted security_header_profile_id from string") | ||
| } else { | ||
| logger.Warn("Failed to parse security_header_profile_id from string") | ||
| } | ||
| default: | ||
| logger.Warn("Unsupported type for security_header_profile_id") | ||
| } | ||
|
|
||
| if !conversionSuccess { | ||
| c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("invalid security_header_profile_id: unable to convert value %v of type %T to uint", v, v)}) | ||
| return | ||
| } | ||
| resolvedSecurityHeaderID, resolveErr := h.resolveSecurityHeaderProfileReference(v) | ||
| if resolveErr != nil { | ||
| c.JSON(http.StatusBadRequest, gin.H{"error": resolveErr.Error()}) | ||
| return | ||
| } | ||
| host.SecurityHeaderProfileID = resolvedSecurityHeaderID | ||
| } | ||
|
|
||
| // Locations: replace only if provided | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A new transitive dependency
go.mongodb.org/mongo-driver/v2 v2.5.0appears ingo.modas an indirect dependency. MongoDB driver is unexpected for what appears to be a SQLite/GORM-based backend. This likely came in transitively via thegin v1.12.0upgrade. The presence of a large, unneeded transitive dependency should be verified — if it's not actually needed,go mod tidyshould be run to confirm its necessity or remove it. This significantly increases binary size and attack surface.