appview: don't use camo for gitblob rendering #293

-36

appview/pages/markup/camo.go

reviewed

··· 1 1 - package markup 2 2 - 3 3 - import ( 4 4 - "crypto/hmac" 5 5 - "crypto/sha256" 6 6 - "encoding/hex" 7 7 - "fmt" 8 8 - 9 9 - "github.com/yuin/goldmark/ast" 10 10 - ) 11 11 - 12 12 - func GenerateCamoURL(baseURL, secret, imageURL string) string { 13 13 - h := hmac.New(sha256.New, []byte(secret)) 14 14 - h.Write([]byte(imageURL)) 15 15 - signature := hex.EncodeToString(h.Sum(nil)) 16 16 - hexURL := hex.EncodeToString([]byte(imageURL)) 17 17 - return fmt.Sprintf("%s/%s/%s", baseURL, signature, hexURL) 18 18 - } 19 19 - 20 20 - func (rctx *RenderContext) camoImageLinkTransformer(dst string) string { 21 21 - // don't camo on dev 22 22 - if rctx.IsDev { 23 23 - return dst 24 24 - } 25 25 - 26 26 - if rctx.CamoUrl != "" && rctx.CamoSecret != "" { 27 27 - return GenerateCamoURL(rctx.CamoUrl, rctx.CamoSecret, dst) 28 28 - } 29 29 - 30 30 - return dst 31 31 - } 32 32 - 33 33 - func (rctx *RenderContext) camoImageLinkAstTransformer(img *ast.Image) { 34 34 - dst := string(img.Destination) 35 35 - img.Destination = []byte(rctx.camoImageLinkTransformer(dst)) 36 36 - }

-1

appview/pages/markup/markdown.go

reviewed

··· 188 188 dstUrl, _ := url.Parse(attr.Val) 189 189 if camoUrl != nil && dstUrl != nil && dstUrl.Host != camoUrl.Host { 190 190 attr.Val = ctx.imageToRawTransformer(attr.Val) 191 191 - attr.Val = ctx.camoImageLinkTransformer(attr.Val) 192 191 node.Attr[i] = attr 193 192 } 194 193 }

-4

appview/repo/blob.go

reviewed

··· 278 278 query.Set("raw", "true") 279 279 280 280 blobURL := fmt.Sprintf("%s/xrpc/%s?%s", config.KnotMirror.Url, tangled.GitTempGetBlobNSID, query.Encode()) 281 281 - 282 282 - if config.Camo.Enabled() { 283 283 - return markup.GenerateCamoURL(config.Camo.Host, config.Camo.SharedSecret, blobURL) 284 284 - } 285 281 return blobURL 286 282 } 287 283