WeKnora deployment source with the reviewed wiki identity, summary and recovery fixes
Anydoc / anydoc parser engine (push) Canceled after 0s
App / Format, vet, test, and build (push) Canceled after 0s
CLI / test (macos-latest / go 1.26) (push) Canceled after 0s
CLI / test (ubuntu-latest / go 1.26) (push) Canceled after 0s
CLI / test (windows-latest / go 1.26) (push) Canceled after 0s
Build and Push Docker Image / build-ui (push) Canceled after 0s
Build and Push Docker Image / build-docreader (push) Canceled after 0s
Build and Push Docker Image / build-sandbox (push) Canceled after 0s
Build and Push Docker Image / build-app (amd64, linux/amd64, ubuntu-latest) (push) Canceled after 0s
Build and Push Docker Image / build-app (arm64, linux/arm64, ubuntu-24.04-arm) (push) Canceled after 0s
DocReader / Python tests and Go client tests (push) Canceled after 0s
Build & Publish (dsh-weknora) / Typecheck, test, pack (push) Canceled after 0s
Build & Publish (dsh-weknora) / End-to-end inside dsh (pinned) (push) Canceled after 0s
Build & Publish (dsh-weknora) / End-to-end inside dsh (latest, advisory) (push) Canceled after 0s
Frontend / Test, type-check, and build (push) Canceled after 0s
Go Lint Cache / warm lint cache (.) (push) Canceled after 0s
Go Lint Cache / warm lint cache (cli) (push) Canceled after 0s
Go Lint Cache / warm lint cache (client) (push) Canceled after 0s
Build & Publish (mcp-server) / Test (Python 3.10) (push) Canceled after 0s
Build & Publish (mcp-server) / Test (Python 3.11) (push) Canceled after 0s
Build & Publish (mcp-server) / Test (Python 3.12) (push) Canceled after 0s
Build & Publish (mcp-server) / Test (Python 3.13) (push) Canceled after 0s
Build and Push Docker Image / merge (push) Canceled after 0s
Build & Publish (dsh-weknora) / Publish to npm (push) Canceled after 0s
Build & Publish (mcp-server) / Build sdist + wheel (push) Canceled after 0s
Build & Publish (mcp-server) / Publish to PyPI (push) Canceled after 0s
Anydoc / anydoc parser engine (push) Canceled after 0s
App / Format, vet, test, and build (push) Canceled after 0s
CLI / test (macos-latest / go 1.26) (push) Canceled after 0s
CLI / test (ubuntu-latest / go 1.26) (push) Canceled after 0s
CLI / test (windows-latest / go 1.26) (push) Canceled after 0s
Build and Push Docker Image / build-ui (push) Canceled after 0s
Build and Push Docker Image / build-docreader (push) Canceled after 0s
Build and Push Docker Image / build-sandbox (push) Canceled after 0s
Build and Push Docker Image / build-app (amd64, linux/amd64, ubuntu-latest) (push) Canceled after 0s
Build and Push Docker Image / build-app (arm64, linux/arm64, ubuntu-24.04-arm) (push) Canceled after 0s
DocReader / Python tests and Go client tests (push) Canceled after 0s
Build & Publish (dsh-weknora) / Typecheck, test, pack (push) Canceled after 0s
Build & Publish (dsh-weknora) / End-to-end inside dsh (pinned) (push) Canceled after 0s
Build & Publish (dsh-weknora) / End-to-end inside dsh (latest, advisory) (push) Canceled after 0s
Frontend / Test, type-check, and build (push) Canceled after 0s
Go Lint Cache / warm lint cache (.) (push) Canceled after 0s
Go Lint Cache / warm lint cache (cli) (push) Canceled after 0s
Go Lint Cache / warm lint cache (client) (push) Canceled after 0s
Build & Publish (mcp-server) / Test (Python 3.10) (push) Canceled after 0s
Build & Publish (mcp-server) / Test (Python 3.11) (push) Canceled after 0s
Build & Publish (mcp-server) / Test (Python 3.12) (push) Canceled after 0s
Build & Publish (mcp-server) / Test (Python 3.13) (push) Canceled after 0s
Build and Push Docker Image / merge (push) Canceled after 0s
Build & Publish (dsh-weknora) / Publish to npm (push) Canceled after 0s
Build & Publish (mcp-server) / Build sdist + wheel (push) Canceled after 0s
Build & Publish (mcp-server) / Publish to PyPI (push) Canceled after 0s
This commit is contained in:
@@ -0,0 +1,81 @@
|
||||
package middleware
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/Tencent/WeKnora/internal/types"
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
// authSession is the resolved identity an auth middleware attaches to the
|
||||
// request. One struct + one apply function replaces the five near-identical
|
||||
// "c.Set + context.WithValue" blocks that used to live in the JWT branch,
|
||||
// the tenantless branch, both API-key attach helpers and EmbedAuth — keeping
|
||||
// the gin-keys surface (c.Keys) and the request-context surface in lockstep
|
||||
// is exactly the invariant that was easy to break when each caller wrote the
|
||||
// pairs out by hand.
|
||||
type authSession struct {
|
||||
// User is the authenticated (possibly synthetic) user. Required.
|
||||
User *types.User
|
||||
Principal types.Principal
|
||||
// TenantID / Tenant scope the request to a workspace. TenantID == 0 means
|
||||
// a tenantless session (identity-level routes only) and attaches neither
|
||||
// key. Tenant may be nil even when TenantID is set (not expected today,
|
||||
// but the helper stays tolerant).
|
||||
TenantID uint64
|
||||
Tenant *types.Tenant
|
||||
// Role is the caller's resolved role inside TenantID. Empty string means
|
||||
// "attach no role key" (tenantless sessions); readers then fall back to
|
||||
// TenantRoleFromContext's fail-closed Viewer default.
|
||||
Role types.TenantRole
|
||||
SystemAdmin bool
|
||||
// APIKeyScope marks machine principals; the APIKeyGate authorizes them
|
||||
// per-route from this scope.
|
||||
APIKeyScope *types.TenantAPIKeyScope
|
||||
// Extra carries surface-specific context values (e.g. the authenticated
|
||||
// embed channel) that must be visible on both surfaces like the rest.
|
||||
Extra map[types.ContextKey]any
|
||||
}
|
||||
|
||||
// applyAuthSession writes the session onto BOTH context surfaces of the
|
||||
// gin request:
|
||||
//
|
||||
// - c.Keys (read via c.Get / helpers that take *gin.Context)
|
||||
// - c.Request.Context() (read via types.*FromContext)
|
||||
//
|
||||
// Every auth middleware must go through this helper instead of hand-writing
|
||||
// the pairs; a key set on only one surface is a latent bug that surfaces as
|
||||
// "works in handler A, broken in handler B" depending on which read style
|
||||
// the handler uses.
|
||||
func applyAuthSession(c *gin.Context, s authSession) {
|
||||
ctx := c.Request.Context()
|
||||
set := func(key types.ContextKey, v any) {
|
||||
c.Set(key.String(), v)
|
||||
ctx = context.WithValue(ctx, key, v)
|
||||
}
|
||||
|
||||
if s.TenantID != 0 {
|
||||
set(types.TenantIDContextKey, s.TenantID)
|
||||
}
|
||||
if s.Tenant != nil {
|
||||
set(types.TenantInfoContextKey, s.Tenant)
|
||||
}
|
||||
if s.User != nil {
|
||||
set(types.UserContextKey, s.User)
|
||||
set(types.UserIDContextKey, s.User.ID)
|
||||
}
|
||||
c.Set(types.PrincipalContextKey.String(), s.Principal)
|
||||
ctx = types.WithPrincipal(ctx, s.Principal)
|
||||
if s.Role != "" {
|
||||
set(types.TenantRoleContextKey, s.Role)
|
||||
}
|
||||
set(types.SystemAdminContextKey, s.SystemAdmin)
|
||||
if s.APIKeyScope != nil {
|
||||
ctx = types.WithTenantAPIKeyScope(ctx, *s.APIKeyScope)
|
||||
}
|
||||
for key, v := range s.Extra {
|
||||
set(key, v)
|
||||
}
|
||||
|
||||
c.Request = c.Request.WithContext(ctx)
|
||||
}
|
||||
Reference in New Issue
Block a user