s1d3sw1ped/jiggablend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Refactor API key handling in runners.go to streamline authorization logic. Remove redundant checks for "Bearer " prefix in API key extraction, enhancing code clarity and maintainability.

Browse Source
This commit is contained in:
Justin Harms
2025-11-25 08:23:25 -06:00
parent 690e6b13f8
commit 11e7552b5b
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/api/runners.go
View File

@@ -43,9 +43,7 @@ func (s *Server) runnerAuthMiddleware(next http.HandlerFunc) http.HandlerFunc {
} }
// Remove "Bearer " prefix if present // Remove "Bearer " prefix if present
if strings.HasPrefix(apiKey, "Bearer ") { apiKey = strings.TrimPrefix(apiKey, "Bearer ")
apiKey = strings.TrimPrefix(apiKey, "Bearer ")
}
// Validate API key and get its ID // Validate API key and get its ID
apiKeyID, _, err := s.secrets.ValidateRunnerAPIKey(apiKey) apiKeyID, _, err := s.secrets.ValidateRunnerAPIKey(apiKey)
@@ -739,9 +737,7 @@ func (s *Server) handleRunnerWebSocket(w http.ResponseWriter, r *http.Request) {
apiKey := r.URL.Query().Get("api_key") apiKey := r.URL.Query().Get("api_key")
if apiKey == "" { if apiKey == "" {
apiKey = r.Header.Get("Authorization") apiKey = r.Header.Get("Authorization")
if strings.HasPrefix(apiKey, "Bearer ") { apiKey = strings.TrimPrefix(apiKey, "Bearer ")
apiKey = strings.TrimPrefix(apiKey, "Bearer ")
}
} }
if apiKey == "" { if apiKey == "" {
s.respondError(w, http.StatusBadRequest, "API key required") s.respondError(w, http.StatusBadRequest, "API key required")
@@ -2186,4 +2182,3 @@ func (s *Server) logTaskEvent(taskID int64, runnerID *int64, logLevel types.LogL
StepName: stepName, StepName: stepName,
}) })
} }