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
···
"fmt"
)
-
func formatKeyData(repoguardPath string, data map[string]string) string {
var result string
-
for user, key := range data {
result += fmt.Sprintf(
`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",
-
repoguardPath, user, key)
}
return result
}
···
"fmt"
)
+
func formatKeyData(repoguardPath string, data []map[string]interface{}) string {
var result string
+
for _, entry := range data {
result += fmt.Sprintf(
`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",
+
repoguardPath, entry["did"], entry["key"])
}
return result
}
+3 -3
cmd/keyfetch/main.go
···
)
func main() {
-
endpoint := flag.String("internal-api", "http://localhost:5444", "Internal API endpoint")
repoguardPath := flag.String("repoguard-path", "/home/git/repoguard", "Path to the repoguard binary")
flag.Parse()
-
resp, err := http.Get(*endpoint + "/internal/allkeys")
if err != nil {
log.Fatalf("error fetching keys: %v", err)
}
···
log.Fatalf("error reading response body: %v", err)
}
-
var data map[string]string
err = json.Unmarshal(body, &data)
if err != nil {
log.Fatalf("error unmarshalling response body: %v", err)
···
)
func main() {
+
endpoint := flag.String("internal-api", "http://localhost:5555", "Internal API endpoint")
repoguardPath := flag.String("repoguard-path", "/home/git/repoguard", "Path to the repoguard binary")
flag.Parse()
+
resp, err := http.Get(*endpoint + "/keys")
if err != nil {
log.Fatalf("error fetching keys: %v", err)
}
···
log.Fatalf("error reading response body: %v", err)
}
+
var data []map[string]interface{}
err = json.Unmarshal(body, &data)
if err != nil {
log.Fatalf("error unmarshalling response body: %v", err)
+3 -4
knotserver/db/pubkeys.go
···
func (pk *PublicKey) JSON() map[string]interface{} {
return map[string]interface{}{
-
pk.Did: map[string]interface{}{
-
"key": pk.Key,
-
"created": pk.Created,
-
},
}
}
···
func (pk *PublicKey) JSON() map[string]interface{} {
return map[string]interface{}{
+
"did": pk.Did,
+
"key": pk.Key,
+
"created": pk.Created,
}
}