Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sample personality library proof-of-concept #156

Closed
wants to merge 1 commit into from
Closed

Sample personality library proof-of-concept #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 33 additions & 28 deletions cmd/example-gcp/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (

kms "cloud.google.com/go/kms/apiv1"
tessera "github.com/transparency-dev/trillian-tessera"
samplepersonality "github.com/transparency-dev/trillian-tessera/personalities/sample"
"github.com/transparency-dev/trillian-tessera/storage/gcp"
"golang.org/x/mod/sumdb/note"
"k8s.io/klog/v2"
Expand Down Expand Up @@ -74,29 +75,6 @@ func main() {
klog.Exitf("Failed to create new GCP storage: %v", err)
}

http.HandleFunc("POST /add", func(w http.ResponseWriter, r *http.Request) {
b, err := io.ReadAll(r.Body)
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
return
}
defer r.Body.Close()

id := sha256.Sum256(b)
idx, err := storage.Add(r.Context(), tessera.NewEntry(b, tessera.WithIdentity(id[:])))
if err != nil {
if errors.Is(err, tessera.ErrPushback) {
w.Header().Add("Retry-After", "1")
w.WriteHeader(http.StatusServiceUnavailable)
return
}
w.WriteHeader(http.StatusInternalServerError)
_, _ = w.Write([]byte(err.Error()))
return
}
_, _ = w.Write([]byte(fmt.Sprintf("%d", idx)))
})

// TODO: remove this proxy
serveGCS := func(w http.ResponseWriter, r *http.Request) {
resource := strings.TrimLeft(r.URL.Path, "/")
Expand All @@ -109,12 +87,14 @@ func main() {
}
_, _ = w.Write(b)
}
http.HandleFunc("GET /checkpoint", serveGCS)
http.HandleFunc("GET /tile/", serveGCS)

if err := http.ListenAndServe(*listen, http.DefaultServeMux); err != nil {
klog.Exitf("ListenAndServe: %v", err)
}
personality := samplepersonality.New(ctx, samplepersonality.Handlers{
Checkpoint: serveGCS,
Tile: serveGCS,
EntryBundle: serveGCS,
Add: addHandler(storage),
})
personality.Run(*listen)
}

// signerFromFlags creates and returns a new KMSSigner from the flags, along with a close func.
Expand All @@ -138,3 +118,28 @@ func signerFromFlags(ctx context.Context) (note.Signer, note.Verifier, func() er

return signer, verifier, kmClient.Close
}

