Skip to content

Propagate Access Key #26

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
klaidliadon merged 3 commits into from
Nov 18, 2024
Merged

Propagate Access Key #26

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
037a423
Always set access key
klaidliadon Nov 15, 2024
cba57eb
Propagate middleware
klaidliadon Nov 15, 2024
ce3d128
Add comment
klaidliadon Nov 18, 2024
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
23 changes: 22 additions & 1 deletion middleware.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package authcontrol

import (
"cmp"
"context"
"errors"
"net/http"
"strings"
Expand Down Expand Up @@ -158,7 +159,7 @@ func Session(cfg Options) func(next http.Handler) http.Handler {
}
}

if accessKey != "" && sessionType < proto.SessionType_Admin {
if accessKey != "" {
ctx = WithAccessKey(ctx, accessKey)
sessionType = max(sessionType, proto.SessionType_AccessKey)
}
Expand Down Expand Up @@ -196,3 +197,23 @@ func AccessControl(acl Config[ACL], cfg Options) func(next http.Handler) http.Ha
})
}
}

// PropagateAccessKey propagates the access key from the context to other webrpc packages.
func PropagateAccessKey(headerContextFuncs ...func(context.Context, http.Header) (context.Context, error)) func(next http.Handler) http.Handler {
return func(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()

if accessKey, ok := GetAccessKey(ctx); ok {
h := http.Header{
HeaderAccessKey: []string{accessKey},
}
for _, fn := range headerContextFuncs {
ctx, _ = fn(ctx, h)
}
}

next.ServeHTTP(w, r.WithContext(ctx))
})
}
}