LBRYCommunity/tracker
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Correctly handle ErrBadRequest in the announce handler

Browse source
This commit is contained in:
Justin Li 2014-07-23 01:24:31 -04:00
parent 34729e3c91
commit 84195deb58
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
http/http.go
View file

@ -35,7 +35,7 @@ func makeHandler(handler ResponseHandler) httprouter.Handle {
duration := time.Since(start)
stats.RecordTiming(stats.ResponseTime, duration)
if err != nil && err != models.ErrBadRequest {
if err != nil {
stats.RecordEvent(stats.ErroredRequest)
http.Error(w, err.Error(), httpCode)
if glog.V(2) {

2
http/routes.go
View file

@ -42,7 +42,7 @@ func (s *Server) serveAnnounce(w http.ResponseWriter, r *http.Request, p httprou
ann, err := NewAnnounce(s.config, r, p)
writer := &Writer{w}
if err == models.ErrMalformedRequest {
if err == models.ErrMalformedRequest || err == models.ErrBadRequest {
writer.WriteError(err)
return http.StatusOK, nil
} else if err != nil {

10
tracker/announce.go
View file

@ -68,12 +68,12 @@ func (tkr *Tracker) HandleAnnounce(ann *models.Announce, w Writer) error {
peer := models.NewPeer(ann, user, torrent)
created, err := updateSwarm(conn, w, ann, peer, torrent)
created, err := updateSwarm(conn, ann, peer, torrent)
if err != nil {
return err
}
snatched, err := handleEvent(conn, w, ann, peer, user, torrent)
snatched, err := handleEvent(conn, ann, peer, user, torrent)
if err != nil {
return err
}
@ -95,7 +95,7 @@ func (tkr *Tracker) HandleAnnounce(ann *models.Announce, w Writer) error {
}
// updateSwarm handles the changes to a torrent's swarm given an announce.
func updateSwarm(c Conn, w Writer, ann *models.Announce, p *models.Peer, t *models.Torrent) (created bool, err error) {
func updateSwarm(c Conn, ann *models.Announce, p *models.Peer, t *models.Torrent) (created bool, err error) {
c.TouchTorrent(t.Infohash)
switch {
@ -116,7 +116,6 @@ func updateSwarm(c Conn, w Writer, ann *models.Announce, p *models.Peer, t *mode
default:
if ann.Event != "" && ann.Event != "started" {
err = models.ErrBadRequest
w.WriteError(err)
return
}
@ -144,7 +143,7 @@ func updateSwarm(c Conn, w Writer, ann *models.Announce, p *models.Peer, t *mode
// handleEvent checks to see whether an announce has an event and if it does,
// properly handles that event.
func handleEvent(c Conn, w Writer, ann *models.Announce, p *models.Peer, u *models.User, t *models.Torrent) (snatched bool, err error) {
func handleEvent(c Conn, ann *models.Announce, p *models.Peer, u *models.User, t *models.Torrent) (snatched bool, err error) {
switch {
case ann.Event == "stopped" || ann.Event == "paused":
// updateSwarm checks if the peer is active on the torrent,
@ -185,7 +184,6 @@ func handleEvent(c Conn, w Writer, ann *models.Announce, p *models.Peer, u *mode
err = leecherFinished(c, t.Infohash, p)
} else {
err = models.ErrBadRequest
w.WriteError(err)
}
snatched = true