From 893a03c8fa797d9c11aa0ba52bdffce8c20c6517 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Thu, 24 Oct 2024 11:00:00 -0400 Subject: [PATCH 1/2] skip interstitial for HTTP 'OPTIONS' method (#777) --- endpoints/publicProxy/http.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/endpoints/publicProxy/http.go b/endpoints/publicProxy/http.go index f40093d2..62a11057 100644 --- a/endpoints/publicProxy/http.go +++ b/endpoints/publicProxy/http.go @@ -158,7 +158,7 @@ func shareHandler(handler http.Handler, pcfg *Config, key []byte, ctx ziti.Conte if shrToken != "" { if svc, found := endpoints.GetRefreshedService(shrToken, ctx); found { if cfg, found := svc.Config[sdk.ZrokProxyConfig]; found { - if pcfg.Interstitial != nil && pcfg.Interstitial.Enabled { + if r.Method != http.MethodOptions && (pcfg.Interstitial != nil && pcfg.Interstitial.Enabled) { sendInterstitial := true if len(pcfg.Interstitial.UserAgentPrefixes) > 0 { ua := r.Header.Get("User-Agent") From f4d6bcf59d0a5eab9b3f3539ac52a3d6008a59c7 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Thu, 24 Oct 2024 11:36:24 -0400 Subject: [PATCH 2/2] changelog (#777) --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e42c456f..1aaf4e89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ CHANGE: Update `github.com/openziti/sdk-golang` to version `v0.23.44`. Remove old `github.com/openziti/fabric` dependency, instead pulling in the modern `github.com/openziti/ziti` dependency. +FIX: Bypass interstitial page for HTTP `OPTIONS` method (https://github.com/openziti/zrok/issues/777) + ## v0.4.42 CHANGE: Switch all `Dial` operations made into the OpenZiti overlay to use `DialWithOptions(..., &ziti.DialOptions{ConnectTimeout: 30 * time.Second})`, switching to a 30 second timeout from a 5 second default (https://github.com/openziti/zrok/issues/772)