From 18ab0d6903e258bffcd916196b92391e49b6bd0d Mon Sep 17 00:00:00 2001 From: Akshay Date: Mon, 3 Feb 2025 17:08:57 +0000 Subject: [PATCH] POC: create repos --- appview/db/db.go | 2 - appview/db/pubkeys.go | 26 ++++++-- appview/pages/login.html | 2 +- appview/pages/new-repo.html | 15 +++++ appview/pages/pages.go | 8 +++ appview/pages/timeline.html | 1 + appview/state/state.go | 114 +++++++++++++++++++++++++++--------- 7 files changed, 130 insertions(+), 38 deletions(-) create mode 100644 appview/pages/new-repo.html diff --git a/appview/db/db.go b/appview/db/db.go index da24dc4a..cc7a11bd 100644 --- a/appview/db/db.go +++ b/appview/db/db.go @@ -177,8 +177,6 @@ func (d *DB) GetRegistrationKey(domain string) (string, error) { return "", err } - log.Println("domain, secret: ", domain, secret) - return secret, nil } diff --git a/appview/db/pubkeys.go b/appview/db/pubkeys.go index 7315217c..f2fb4db1 100644 --- a/appview/db/pubkeys.go +++ b/appview/db/pubkeys.go @@ -1,6 +1,9 @@ package db -import "time" +import ( + "encoding/json" + "time" +) func (d *DB) AddPublicKey(did, name, key string) error { query := `insert into public_keys (did, name, key) values (?, ?, ?)` @@ -15,12 +18,23 @@ func (d *DB) RemovePublicKey(did string) error { } type PublicKey struct { - Key string - Name string - DID string + Did string `json:"did"` + Key string `json:"key"` + Name string `json:"name"` Created time.Time } +func (p PublicKey) MarshalJSON() ([]byte, error) { + type Alias PublicKey + return json.Marshal(&struct { + Created int64 `json:"created"` + *Alias + }{ + Created: p.Created.Unix(), + Alias: (*Alias)(&p), + }) +} + func (d *DB) GetAllPublicKeys() ([]PublicKey, error) { var keys []PublicKey @@ -33,7 +47,7 @@ func (d *DB) GetAllPublicKeys() ([]PublicKey, error) { for rows.Next() { var publicKey PublicKey var createdAt *int64 - if err := rows.Scan(&publicKey.Key, &publicKey.Name, &publicKey.DID, &createdAt); err != nil { + if err := rows.Scan(&publicKey.Key, &publicKey.Name, &publicKey.Did, &createdAt); err != nil { return nil, err } publicKey.Created = time.Unix(*createdAt, 0) @@ -59,7 +73,7 @@ func (d *DB) GetPublicKeys(did string) ([]PublicKey, error) { for rows.Next() { var publicKey PublicKey var createdAt *int64 - if err := rows.Scan(&publicKey.DID, &publicKey.Key, &publicKey.Name, &createdAt); err != nil { + if err := rows.Scan(&publicKey.Did, &publicKey.Key, &publicKey.Name, &createdAt); err != nil { return nil, err } publicKey.Created = time.Unix(*createdAt, 0) diff --git a/appview/pages/login.html b/appview/pages/login.html index 20674e17..961a69e8 100644 --- a/appview/pages/login.html +++ b/appview/pages/login.html @@ -1,7 +1,7 @@ {{define "title"}}login{{end}} {{define "content"}} -

Login

+

login

diff --git a/appview/pages/new-repo.html b/appview/pages/new-repo.html new file mode 100644 index 00000000..5482f279 --- /dev/null +++ b/appview/pages/new-repo.html @@ -0,0 +1,15 @@ +{{define "title"}}new repo{{end}} + +{{define "content"}} +

new repo

+ + + + + + + + +
+{{end}} + diff --git a/appview/pages/pages.go b/appview/pages/pages.go index 90076232..04e767f6 100644 --- a/appview/pages/pages.go +++ b/appview/pages/pages.go @@ -77,3 +77,11 @@ type KnotParams struct { func Knot(w io.Writer, p KnotParams) error { return parse("knot.html").Execute(w, p) } + +type NewRepoParams struct { + User *auth.User +} + +func NewRepo(w io.Writer, p NewRepoParams) error { + return parse("new-repo.html").Execute(w, p) +} diff --git a/appview/pages/timeline.html b/appview/pages/timeline.html index a97bc7d2..783c5072 100644 --- a/appview/pages/timeline.html +++ b/appview/pages/timeline.html @@ -7,6 +7,7 @@

logged in as {{ .User.Handle }}

settings knots + add repos {{ else }}

not logged in

login diff --git a/appview/state/state.go b/appview/state/state.go index 4d84789c..052a5661 100644 --- a/appview/state/state.go +++ b/appview/state/state.go @@ -1,9 +1,11 @@ package state import ( + "bytes" "crypto/hmac" "crypto/sha256" "encoding/hex" + "encoding/json" "fmt" "log" "net/http" @@ -194,30 +196,32 @@ func (s *State) Keys(w http.ResponseWriter, r *http.Request) { // create a signed request and check if a node responds to that func (s *State) InitKnotServer(w http.ResponseWriter, r *http.Request) { + user := s.auth.GetUser(r) + domain := chi.URLParam(r, "domain") if domain == "" { http.Error(w, "malformed url", http.StatusBadRequest) return } - log.Println("checking ", domain) - secret, err := s.db.GetRegistrationKey(domain) + url := fmt.Sprintf("http://%s/init", domain) + + body, _ := json.Marshal(map[string]interface{}{ + "did": user.Did, + "keys": []string{}, + }) + pingRequest, err := http.NewRequest("POST", url, bytes.NewBuffer(body)) if err != nil { - log.Printf("no key found for domain %s: %s\n", domain, err) + log.Println("failed to build ping request", err) return } - log.Println("has secret ", secret) - - // make a request do the knotserver with an empty body and above signature - url := fmt.Sprintf("http://%s/health", domain) - pingRequest, err := http.NewRequest("GET", url, nil) + secret, err := s.db.GetRegistrationKey(domain) if err != nil { - log.Println("failed to build ping request", err) + log.Printf("no key found for domain %s: %s\n", domain, err) return } - client := SignedClient(secret) resp, err := client.Do(pingRequest) @@ -227,7 +231,13 @@ func (s *State) InitKnotServer(w http.ResponseWriter, r *http.Request) { return } - if resp.StatusCode != http.StatusOK { + if resp.StatusCode == http.StatusConflict { + log.Println("status conflict", resp.StatusCode) + w.Write([]byte("already registered, sorry!")) + return + } + + if resp.StatusCode != http.StatusNoContent { log.Println("status nok", resp.StatusCode) w.Write([]byte("no dice")) return @@ -384,27 +394,65 @@ func (s *State) AddMember(w http.ResponseWriter, r *http.Request) { w.Write([]byte(fmt.Sprint("added member: ", memberIdent.Handle.String()))) } -// list members of domain, requires auth and requires owner status func (s *State) RemoveMember(w http.ResponseWriter, r *http.Request) { } -// func buildPingRequest(url, secret string) (*http.Request, error) { -// pingRequest, err := http.NewRequest("GET", url, nil) -// if err != nil { -// return nil, err -// } -// -// timestamp := time.Now().Format(time.RFC3339) -// mac := hmac.New(sha256.New, []byte(secret)) -// message := pingRequest.Method + pingRequest.URL.Path + timestamp -// mac.Write([]byte(message)) -// signature := hex.EncodeToString(mac.Sum(nil)) -// -// pingRequest.Header.Set("X-Signature", signature) -// pingRequest.Header.Set("X-Timestamp", timestamp) -// -// return pingRequest, nil -// } +func (s *State) AddRepo(w http.ResponseWriter, r *http.Request) { + switch r.Method { + case http.MethodGet: + pages.NewRepo(w, pages.NewRepoParams{ + User: s.auth.GetUser(r), + }) + case http.MethodPost: + user := s.auth.GetUser(r) + + domain := r.FormValue("domain") + if domain == "" { + log.Println("invalid form") + return + } + + repoName := r.FormValue("name") + if repoName == "" { + log.Println("invalid form") + return + } + + ok, err := s.enforcer.E.Enforce(user.Did, domain, domain, "repo:create") + if err != nil || !ok { + w.Write([]byte("domain inaccessible to you")) + return + } + + secret, err := s.db.GetRegistrationKey(domain) + if err != nil { + log.Printf("no key found for domain %s: %s\n", domain, err) + return + } + + client := SignedClient(secret) + url := fmt.Sprintf("http://%s/repo/new", domain) + body, _ := json.Marshal(map[string]interface{}{ + "did": user.Did, + "name": repoName, + }) + createRepoRequest, err := http.NewRequest("PUT", url, bytes.NewReader(body)) + + resp, err := client.Do(createRepoRequest) + + if err != nil { + log.Println("failed to send create repo request", err) + return + } + + if resp.StatusCode != http.StatusNoContent { + log.Println("server returned ", resp.StatusCode) + return + } + + w.Write([]byte("created!")) + } +} func (s *State) Router() http.Handler { r := chi.NewRouter() @@ -431,6 +479,14 @@ func (s *State) Router() http.Handler { }) }) + r.Route("/repo", func(r chi.Router) { + r.Route("/new", func(r chi.Router) { + r.Get("/", s.AddRepo) + r.Post("/", s.AddRepo) + }) + // r.Post("/import", s.ImportRepo) + }) + r.Group(func(r chi.Router) { r.Use(AuthMiddleware(s)) r.Get("/settings", s.Settings) -- knotmirror 0.0.1