extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-02-16 10:19:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

initial work for caddy updates. This does not include changes made to the cadd project that would need to happen for this to work.

Browse Source
This commit is contained in:
Cam 2024-02-07 13:42:07 -06:00
parent 2420f61850
commit c7cb98c750
No known key found for this signature in database
GPG Key ID: 367B7C7EBD84A8BD
2 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
endpoints/proxy/browse.html
View File

@ -298,7 +298,7 @@
<!DOCTYPE html>
<html>
<head>
<title>{{html .Name}}</title>
<title>{{zrok_share_token}}</title>
<link rel="canonical" href="{{.Path}}/" />
<meta charset="utf-8">
<meta name="color-scheme" content="light dark">

41
endpoints/proxy/caddyfileBackend.go
View File

@ -3,16 +3,18 @@ package proxy
import (
_ "embed"
"fmt"
"os"
"strings"
"text/template"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/fileserver"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/templates"
"github.com/openziti/zrok/endpoints"
"github.com/openziti/zrok/sdk/golang/sdk"
"github.com/sirupsen/logrus"
"os"
"strings"
"text/template"
)
//go:embed browse.html
@ -33,6 +35,8 @@ type CaddyfileBackend struct {
}
func NewCaddyfileBackend(cfg *CaddyfileBackendConfig) (*CaddyfileBackend, error) {
caddy.RegisterModule(ZrokTemplateExtender{shrToken: cfg.Shr.Token})
cdyf, err := preprocessCaddyfile(cfg.CaddyfilePath, cfg.Shr)
if err != nil {
return nil, err
@ -46,6 +50,7 @@ func NewCaddyfileBackend(cfg *CaddyfileBackendConfig) (*CaddyfileBackend, error)
for _, warning := range warnings {
logrus.Warnf("%v [%d] (%v): %v", cfg.CaddyfilePath, warning.Line, warning.Directive, warning.Message)
}
return &CaddyfileBackend{cfg: caddyCfg}, nil
}
@ -75,3 +80,33 @@ func preprocessCaddyfile(inF string, shr *sdk.Share) (string, error) {
type caddyfileData struct {
ZrokBindAddress string
}
type ZrokTemplateExtender struct {
shrToken string
}
func (z ZrokTemplateExtender) CaddyModule() caddy.ModuleInfo {
return caddy.ModuleInfo{
ID: "http.handlers.templates.functions.zrok_template",
New: func() caddy.Module {
ret := new(ZrokTemplateExtender)
ret.shrToken = z.shrToken
return ret
},
}
}
func (z ZrokTemplateExtender) CustomTemplateFunctions() template.FuncMap {
return template.FuncMap{
"zrok_share_token": func() string { return z.shrToken },
}
}
func (*ZrokTemplateExtender) UnmarshalCaddyfile(_ *caddyfile.Dispenser) error {
return nil
}
var (
_ templates.CustomFunctions = (*ZrokTemplateExtender)(nil)
_ caddyfile.Unmarshaler = (*ZrokTemplateExtender)(nil)
)