Skip to content

Modern Docker Management, Designed for Everyone

chore: fix go linter issues

Kyle Mendelle1613b1346cb
diff --git a/backend/internal/api/stack_handler.go b/backend/internal/api/stack_handler.go
index e1efe9a5d..161606f46 100644
--- a/backend/internal/api/stack_handler.go
+++ b/backend/internal/api/stack_handler.go
@@ -569,7 +569,8 @@ func (h *StackHandler) GetStackLogsStream(c *gin.Context) {
if !ok {
return false
}
- c.SSEvent("log", gin.H{"message": log})
+ parsedLog := h.parseStackLogLine(log)
+ c.SSEvent("log", parsedLog)
return true
case <-ctx.Done():
return false
@@ -580,21 +581,15 @@ func (h *StackHandler) GetStackLogsStream(c *gin.Context) {
})
}
-// Helper method to parse stack log lines and extract service information
func (h *StackHandler) parseStackLogLine(logLine string) gin.H {
- // Docker compose logs format: service_name | log message
- // or with timestamps: 2024-01-01T12:00:00.000000000Z service_name | log message
-
var service, message, timestamp string
var level = "info"
- // Check if line has stderr prefix
if strings.HasPrefix(logLine, "[STDERR] ") {
level = "stderr"
logLine = strings.TrimPrefix(logLine, "[STDERR] ")
}
- // Try to extract timestamp if present
parts := strings.SplitN(logLine, " ", 2)
if len(parts) == 2 && strings.Contains(parts[0], "T") && strings.Contains(parts[0], "Z") {
timestamp = parts[0]
@@ -603,7 +598,6 @@ func (h *StackHandler) parseStackLogLine(logLine string) gin.H {
timestamp = time.Now().Format(time.RFC3339Nano)
}
- // Extract service name and message
if strings.Contains(logLine, " | ") {
serviceParts := strings.SplitN(logLine, " | ", 2)
if len(serviceParts) == 2 {
diff --git a/backend/internal/services/user_service.go b/backend/internal/services/user_service.go
index 13ec85f06..211d5e31f 100644
--- a/backend/internal/services/user_service.go
+++ b/backend/internal/services/user_service.go
@@ -111,7 +111,12 @@ func (s *UserService) validateArgon2Password(encodedHash, password string) error
return err
}
- comparisonHash := argon2.IDKey([]byte(password), salt, iterations, memory, parallelism, uint32(len(decodedHash)))
+ hashLen := len(decodedHash)
+ if hashLen < 0 || hashLen > 0x7fffffff {
+ return fmt.Errorf("invalid hash length")
+ }
+
+ comparisonHash := argon2.IDKey([]byte(password), salt, iterations, memory, parallelism, uint32(hashLen))
if len(comparisonHash) != len(decodedHash) {
return fmt.Errorf("invalid password")