JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkg/server: log apikey head

Browse Source 
Change-Id: Ib86987405ea73fe8a1b5cec93cf3b219e36074d1
This commit is contained in:
Egon Elbre 2020-05-04 18:56:20 +03:00
parent acf53bea4d
commit 31b322f07e
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/server/interceptors.go
View File

@ -5,6 +5,7 @@ package server
import (
"context"
"encoding/hex"
"encoding/json"
"fmt"
"io"
@ -17,6 +18,7 @@ import (
"storj.io/common/identity"
"storj.io/common/rpc/rpcpeer"
"storj.io/storj/pkg/auth"
"storj.io/storj/pkg/macaroon"
"storj.io/storj/storage"
)
@ -62,7 +64,7 @@ type nodeRequestLog struct {
GRPCMethod string `json:"grpc_method"`
PeerAddress string `json:"peer_address"`
PeerNodeID string `json:"peer_node_id"`
APIKey string `json:"api_key,omitempty"`
APIHead string `json:"api_head,omitempty"`
Msg interface{} `json:"msg"`
}
@ -71,7 +73,7 @@ func prepareRequestLog(ctx context.Context, req, server interface{}, methodName
GRPCService: fmt.Sprintf("%T", server),
GRPCMethod: methodName,
PeerAddress: "<no peer???>",
APIKey: "",
APIHead: "",
Msg: req,
}
if peer, err := rpcpeer.FromContext(ctx); err == nil {
@ -82,8 +84,11 @@ func prepareRequestLog(ctx context.Context, req, server interface{}, methodName
reqLog.PeerNodeID = fmt.Sprintf("<no peer id: %v>", err)
}
}
if key, ok := auth.GetAPIKey(ctx); ok {
reqLog.APIKey = string(key)
if apikey, ok := auth.GetAPIKey(ctx); ok {
key, err := macaroon.ParseAPIKey(string(apikey))
if err == nil {
reqLog.APIHead = hex.EncodeToString(key.Head())
}
}
return json.Marshal(reqLog)
}