Mirror/mochi
1
0
Fork 0
mirror of https://github.com/sot-tech/mochi.git synced 2026-05-17 13:24:50 -07:00
Code Issues Packages Projects Releases Wiki Activity

Don't return error while converting hash to v1

Browse Source 
Mark clientapproval as broken because of incorrect client_id parsing
This commit is contained in:
Širhoe Biazhkovič
2021-10-27 16:48:28 +03:00
committed by Lawrence, Rendall
parent 2f092bad45
commit af1cbc543c
6 changed files with 46 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
middleware/clientapproval/clientapproval.go
View File

@@ -44,15 +44,15 @@ type Config struct {
}
type hook struct {
approved map[bittorrent.ClientID]struct{}
unapproved map[bittorrent.ClientID]struct{}
approved map[ClientID]struct{}
unapproved map[ClientID]struct{}
}
// NewHook returns an instance of the client approval middleware.
func NewHook(cfg Config) (middleware.Hook, error) {
h := &hook{
approved: make(map[bittorrent.ClientID]struct{}),
unapproved: make(map[bittorrent.ClientID]struct{}),
approved: make(map[ClientID]struct{}),
unapproved: make(map[ClientID]struct{}),
}
if len(cfg.Whitelist) > 0 && len(cfg.Blacklist) > 0 {
@@ -64,7 +64,7 @@ func NewHook(cfg Config) (middleware.Hook, error) {
if len(cidBytes) != 6 {
return nil, errors.New("client ID " + cidString + " must be 6 bytes")
}
var cid bittorrent.ClientID
var cid ClientID
copy(cid[:], cidBytes)
h.approved[cid] = struct{}{}
}
@@ -74,7 +74,7 @@ func NewHook(cfg Config) (middleware.Hook, error) {
if len(cidBytes) != 6 {
return nil, errors.New("client ID " + cidString + " must be 6 bytes")
}
var cid bittorrent.ClientID
var cid ClientID
copy(cid[:], cidBytes)
h.unapproved[cid] = struct{}{}
}
@@ -83,7 +83,7 @@ func NewHook(cfg Config) (middleware.Hook, error) {
}
func (h *hook) HandleAnnounce(ctx context.Context, req *bittorrent.AnnounceRequest, resp *bittorrent.AnnounceResponse) (context.Context, error) {
clientID := bittorrent.NewClientID(req.Peer.ID)
clientID := NewClientID(req.Peer.ID)
if len(h.approved) > 0 {
if _, found := h.approved[clientID]; !found {