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

api routes; status codes fixed

Browse source
This commit is contained in:
Jimmy Zelinskie 2014-07-09 00:53:57 -04:00
parent 6ee6c0bef4
commit afb2376286
4 changed files with 83 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
http/announce.go
View file

@ -16,27 +16,27 @@ import (
"github.com/chihaya/chihaya/models" "github.com/chihaya/chihaya/models"
) )
func (t *Tracker) ServeAnnounce(w http.ResponseWriter, r *http.Request, p httprouter.Params) int { func (t *Tracker) ServeAnnounce(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
ann, err := models.NewAnnounce(t.cfg, r, p) ann, err := models.NewAnnounce(t.cfg, r, p)
if err == models.ErrMalformedRequest { if err == models.ErrMalformedRequest {
fail(w, r, err) fail(w, r, err)
return http.StatusOK return http.StatusOK, nil
} else if err != nil { } else if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
conn, err := t.tp.Get() conn, err := t.tp.Get()
if err != nil { if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
if t.cfg.Whitelist { if t.cfg.Whitelist {
err = conn.FindClient(ann.ClientID()) err = conn.FindClient(ann.ClientID())
if err == tracker.ErrClientUnapproved { if err == tracker.ErrClientUnapproved {
fail(w, r, err) fail(w, r, err)
return http.StatusOK return http.StatusOK, nil
} else if err != nil { } else if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
} }
@ -45,43 +45,43 @@ func (t *Tracker) ServeAnnounce(w http.ResponseWriter, r *http.Request, p httpro
user, err = conn.FindUser(ann.Passkey) user, err = conn.FindUser(ann.Passkey)
if err == tracker.ErrUserDNE { if err == tracker.ErrUserDNE {
fail(w, r, err) fail(w, r, err)
return http.StatusOK return http.StatusOK, nil
} else if err != nil { } else if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
} }
torrent, err := conn.FindTorrent(ann.Infohash) torrent, err := conn.FindTorrent(ann.Infohash)
if err == tracker.ErrTorrentDNE { if err == tracker.ErrTorrentDNE {
fail(w, r, err) fail(w, r, err)
return http.StatusOK return http.StatusOK, nil
} else if err != nil { } else if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
peer := models.NewPeer(ann, user, torrent) peer := models.NewPeer(ann, user, torrent)
created, err := updateTorrent(conn, ann, peer, torrent) created, err := updateTorrent(conn, ann, peer, torrent)
if err != nil { if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
snatched, err := handleEvent(conn, ann, peer, user, torrent) snatched, err := handleEvent(conn, ann, peer, user, torrent)
if err != nil { if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
if t.cfg.Private { if t.cfg.Private {
delta := models.NewAnnounceDelta(ann, peer, user, torrent, created, snatched) delta := models.NewAnnounceDelta(ann, peer, user, torrent, created, snatched)
err = t.bc.RecordAnnounce(delta) err = t.bc.RecordAnnounce(delta)
if err != nil { if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
} }
writeAnnounceResponse(w, ann, user, torrent) writeAnnounceResponse(w, ann, user, torrent)
return http.StatusOK return http.StatusOK, nil
} }
func updateTorrent(c tracker.Conn, a *models.Announce, p *models.Peer, t *models.Torrent) (created bool, err error) { func updateTorrent(c tracker.Conn, a *models.Announce, p *models.Peer, t *models.Torrent) (created bool, err error) {

84
http/api.go
View file

@ -15,156 +15,156 @@ import (
"github.com/chihaya/chihaya/models" "github.com/chihaya/chihaya/models"
) )
func (t *Tracker) getTorrent(w http.ResponseWriter, r *http.Request, p httprouter.Params) int { func (t *Tracker) getTorrent(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
conn, err := t.tp.Get() conn, err := t.tp.Get()
if err != nil { if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
torrent, err := conn.FindTorrent(p.ByName("infohash")) torrent, err := conn.FindTorrent(p.ByName("infohash"))
if err == tracker.ErrTorrentDNE { if err == tracker.ErrTorrentDNE {
return http.StatusNotFound return http.StatusNotFound, err
} else if err != nil { } else if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
e := json.NewEncoder(w) e := json.NewEncoder(w)
err = e.Encode(torrent) err = e.Encode(torrent)
if err != nil { if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
return http.StatusOK return http.StatusOK, nil
} }
func (t *Tracker) putTorrent(w http.ResponseWriter, r *http.Request, p httprouter.Params) int { func (t *Tracker) putTorrent(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
body, err := ioutil.ReadAll(r.Body) body, err := ioutil.ReadAll(r.Body)
if err != nil { if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
var torrent models.Torrent var torrent models.Torrent
err = json.Unmarshal(body, &torrent) err = json.Unmarshal(body, &torrent)
if err != nil { if err != nil {
return http.StatusBadRequest return http.StatusBadRequest, err
} }
conn, err := t.tp.Get() conn, err := t.tp.Get()
if err != nil { if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
err = conn.PutTorrent(&torrent) err = conn.PutTorrent(&torrent)
if err != nil { if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
return http.StatusOK return http.StatusOK, nil
} }
func (t *Tracker) delTorrent(w http.ResponseWriter, r *http.Request, p httprouter.Params) int { func (t *Tracker) delTorrent(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
conn, err := t.tp.Get() conn, err := t.tp.Get()
if err != nil { if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
err = conn.DeleteTorrent(p.ByName("infohash")) err = conn.DeleteTorrent(p.ByName("infohash"))
if err == tracker.ErrTorrentDNE { if err == tracker.ErrTorrentDNE {
return http.StatusNotFound return http.StatusNotFound, err
} else if err != nil { } else if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
return http.StatusOK return http.StatusOK, nil
} }
func (t *Tracker) getUser(w http.ResponseWriter, r *http.Request, p httprouter.Params) int { func (t *Tracker) getUser(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
conn, err := t.tp.Get() conn, err := t.tp.Get()
if err != nil { if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
user, err := conn.FindUser(p.ByName("passkey")) user, err := conn.FindUser(p.ByName("passkey"))
if err == tracker.ErrUserDNE { if err == tracker.ErrUserDNE {
return http.StatusNotFound return http.StatusNotFound, err
} else if err != nil { } else if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
e := json.NewEncoder(w) e := json.NewEncoder(w)
err = e.Encode(user) err = e.Encode(user)
if err != nil { if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
return http.StatusOK return http.StatusOK, nil
} }
func (t *Tracker) putUser(w http.ResponseWriter, r *http.Request, p httprouter.Params) int { func (t *Tracker) putUser(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
body, err := ioutil.ReadAll(r.Body) body, err := ioutil.ReadAll(r.Body)
if err != nil { if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
var user models.User var user models.User
err = json.Unmarshal(body, &user) err = json.Unmarshal(body, &user)
if err != nil { if err != nil {
return http.StatusBadRequest return http.StatusBadRequest, err
} }
conn, err := t.tp.Get() conn, err := t.tp.Get()
if err != nil { if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
err = conn.PutUser(&user) err = conn.PutUser(&user)
if err != nil { if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
return http.StatusOK return http.StatusOK, nil
} }
func (t *Tracker) delUser(w http.ResponseWriter, r *http.Request, p httprouter.Params) int { func (t *Tracker) delUser(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
conn, err := t.tp.Get() conn, err := t.tp.Get()
if err != nil { if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
err = conn.DeleteUser(p.ByName("passkey")) err = conn.DeleteUser(p.ByName("passkey"))
if err == tracker.ErrUserDNE { if err == tracker.ErrUserDNE {
return http.StatusNotFound return http.StatusNotFound, err
} else if err != nil { } else if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
return http.StatusOK return http.StatusOK, nil
} }
func (t *Tracker) putClient(w http.ResponseWriter, r *http.Request, p httprouter.Params) int { func (t *Tracker) putClient(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
conn, err := t.tp.Get() conn, err := t.tp.Get()
if err != nil { if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
err = conn.PutClient(p.ByName("clientID")) err = conn.PutClient(p.ByName("clientID"))
if err != nil { if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
return http.StatusOK return http.StatusOK, nil
} }
func (t *Tracker) delClient(w http.ResponseWriter, r *http.Request, p httprouter.Params) int { func (t *Tracker) delClient(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
conn, err := t.tp.Get() conn, err := t.tp.Get()
if err != nil { if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
err = conn.DeleteClient(p.ByName("clientID")) err = conn.DeleteClient(p.ByName("clientID"))
if err != nil { if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
return http.StatusOK return http.StatusOK, nil
} }

20
http/http.go
View file

@ -42,12 +42,15 @@ func NewTracker(cfg *config.Config) (*Tracker, error) {
}, nil }, nil
} }
type ResponseHandler func(http.ResponseWriter, *http.Request, httprouter.Params) int type ResponseHandler func(http.ResponseWriter, *http.Request, httprouter.Params) (int, error)
func makeHandler(handler ResponseHandler) httprouter.Handle { func makeHandler(handler ResponseHandler) httprouter.Handle {
return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) { return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
start := time.Now() start := time.Now()
code := handler(w, r, p) code, err := handler(w, r, p)
if err != nil {
http.Error(w, err.Error(), code)
}
glog.Infof( glog.Infof(
"Completed %v %s %s in %v", "Completed %v %s %s in %v",
code, code,
@ -60,14 +63,27 @@ func makeHandler(handler ResponseHandler) httprouter.Handle {
func setupRoutes(t *Tracker, cfg *config.Config) *httprouter.Router { func setupRoutes(t *Tracker, cfg *config.Config) *httprouter.Router {
r := httprouter.New() r := httprouter.New()
r.GET("/torrents/:infohash", makeHandler(t.getTorrent))
r.PUT("/torrents/:infohash", makeHandler(t.putTorrent))
r.DELETE("/torrents/:infohash", makeHandler(t.delTorrent))
if cfg.Private { if cfg.Private {
r.GET("/:passkey/announce", makeHandler(t.ServeAnnounce)) r.GET("/:passkey/announce", makeHandler(t.ServeAnnounce))
r.GET("/:passkey/scrape", makeHandler(t.ServeScrape)) r.GET("/:passkey/scrape", makeHandler(t.ServeScrape))
r.PUT("/users/:passkey", makeHandler(t.putUser))
r.DELETE("/users/:passkey", makeHandler(t.delUser))
} else { } else {
r.GET("/announce", makeHandler(t.ServeAnnounce)) r.GET("/announce", makeHandler(t.ServeAnnounce))
r.GET("/scrape", makeHandler(t.ServeScrape)) r.GET("/scrape", makeHandler(t.ServeScrape))
} }
if cfg.Whitelist {
r.PUT("/clients/:clientID", makeHandler(t.putClient))
r.DELETE("/clients/:clientID", makeHandler(t.delClient))
}
return r return r
} }

18
http/scrape.go
View file

@ -16,27 +16,27 @@ import (
"github.com/chihaya/chihaya/models" "github.com/chihaya/chihaya/models"
) )
func (t *Tracker) ServeScrape(w http.ResponseWriter, r *http.Request, p httprouter.Params) int { func (t *Tracker) ServeScrape(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
scrape, err := models.NewScrape(t.cfg, r, p) scrape, err := models.NewScrape(t.cfg, r, p)
if err == models.ErrMalformedRequest { if err == models.ErrMalformedRequest {
fail(w, r, err) fail(w, r, err)
return http.StatusOK return http.StatusOK, nil
} else if err != nil { } else if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
conn, err := t.tp.Get() conn, err := t.tp.Get()
if err != nil { if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
if t.cfg.Private { if t.cfg.Private {
_, err = conn.FindUser(scrape.Passkey) _, err = conn.FindUser(scrape.Passkey)
if err == tracker.ErrUserDNE { if err == tracker.ErrUserDNE {
fail(w, r, err) fail(w, r, err)
return http.StatusOK return http.StatusOK, nil
} else if err != nil { } else if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
} }
@ -45,9 +45,9 @@ func (t *Tracker) ServeScrape(w http.ResponseWriter, r *http.Request, p httprout
torrent, err := conn.FindTorrent(infohash) torrent, err := conn.FindTorrent(infohash)
if err == tracker.ErrTorrentDNE { if err == tracker.ErrTorrentDNE {
fail(w, r, err) fail(w, r, err)
return http.StatusOK return http.StatusOK, nil
} else if err != nil { } else if err != nil {
return http.StatusInternalServerError return http.StatusInternalServerError, err
} }
torrents = append(torrents, torrent) torrents = append(torrents, torrent)
} }
@ -60,7 +60,7 @@ func (t *Tracker) ServeScrape(w http.ResponseWriter, r *http.Request, p httprout
} }
fmt.Fprintf(w, "e") fmt.Fprintf(w, "e")
return http.StatusOK return http.StatusOK, nil
} }
func writeTorrentStatus(w io.Writer, t *models.Torrent) { func writeTorrentStatus(w io.Writer, t *models.Torrent) {