tjh.dev
forked from
tangled.org/core
Mirror of @tangled.org/core. Running on a Raspberry Pi Zero 2
appview: pages/markup: rewrite links links to camo url
authored by
Tangled
7edbc446
5984e986
+2
appview/config.go
+2
appview/config.go
···
13
13
Dev bool `env:"TANGLED_DEV, default=false"`
14
14
JetstreamEndpoint string `env:"TANGLED_JETSTREAM_ENDPOINT, default=wss://jetstream1.us-east.bsky.network/subscribe"`
15
15
ResendApiKey string `env:"TANGLED_RESEND_API_KEY"`
16
+
CamoHost string `env:"TANGLED_CAMO_HOST, default=https://camo.tangled.sh"`
17
+
CamoSharedSecret string `env:"TANGLED_CAMO_SHARED_SECRET"`
16
18
}
17
19
18
20
func LoadConfig(ctx context.Context) (*Config, error) {
+1
-1
appview/pages/funcmap.go
+1
-1
appview/pages/funcmap.go
···
143
143
return v.Slice(start, end).Interface()
144
144
},
145
145
"markdown": func(text string) template.HTML {
146
-
rctx := &markup.RenderContext{}
146
+
rctx := &markup.RenderContext{RendererType: markup.RendererTypeDefault}
147
147
return template.HTML(rctx.RenderMarkdown(text))
148
148
},
149
149
"isNil": func(t any) bool {
+31
appview/pages/markup/camo.go
+31
appview/pages/markup/camo.go
···
1
+
package markup
2
+
3
+
import (
4
+
"crypto/hmac"
5
+
"crypto/sha256"
6
+
"encoding/hex"
7
+
"fmt"
8
+
9
+
"github.com/yuin/goldmark/ast"
10
+
)
11
+
12
+
func generateCamoURL(baseURL, secret, imageURL string) string {
13
+
h := hmac.New(sha256.New, []byte(secret))
14
+
h.Write([]byte(imageURL))
15
+
signature := hex.EncodeToString(h.Sum(nil))
16
+
hexURL := hex.EncodeToString([]byte(imageURL))
17
+
return fmt.Sprintf("%s/%s/%s", baseURL, signature, hexURL)
18
+
}
19
+
20
+
func (rctx *RenderContext) camoImageLinkTransformer(img *ast.Image) {
21
+
// don't camo on dev
22
+
if rctx.IsDev {
23
+
return
24
+
}
25
+
26
+
dst := string(img.Destination)
27
+
28
+
if rctx.CamoUrl != "" && rctx.CamoSecret != "" {
29
+
img.Destination = []byte(generateCamoURL(rctx.CamoUrl, rctx.CamoSecret, dst))
30
+
}
31
+
}
+12
-1
appview/pages/markup/markdown.go
+12
-1
appview/pages/markup/markdown.go
···
21
21
const (
22
22
// RendererTypeRepoMarkdown is for repository documentation markdown files
23
23
RendererTypeRepoMarkdown RendererType = iota
24
+
// RendererTypeDefault is non-repo markdown, like issues/pulls/comments.
25
+
RendererTypeDefault
24
26
)
25
27
26
28
// RenderContext holds the contextual data for rendering markdown.
27
29
// It can be initialized empty, and that'll skip any transformations.
28
30
type RenderContext struct {
31
+
CamoUrl string
32
+
CamoSecret string
29
33
repoinfo.RepoInfo
30
34
IsDev bool
31
35
RendererType RendererType
···
77
73
a.rctx.relativeLinkTransformer(n.(*ast.Link))
78
74
case *ast.Image:
79
75
a.rctx.imageFromKnotTransformer(n.(*ast.Image))
76
+
a.rctx.camoImageLinkTransformer(n.(*ast.Image))
80
77
}
81
-
// more types here like RendererTypeIssue/Pull etc.
78
+
79
+
case RendererTypeDefault:
80
+
switch n.(type) {
81
+
case *ast.Image:
82
+
a.rctx.imageFromKnotTransformer(n.(*ast.Image))
83
+
a.rctx.camoImageLinkTransformer(n.(*ast.Image))
84
+
}
82
85
}
83
86
84
87
return ast.WalkContinue, nil
+10
-13
appview/pages/pages.go
+10
-13
appview/pages/pages.go
···
15
15
"path/filepath"
16
16
"strings"
17
17
18
+
"tangled.sh/tangled.sh/core/appview"
18
19
"tangled.sh/tangled.sh/core/appview/auth"
19
20
"tangled.sh/tangled.sh/core/appview/db"
20
21
"tangled.sh/tangled.sh/core/appview/pages/markup"
···
45
44
rctx *markup.RenderContext
46
45
}
47
46
48
-
func NewPages(dev bool) *Pages {
47
+
func NewPages(config *appview.Config) *Pages {
49
48
// initialized with safe defaults, can be overriden per use
50
49
rctx := &markup.RenderContext{
51
-
IsDev: dev,
50
+
IsDev: config.Dev,
51
+
CamoUrl: config.CamoHost,
52
+
CamoSecret: config.CamoSharedSecret,
52
53
}
53
54
54
55
p := &Pages{
55
56
t: make(map[string]*template.Template),
56
-
dev: dev,
57
+
dev: config.Dev,
57
58
embedFS: Files,
58
59
rctx: rctx,
59
60
templateDir: "appview/pages",
···
383
380
return p.executeRepo("repo/empty", w, params)
384
381
}
385
382
386
-
p.rctx = &markup.RenderContext{
387
-
RepoInfo: params.RepoInfo,
388
-
IsDev: p.dev,
389
-
RendererType: markup.RendererTypeRepoMarkdown,
390
-
}
383
+
p.rctx.RepoInfo = params.RepoInfo
384
+
p.rctx.RendererType = markup.RendererTypeRepoMarkdown
391
385
392
386
if params.ReadmeFileName != "" {
393
387
var htmlString string
···
521
521
if params.ShowRendered {
522
522
switch markup.GetFormat(params.Path) {
523
523
case markup.FormatMarkdown:
524
-
p.rctx = &markup.RenderContext{
525
-
RepoInfo: params.RepoInfo,
526
-
IsDev: p.dev,
527
-
RendererType: markup.RendererTypeRepoMarkdown,
528
-
}
524
+
p.rctx.RepoInfo = params.RepoInfo
525
+
p.rctx.RendererType = markup.RendererTypeRepoMarkdown
529
526
params.RenderedContents = template.HTML(p.rctx.RenderMarkdown(params.Contents))
530
527
}
531
528
}