Skip to content

[Repo Assist] refactor(server): extract session ID header extraction into helper #7151

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.

Sign up for GitHub

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
lpcox merged 2 commits into from
Jun 7, 2026
Merged

[Repo Assist] refactor(server): extract session ID header extraction into helper #7151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a38d907
refactor(server): extract session ID header extraction into helper
github-actions[bot] Jun 7, 2026
8b24537
Potential fix for pull request finding
lpcox Jun 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions internal/server/middleware.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,7 @@ func WithSDKLogging(handler http.Handler, mode string) http.Handler {
startTime := time.Now()

// Extract session info for logging context
agentIDHeader := r.Header.Get("X-Agent-ID")
authHeader := r.Header.Get("Authorization")
sessionID := auth.ExtractSessionIDFromHeaders(agentIDHeader, authHeader)
sessionID := extractSessionIDFromRequest(r)
mcpSessionID := r.Header.Get("Mcp-Session-Id")

// Log incoming request
Expand Down
14 changes: 11 additions & 3 deletions internal/server/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,22 @@ func (us *UnifiedServer) getSessionKeys() []string {
return keys
}

// extractSessionIDFromRequest extracts the session ID from the X-Agent-ID and
// Authorization headers of an HTTP request. Returns "" if neither header is present
// or if the provided header value is malformed.
func extractSessionIDFromRequest(r *http.Request) string {
return auth.ExtractSessionIDFromHeaders(
r.Header.Get("X-Agent-ID"),
r.Header.Get("Authorization"),
)
}

// extractAndValidateSession extracts the session ID from request headers.
// and logs connection details. Returns empty string if validation fails.
func extractAndValidateSession(r *http.Request) string {
logSession.Printf("Extracting session from request: remote=%s, path=%s", r.RemoteAddr, r.URL.Path)

agentIDHeader := r.Header.Get("X-Agent-ID")
authHeader := r.Header.Get("Authorization")
sessionID := auth.ExtractSessionIDFromHeaders(agentIDHeader, authHeader)
sessionID := extractSessionIDFromRequest(r)

if sessionID == "" {
logSession.Printf("Session extraction failed: missing or invalid X-Agent-ID/Authorization header, remote=%s", r.RemoteAddr)
Expand Down
Loading