highperfocused/khatru
1
0
Fork 0
mirror of https://github.com/fiatjaf/khatru.git synced 2025-11-19 02:26:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(blossom): forward requests to base relay

Browse Source
This commit is contained in:
Anthony Accioly
2024-11-05 17:56:56 +00:00
parent 553d848362
commit bbcf948dd6
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
blossom/server.go
View File

@@ -31,8 +31,6 @@ func New(rl *khatru.Relay, serviceURL string) *BlossomServer {
base := rl.Router() base := rl.Router()
combinedMux := http.NewServeMux()
blossomApi := http.NewServeMux() blossomApi := http.NewServeMux()
blossomApi.HandleFunc("PUT /upload", bs.handleUpload) blossomApi.HandleFunc("PUT /upload", bs.handleUpload)
blossomApi.HandleFunc("HEAD /upload", bs.handleUploadCheck) blossomApi.HandleFunc("HEAD /upload", bs.handleUploadCheck)
@@ -40,6 +38,7 @@ func New(rl *khatru.Relay, serviceURL string) *BlossomServer {
blossomApi.HandleFunc("HEAD /{sha256}", bs.handleHasBlob) blossomApi.HandleFunc("HEAD /{sha256}", bs.handleHasBlob)
blossomApi.HandleFunc("GET /{sha256}", bs.handleGetBlob) blossomApi.HandleFunc("GET /{sha256}", bs.handleGetBlob)
blossomApi.HandleFunc("DELETE /{sha256}", bs.handleDelete) blossomApi.HandleFunc("DELETE /{sha256}", bs.handleDelete)
blossomApi.Handle("/", base) // forwards to relay
bud01CorsMux := cors.New(cors.Options{ bud01CorsMux := cors.New(cors.Options{
AllowedOrigins: []string{"*"}, AllowedOrigins: []string{"*"},
@@ -50,13 +49,8 @@ func New(rl *khatru.Relay, serviceURL string) *BlossomServer {
wrappedBlossomApi := bud01CorsMux.Handler(blossomApi) wrappedBlossomApi := bud01CorsMux.Handler(blossomApi)
combinedMux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { combinedMux := http.NewServeMux()
if _, pattern := blossomApi.Handler(r); pattern != "" { combinedMux.Handle("/", wrappedBlossomApi)
wrappedBlossomApi.ServeHTTP(w, r)
} else {
base.ServeHTTP(w, r)
}
})
rl.SetRouter(combinedMux) rl.SetRouter(combinedMux)