From 2e3d6a627f92611c3750c47cc87fc82d41b41af7 Mon Sep 17 00:00:00 2001
From: Michael Quigley <michael@quigley.com>
Date: Wed, 24 Jul 2024 10:43:22 -0400
Subject: [PATCH] frontend config for interstitial enable/disable;
 zrok.proxy.v1 support for interstitial enablement (#704)

---
 endpoints/publicProxy/config.go | 18 ++++++++++--------
 endpoints/publicProxy/http.go   | 17 ++++++++++-------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/endpoints/publicProxy/config.go b/endpoints/publicProxy/config.go
index 54710c0b..cac3da35 100644
--- a/endpoints/publicProxy/config.go
+++ b/endpoints/publicProxy/config.go
@@ -12,12 +12,13 @@ import (
 const V = 3
 
 type Config struct {
-	V         int
-	Identity  string
-	Address   string
-	HostMatch string
-	Oauth     *OauthConfig
-	Tls       *endpoints.TlsConfig
+	V            int
+	Identity     string
+	Address      string
+	HostMatch    string
+	Interstitial bool
+	Oauth        *OauthConfig
+	Tls          *endpoints.TlsConfig
 }
 
 type OauthConfig struct {
@@ -45,8 +46,9 @@ type OauthProviderConfig struct {
 
 func DefaultConfig() *Config {
 	return &Config{
-		Identity: "public",
-		Address:  "0.0.0.0:8080",
+		Identity:     "public",
+		Address:      "0.0.0.0:8080",
+		Interstitial: false,
 	}
 }
 
diff --git a/endpoints/publicProxy/http.go b/endpoints/publicProxy/http.go
index 2787c62a..d4083724 100644
--- a/endpoints/publicProxy/http.go
+++ b/endpoints/publicProxy/http.go
@@ -158,13 +158,16 @@ 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 {
-
-					ignore := r.Header.Get("zrok_interstitial")
-					_, zrokOkErr := r.Cookie("zrok_interstitial")
-					if ignore == "" && zrokOkErr != nil {
-						logrus.Infof("forcing interstitial for: %v", r.URL)
-						interstitialUi.WriteInterstitialAnnounce(w)
-						return
+					if pcfg.Interstitial {
+						if _, istlFound := cfg["interstitial"]; istlFound {
+							skip := r.Header.Get("skip_zrok_interstitial")
+							_, zrokOkErr := r.Cookie("zrok_interstitial")
+							if skip == "" && zrokOkErr != nil {
+								logrus.Debugf("forcing interstitial for '%v'", r.URL)
+								interstitialUi.WriteInterstitialAnnounce(w)
+								return
+							}
+						}
 					}
 
 					if scheme, found := cfg["auth_scheme"]; found {