mleku
c9a03db395
Some checks failed
Go / build-and-release (push) Has been cancelled
- Add proper CORS headers for Blossom endpoints including X-SHA-256, X-Content-Length, X-Content-Type headers required by blossom-client-sdk - Add root-level Blossom routes (/upload, /media, /mirror, /report, /list/) for clients like Jumble that expect Blossom at root - Export BaseURLKey from pkg/blossom for use by app handlers - Make blossomRootHandler return URLs with /blossom prefix so blob downloads work via the registered /blossom/ route - Remove Access-Control-Allow-Credentials header (not needed for * origin) - Add Access-Control-Expose-Headers for X-Reason and other response headers Files modified: - app/blossom.go: Add blossomRootHandler, use exported BaseURLKey - app/server.go: Add CORS handling for blossom paths, register root routes - pkg/blossom/server.go: Fix CORS headers, export BaseURLKey - pkg/blossom/utils.go: Minor formatting - pkg/version/version: Bump to v0.36.12 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
65 lines
2.3 KiB
Go
65 lines
2.3 KiB
Go
package app
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"lol.mleku.dev/log"
|
|
"next.orly.dev/app/config"
|
|
"next.orly.dev/pkg/acl"
|
|
"next.orly.dev/pkg/database"
|
|
blossom "next.orly.dev/pkg/blossom"
|
|
)
|
|
|
|
// initializeBlossomServer creates and configures the Blossom blob storage server
|
|
func initializeBlossomServer(
|
|
ctx context.Context, cfg *config.C, db *database.D,
|
|
) (*blossom.Server, error) {
|
|
// Create blossom server configuration
|
|
blossomCfg := &blossom.Config{
|
|
BaseURL: "", // Will be set dynamically per request
|
|
MaxBlobSize: 100 * 1024 * 1024, // 100MB default
|
|
AllowedMimeTypes: nil, // Allow all MIME types by default
|
|
RequireAuth: cfg.AuthRequired || cfg.AuthToWrite,
|
|
}
|
|
|
|
// Create blossom server with relay's ACL registry
|
|
bs := blossom.NewServer(db, acl.Registry, blossomCfg)
|
|
|
|
// Override baseURL getter to use request-based URL
|
|
// We'll need to modify the handler to inject the baseURL per request
|
|
// For now, we'll use a middleware approach
|
|
|
|
log.I.F("blossom server initialized with ACL mode: %s", cfg.ACLMode)
|
|
return bs, nil
|
|
}
|
|
|
|
// blossomHandler wraps the blossom server handler to inject baseURL per request
|
|
func (s *Server) blossomHandler(w http.ResponseWriter, r *http.Request) {
|
|
// Strip /blossom prefix and pass to blossom handler
|
|
r.URL.Path = strings.TrimPrefix(r.URL.Path, "/blossom")
|
|
if !strings.HasPrefix(r.URL.Path, "/") {
|
|
r.URL.Path = "/" + r.URL.Path
|
|
}
|
|
|
|
// Set baseURL in request context for blossom server to use
|
|
// Use the exported key type from the blossom package
|
|
baseURL := s.ServiceURL(r) + "/blossom"
|
|
r = r.WithContext(context.WithValue(r.Context(), blossom.BaseURLKey{}, baseURL))
|
|
|
|
s.blossomServer.Handler().ServeHTTP(w, r)
|
|
}
|
|
|
|
// blossomRootHandler handles blossom requests at root level (for clients like Jumble)
|
|
// Note: Even though requests come to root-level paths like /upload, we return URLs
|
|
// with /blossom prefix because that's where the blob download handlers are registered.
|
|
func (s *Server) blossomRootHandler(w http.ResponseWriter, r *http.Request) {
|
|
// Set baseURL with /blossom prefix so returned blob URLs point to working handlers
|
|
baseURL := s.ServiceURL(r) + "/blossom"
|
|
r = r.WithContext(context.WithValue(r.Context(), blossom.BaseURLKey{}, baseURL))
|
|
|
|
s.blossomServer.Handler().ServeHTTP(w, r)
|
|
}
|
|
|