forked from tangled.org/core
this repo has no description

update keyfetch to work with current knotserver

Changed files
+9 -10
cmd
keyfetch
knotserver
+3 -3
cmd/keyfetch/format.go
··· 4 4 "fmt" 5 5 ) 6 6 7 - func formatKeyData(repoguardPath string, data map[string]string) string { 7 + func formatKeyData(repoguardPath string, data []map[string]interface{}) string { 8 8 var result string 9 - for user, key := range data { 9 + for _, entry := range data { 10 10 result += fmt.Sprintf( 11 11 `command="%s -base-dir /home/git -user %s -log-path /home/git/log ",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty %s`+"\n", 12 - repoguardPath, user, key) 12 + repoguardPath, entry["did"], entry["key"]) 13 13 } 14 14 return result 15 15 }
+3 -3
cmd/keyfetch/main.go
··· 10 10 ) 11 11 12 12 func main() { 13 - endpoint := flag.String("internal-api", "http://localhost:5444", "Internal API endpoint") 13 + endpoint := flag.String("internal-api", "http://localhost:5555", "Internal API endpoint") 14 14 repoguardPath := flag.String("repoguard-path", "/home/git/repoguard", "Path to the repoguard binary") 15 15 flag.Parse() 16 16 17 - resp, err := http.Get(*endpoint + "/internal/allkeys") 17 + resp, err := http.Get(*endpoint + "/keys") 18 18 if err != nil { 19 19 log.Fatalf("error fetching keys: %v", err) 20 20 } ··· 25 25 log.Fatalf("error reading response body: %v", err) 26 26 } 27 27 28 - var data map[string]string 28 + var data []map[string]interface{} 29 29 err = json.Unmarshal(body, &data) 30 30 if err != nil { 31 31 log.Fatalf("error unmarshalling response body: %v", err)
+3 -4
knotserver/db/pubkeys.go
··· 46 46 47 47 func (pk *PublicKey) JSON() map[string]interface{} { 48 48 return map[string]interface{}{ 49 - pk.Did: map[string]interface{}{ 50 - "key": pk.Key, 51 - "created": pk.Created, 52 - }, 49 + "did": pk.Did, 50 + "key": pk.Key, 51 + "created": pk.Created, 53 52 } 54 53 } 55 54