A Verified Mark Certificate cannot be made here: an authority issues it after checking the organisation. What the service can do is hold the file the authority returns, serve it where the DNS record points, and refuse one that would make receivers ignore BIMI without a word. - migration 0015: domain_bimi keeps the PEM chain next to the logo - bimi.InspectCertificate reads a chain and reports every reason it would not work: private key blocks refused outright, the brand-indicator usage, the validity period, the domain (exact, wildcard or organisational), and that the logo embedded in the certificate (gzipped data URI in the logotype extension) is byte for byte the logo being published. Tested against two real public VMCs (eBay via DigiCert, CNN via Valimail) plus mutations - GET /.well-known/bimi/vmc.pem (public, conditional, cacheable for an hour), and PUT/DELETE /api/v1/admin/bimi/certificate; the GET of the logo now reports the certificate as it stands against the logo being served, and replacing a logo under a held certificate says it no longer matches - GET /api/v1/admin/bimi/check looks at what a receiver would: the logo, DMARC enforcement, the BIMI record, the public logo URL, the certificate and its public URL. Its HTTP client is HTTPS only and refuses non-public addresses after DNS, since the URLs come from DNS and an operator field - the DNS record points a= at the held certificate when there is one Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
112 lines
3.3 KiB
Go
112 lines
3.3 KiB
Go
package postgres
|
|
|
|
import (
|
|
"context"
|
|
"crypto/sha256"
|
|
"encoding/hex"
|
|
"errors"
|
|
"fmt"
|
|
|
|
"github.com/jackc/pgx/v5"
|
|
"github.com/jackc/pgx/v5/pgxpool"
|
|
)
|
|
|
|
// BimiRepository stores the logo a domain publishes for BIMI.
|
|
type BimiRepository struct {
|
|
pool *pgxpool.Pool
|
|
}
|
|
|
|
func NewBimiRepository(pool *pgxpool.Pool) *BimiRepository {
|
|
return &BimiRepository{pool: pool}
|
|
}
|
|
|
|
// BimiLogo is a stored mark.
|
|
type BimiLogo struct {
|
|
SVG []byte
|
|
ETag string
|
|
VmcURL string
|
|
// VmcPEM is the certificate chain held here, when the operator uploaded one.
|
|
VmcPEM []byte
|
|
}
|
|
|
|
// Save replaces a domain's logo, returning the digest receivers can cache on.
|
|
func (r *BimiRepository) Save(ctx context.Context, domain string, svg []byte, vmcURL string) (string, error) {
|
|
sum := sha256.Sum256(svg)
|
|
etag := hex.EncodeToString(sum[:])
|
|
|
|
_, err := r.pool.Exec(ctx, `
|
|
INSERT INTO domain_bimi (domain_id, svg, etag, vmc_url, updated_at)
|
|
SELECT d.id, $2, $3, NULLIF($4, ''), NOW() FROM domains d WHERE lower(d.name) = lower($1)
|
|
ON CONFLICT (domain_id) DO UPDATE
|
|
SET svg = EXCLUDED.svg, etag = EXCLUDED.etag,
|
|
vmc_url = EXCLUDED.vmc_url, updated_at = NOW()
|
|
`, domain, svg, etag, vmcURL)
|
|
if err != nil {
|
|
return "", fmt.Errorf("save BIMI logo for %s: %w", domain, err)
|
|
}
|
|
return etag, nil
|
|
}
|
|
|
|
// Load returns a domain's logo, or nil when it has none.
|
|
func (r *BimiRepository) Load(ctx context.Context, domain string) (*BimiLogo, error) {
|
|
var logo BimiLogo
|
|
var vmc *string
|
|
err := r.pool.QueryRow(ctx, `
|
|
SELECT b.svg, b.etag, b.vmc_url, b.vmc_pem
|
|
FROM domain_bimi b JOIN domains d ON d.id = b.domain_id
|
|
WHERE lower(d.name) = lower($1)
|
|
`, domain).Scan(&logo.SVG, &logo.ETag, &vmc, &logo.VmcPEM)
|
|
if errors.Is(err, pgx.ErrNoRows) {
|
|
return nil, nil
|
|
}
|
|
if err != nil {
|
|
return nil, fmt.Errorf("load BIMI logo for %s: %w", domain, err)
|
|
}
|
|
if vmc != nil {
|
|
logo.VmcURL = *vmc
|
|
}
|
|
return &logo, nil
|
|
}
|
|
|
|
// Delete removes a domain's logo.
|
|
func (r *BimiRepository) Delete(ctx context.Context, domain string) error {
|
|
_, err := r.pool.Exec(ctx, `
|
|
DELETE FROM domain_bimi b USING domains d
|
|
WHERE b.domain_id = d.id AND lower(d.name) = lower($1)
|
|
`, domain)
|
|
if err != nil {
|
|
return fmt.Errorf("delete BIMI logo for %s: %w", domain, err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// SaveCertificate stores the certificate chain for a domain that already has a
|
|
// logo. It reports false when there is no logo to attach it to: a certificate
|
|
// only means something next to the logo it was issued for.
|
|
func (r *BimiRepository) SaveCertificate(ctx context.Context, domain string, pem []byte) (bool, error) {
|
|
tag, err := r.pool.Exec(ctx, `
|
|
UPDATE domain_bimi b
|
|
SET vmc_pem = $2, vmc_uploaded_at = NOW()
|
|
FROM domains d
|
|
WHERE b.domain_id = d.id AND lower(d.name) = lower($1)
|
|
`, domain, pem)
|
|
if err != nil {
|
|
return false, fmt.Errorf("save BIMI certificate for %s: %w", domain, err)
|
|
}
|
|
return tag.RowsAffected() > 0, nil
|
|
}
|
|
|
|
// DeleteCertificate removes the stored certificate, leaving the logo.
|
|
func (r *BimiRepository) DeleteCertificate(ctx context.Context, domain string) error {
|
|
_, err := r.pool.Exec(ctx, `
|
|
UPDATE domain_bimi b
|
|
SET vmc_pem = NULL, vmc_uploaded_at = NULL
|
|
FROM domains d
|
|
WHERE b.domain_id = d.id AND lower(d.name) = lower($1)
|
|
`, domain)
|
|
if err != nil {
|
|
return fmt.Errorf("delete BIMI certificate for %s: %w", domain, err)
|
|
}
|
|
return nil
|
|
}
|