func addHandler(storage *gcp.Storage) func(w http.ResponseWriter, r *http.Request) {
return func(w http.ResponseWriter, r *http.Request) {
b, err := io.ReadAll(r.Body)
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
return
}
defer r.Body.Close()

id := sha256.Sum256(b)
idx, err := storage.Add(r.Context(), tessera.NewEntry(b, tessera.WithIdentity(id[:])))
if err != nil {
if errors.Is(err, tessera.ErrPushback) {
w.Header().Add("Retry-After", "1")
w.WriteHeader(http.StatusServiceUnavailable)
return
}
w.WriteHeader(http.StatusInternalServerError)
_, _ = w.Write([]byte(err.Error()))
return
}
_, _ = w.Write([]byte(fmt.Sprintf("%d", idx)))
}
}
87 changes: 50 additions & 37 deletions cmd/example-mysql/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (

tessera "github.com/transparency-dev/trillian-tessera"
"github.com/transparency-dev/trillian-tessera/api/layout"
samplepersonality "github.com/transparency-dev/trillian-tessera/personalities/sample"
"github.com/transparency-dev/trillian-tessera/storage/mysql"
"golang.org/x/mod/sumdb/note"
"k8s.io/klog/v2"
Expand Down Expand Up @@ -80,7 +81,43 @@ func main() {
klog.Exitf("Failed to create new MySQL storage: %v", err)
}

http.HandleFunc("GET /checkpoint", func(w http.ResponseWriter, r *http.Request) {
personality := samplepersonality.New(ctx, samplepersonality.Handlers{
Checkpoint: checkpointHandler(storage),
Tile: tileHandler(storage),
EntryBundle: entryBundleHandler(storage),
Add: addHandler(storage),
})
personality.Run(*listen)
}

func initDatabaseSchema(ctx context.Context) {
if *initSchemaPath != "" {
klog.Infof("Initializing database schema")

db, err := sql.Open("mysql", *mysqlURI+"?multiStatements=true")
if err != nil {
klog.Exitf("Failed to connect to DB: %v", err)
}
defer func() {
if err := db.Close(); err != nil {
klog.Warningf("Failed to close db: %v", err)
}
}()

rawSchema, err := os.ReadFile(*initSchemaPath)
if err != nil {
klog.Exitf("Failed to read init schema file %q: %v", *initSchemaPath, err)
}
if _, err := db.ExecContext(ctx, string(rawSchema)); err != nil {
klog.Exitf("Failed to execute init database schema: %v", err)
}

klog.Infof("Database schema initialized")
}
}

func checkpointHandler(storage *mysql.Storage) func(w http.ResponseWriter, r *http.Request) {
return func(w http.ResponseWriter, r *http.Request) {
checkpoint, err := storage.ReadCheckpoint(r.Context())
if err != nil {
klog.Errorf("/checkpoint: %v", err)
Expand All @@ -96,9 +133,11 @@ func main() {
klog.Errorf("/checkpoint: %v", err)
return
}
})
}
}

http.HandleFunc("GET /tile/{level}/{index...}", func(w http.ResponseWriter, r *http.Request) {
func tileHandler(storage *mysql.Storage) func(w http.ResponseWriter, r *http.Request) {
return func(w http.ResponseWriter, r *http.Request) {
level, index, width, err := layout.ParseTileLevelIndexWidth(r.PathValue("level"), r.PathValue("index"))
if err != nil {
w.WriteHeader(http.StatusBadRequest)
Expand All @@ -125,9 +164,11 @@ func main() {
klog.Errorf("/tile/{level}/{index...}: %v", err)
return
}
})
}
}

http.HandleFunc("GET /tile/entries/{index...}", func(w http.ResponseWriter, r *http.Request) {
func entryBundleHandler(storage *mysql.Storage) func(w http.ResponseWriter, r *http.Request) {
return func(w http.ResponseWriter, r *http.Request) {
index, _, err := layout.ParseTileIndexWidth(r.PathValue("index"))
if err != nil {
w.WriteHeader(http.StatusBadRequest)
Expand All @@ -154,9 +195,11 @@ func main() {
klog.Errorf("/tile/entries/{index...}: %v", err)
return
}
})
}
}

http.HandleFunc("POST /add", func(w http.ResponseWriter, r *http.Request) {
func addHandler(storage *mysql.Storage) func(w http.ResponseWriter, r *http.Request) {
return func(w http.ResponseWriter, r *http.Request) {
b, err := io.ReadAll(r.Body)
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
Expand All @@ -177,35 +220,5 @@ func main() {
klog.Errorf("/add: %v", err)
return
}
})

if err := http.ListenAndServe(*listen, http.DefaultServeMux); err != nil {
klog.Exitf("ListenAndServe: %v", err)
}
}

func initDatabaseSchema(ctx context.Context) {
if *initSchemaPath != "" {
klog.Infof("Initializing database schema")

db, err := sql.Open("mysql", *mysqlURI+"?multiStatements=true")
if err != nil {
klog.Exitf("Failed to connect to DB: %v", err)
}
defer func() {
if err := db.Close(); err != nil {
klog.Warningf("Failed to close db: %v", err)
}
}()

rawSchema, err := os.ReadFile(*initSchemaPath)
if err != nil {
klog.Exitf("Failed to read init schema file %q: %v", *initSchemaPath, err)
}
if _, err := db.ExecContext(ctx, string(rawSchema)); err != nil {
klog.Exitf("Failed to execute init database schema: %v", err)
}

klog.Infof("Database schema initialized")
}
}
39 changes: 39 additions & 0 deletions personalities/sample/sample.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package samplepersonality

import (
"context"
"net/http"

"k8s.io/klog/v2"
)

type SamplePersonality struct {
handlers Handlers
}

type Handlers struct {
// Read
Checkpoint,
Tile,
EntryBundle,

// Write
Add func(http.ResponseWriter, *http.Request)
}

func New(ctx context.Context, handlers Handlers) SamplePersonality {
return SamplePersonality{
handlers: handlers,
}
}

func (p *SamplePersonality) Run(addr string) {
http.HandleFunc("GET /checkpoint", p.handlers.Checkpoint)
http.HandleFunc("GET /tile/{level}/{index...}", p.handlers.Tile)
http.HandleFunc("GET /tile/entries/{index...}", p.handlers.EntryBundle)
http.HandleFunc("POST /add", p.handlers.Add)

if err := http.ListenAndServe(addr, http.DefaultServeMux); err != nil {
klog.Exitf("ListenAndServe: %v", err)
}
}
Loading