commit bc7c19e9cf78c0fe16c850109668cb9fe2270dc8 · dunkirk.sh/core

+37 -13

knotserver/db/pubkeys.go

···

       1
       1
        
       package db

     

       2
       2
        
       

     

       3
       3
       -
       import "time"

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"time"

     

       5
       5
       +
       

     

       6
       6
       +
       	shbild "github.com/icyphox/bild/api/bild"

     

       7
       7
       +
       )

     

       8
       8
       +
       

     

       9
       9
       +
       type PublicKey struct {

     

       10
       10
       +
       	Did string

     

       11
       11
       +
       	shbild.PublicKey

     

       12
       12
       +
       }

     

       13
       13
       +
       

     

       14
       14
       +
       func (d *DB) AddPublicKeyFromRecord(recordIface map[string]interface{}) error {

     

       15
       15
       +
       	record := make(map[string]string)

     

       16
       16
       +
       	for k, v := range recordIface {

     

       17
       17
       +
       		if str, ok := v.(string); ok {

     

       18
       18
       +
       			record[k] = str

     

       19
       19
       +
       		}

     

       20
       20
       +
       	}

     

       4
       21
        
       

     

       5
       5
       -
       func (d *DB) AddPublicKey(did, name, key string) error {

     

       22
       22
       +
       	pk := PublicKey{

     

       23
       23
       +
       		Did: record["did"],

     

       24
       24
       +
       	}

     

       25
       25
       +
       	pk.Name = record["name"]

     

       26
       26
       +
       	pk.Key = record["key"]

     

       27
       27
       +
       	pk.Created = record["created"]

     

       28
       28
       +
       

     

       29
       29
       +
       	return d.AddPublicKey(pk)

     

       30
       30
       +
       }

     

       31
       31
       +
       

     

       32
       32
       +
       func (d *DB) AddPublicKey(pk PublicKey) error {

     

       33
       33
       +
       	if pk.Created == "" {

     

       34
       34
       +
       		pk.Created = time.Now().Format("2006-01-02 15:04:05.99999999 -0700 MST m=-0000.000000000")

     

       35
       35
       +
       	}

     

       36
       36
       +
       

     

       6
       37
        
       	query := `insert into public_keys (did, name, key, created) values (?, ?, ?, ?)`

     

       7
       7
       -
       	_, err := d.db.Exec(query, did, name, key, time.Now())

     

       38
       38
       +
       	_, err := d.db.Exec(query, pk.Did, pk.Name, pk.Key, pk.Created)

     

       8
       39
        
       	return err

     

       9
       40
        
       }

     

       10
       41
        
       

     
···

       14
       45
        
       	return err

     

       15
       46
        
       }

     

       16
       47
        
       

     

       17
       17
       -
       type PublicKey struct {

     

       18
       18
       -
       	Key     string

     

       19
       19
       -
       	Name    string

     

       20
       20
       -
       	DID     string

     

       21
       21
       -
       	Created time.Time

     

       22
       22
       -
       }

     

       23
       23
       -
       

     

       24
       48
        
       func (pk *PublicKey) JSON() map[string]interface{} {

     

       25
       49
        
       	return map[string]interface{}{

     

       26
       26
       -
       		pk.DID: map[string]interface{}{

     

       50
       50
       +
       		pk.Did: map[string]interface{}{

     

       27
       51
        
       			"key":     pk.Key,

     

       28
       52
        
       			"name":    pk.Name,

     

       29
       53
        
       			"created": pk.Created,

     
···

       42
       66
        
       

     

       43
       67
        
       	for rows.Next() {

     

       44
       68
        
       		var publicKey PublicKey

     

       45
       45
       -
       		if err := rows.Scan(&publicKey.Key, &publicKey.Name, &publicKey.DID, &publicKey.Created); err != nil {

     

       69
       69
       +
       		if err := rows.Scan(&publicKey.Key, &publicKey.Name, &publicKey.Did, &publicKey.Created); err != nil {

     

       46
       70
        
       			return nil, err

     

       47
       71
        
       		}

     

       48
       72
        
       		keys = append(keys, publicKey)

     
···

       66
       90
        
       

     

       67
       91
        
       	for rows.Next() {

     

       68
       92
        
       		var publicKey PublicKey

     

       69
       69
       -
       		if err := rows.Scan(&publicKey.DID, &publicKey.Key, &publicKey.Name, &publicKey.Created); err != nil {

     

       93
       93
       +
       		if err := rows.Scan(&publicKey.Did, &publicKey.Key, &publicKey.Name, &publicKey.Created); err != nil {

     

       70
       94
        
       			return nil, err

     

       71
       95
        
       		}

     

       72
       96
        
       		keys = append(keys, publicKey)

+20 -31

knotserver/handler.go

···

       56
       56
        
       		})

     

       57
       57
        
       	})

     

       58
       58
        
       

     

       59
       59
       +
       	// Create a new repository

     

       59
       60
        
       	r.Route("/repo", func(r chi.Router) {

     

       61
       61
       +
       		r.Use(h.VerifySignature)

     

       60
       62
        
       		r.Put("/new", h.NewRepo)

     

       61
       63
        
       	})

     

       62
       64
        
       

     

       65
       65
       +
       	// Add a new user to the knot

     

       66
       66
       +
       	// r.With(h.VerifySignature).Put("/user", h.AddUser)

     

       67
       67
       +
       

     

       68
       68
       +
       	// Health check. Used for two-way verification with appview.

     

       63
       69
        
       	r.With(h.VerifySignature).Get("/health", h.Health)

     

       64
       70
        
       

     

       65
       65
       -
       	r.Group(func(r chi.Router) {

     

       66
       66
       -
       		r.Use(h.VerifySignature)

     

       67
       67
       -
       		r.Get("/keys", h.Keys)

     

       68
       68
       -
       		r.Put("/keys", h.Keys)

     

       69
       69
       -
       	})

     

       71
       71
       +
       	// All public keys on the knot

     

       72
       72
       +
       	r.Get("/keys", h.Keys)

     

       70
       73
        
       

     

       71
       74
        
       	return r, nil

     

       72
       75
        
       }

     
···

       90
       93
        
       			}

     

       91
       94
        
       

     

       92
       95
        
       			if kind, ok := data["kind"].(string); ok && kind == "commit" {

     

       93
       93
       -
       				log.Printf("commit event: %+v", data)

     

       96
       96
       +
       				commit := data["commit"].(map[string]interface{})

     

       97
       97
       +
       

     

       98
       98
       +
       				switch commit["collection"].(string) {

     

       99
       99
       +
       				case tangled.PublicKeyNSID:

     

       100
       100
       +
       					record := commit["record"].(map[string]interface{})

     

       101
       101
       +
       					if err := h.db.AddPublicKeyFromRecord(record); err != nil {

     

       102
       102
       +
       						log.Printf("failed to add public key: %v", err)

     

       103
       103
       +
       					}

     

       104
       104
       +
       					log.Printf("added public key from firehose: %s", data["did"])

     

       105
       105
       +
       				default:

     

       106
       106
       +
       				}

     

       94
       107
        
       			}

     

       108
       108
       +
       

     

       95
       109
        
       		}

     

       96
       110
        
       	}()

     

       97
       111
        
       

     

       98
       98
       -
       	log.Printf("started jetstream")

     

       99
       99
       -
       

     

       100
       112
        
       	return nil

     

       101
       113
        
       }

     

       102
       102
       -
       

     

       103
       103
       -
       func (h *Handle) Multiplex(w http.ResponseWriter, r *http.Request) {

     

       104
       104
       -
       	path := chi.URLParam(r, "*")

     

       105
       105
       -
       

     

       106
       106
       -
       	if r.URL.RawQuery == "service=git-receive-pack" {

     

       107
       107
       -
       		w.WriteHeader(http.StatusBadRequest)

     

       108
       108
       -
       		w.Write([]byte("no pushing allowed!"))

     

       109
       109
       -
       		return

     

       110
       110
       -
       	}

     

       111
       111
       -
       

     

       112
       112
       -
       	fmt.Println(r.URL.RawQuery)

     

       113
       113
       -
       	fmt.Println(r.Method)

     

       114
       114
       -
       

     

       115
       115
       -
       	if path == "info/refs" &&

     

       116
       116
       -
       		r.URL.RawQuery == "service=git-upload-pack" &&

     

       117
       117
       -
       		r.Method == "GET" {

     

       118
       118
       -
       		h.InfoRefs(w, r)

     

       119
       119
       -
       	} else if path == "git-upload-pack" && r.Method == "POST" {

     

       120
       120
       -
       		h.UploadPack(w, r)

     

       121
       121
       -
       	} else if r.Method == "GET" {

     

       122
       122
       -
       		h.RepoIndex(w, r)

     

       123
       123
       -
       	}

     

       124
       124
       -
       }

+1 -1

knotserver/routes.go

···

       356
       356
        
       			writeError(w, "invalid pubkey", http.StatusBadRequest)

     

       357
       357
        
       		}

     

       358
       358
        
       

     

       359
       359
       -
       		if err := h.db.AddPublicKey(pk.DID, pk.Name, pk.Key); err != nil {

     

       359
       359
       +
       		if err := h.db.AddPublicKey(pk); err != nil {

     

       360
       360
        
       			writeError(w, err.Error(), http.StatusInternalServerError)

     

       361
       361
        
       			log.Printf("adding public key: %s", err)

     

       362
       362
        
       			return