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

disambiguate routing

Browse source
This commit is contained in:
Jimmy Zelinskie 2014-07-09 01:34:34 -04:00
parent afb2376286
commit e2af935b83
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
http/announce_test.go
View file

@ -131,7 +131,7 @@ func TestPrivateAnnounce(t *testing.T) {
cfg := config.DefaultConfig cfg := config.DefaultConfig
cfg.Private = true cfg.Private = true
url := "/yby47f04riwpndba456rqxtmifenqxx2/announce?info_hash=%89%d4%bcR%11%16%ca%1dB%a2%f3%0d%1f%27M%94%e4h%1d%af&peer_id=-TR2820-l71jtqkl898b&port=51413&uploaded=0&downloaded=0&left=0&numwant=1&key=3c8e3319&compact=0" url := "/users/yby47f04riwpndba456rqxtmifenqxx2/announce?info_hash=%89%d4%bcR%11%16%ca%1dB%a2%f3%0d%1f%27M%94%e4h%1d%af&peer_id=-TR2820-l71jtqkl898b&port=51413&uploaded=0&downloaded=0&left=0&numwant=1&key=3c8e3319&compact=0"
golden1 := "d8:completei1e10:incompletei2e8:intervali1800e12:min intervali900e5:peersld2:ip9:127.0.0.17:peer id20:-TR2820-l71jtqkl8xx14:porti34000eeee" golden1 := "d8:completei1e10:incompletei2e8:intervali1800e12:min intervali900e5:peersld2:ip9:127.0.0.17:peer id20:-TR2820-l71jtqkl8xx14:porti34000eeee"
golden2 := "d8:completei1e10:incompletei2e8:intervali1800e12:min intervali900e5:peersld2:ip32:2001:0:53aa:64c:0:7f83:bc43:dec97:peer id20:-TR2820-l71jtqkl8xx34:porti34000eeee" golden2 := "d8:completei1e10:incompletei2e8:intervali1800e12:min intervali900e5:peersld2:ip32:2001:0:53aa:64c:0:7f83:bc43:dec97:peer id20:-TR2820-l71jtqkl8xx34:porti34000eeee"
got, err := testRoute(&cfg, url) got, err := testRoute(&cfg, url)
@ -142,7 +142,7 @@ func TestPrivateAnnounce(t *testing.T) {
t.Errorf("\ngot: %s\nwanted: %s\nwanted: %s", got, golden1, golden2) t.Errorf("\ngot: %s\nwanted: %s\nwanted: %s", got, golden1, golden2)
} }
url = "/yby47f04riwpndba456rqxtmifenqxx2/announce?info_hash=%89%d4%bcR%11%16%ca%1dB%a2%f3%0d%1f%27M%94%e4h%1d%af&peer_id=-TR2820-l71jtqkl898b&port=51413&uploaded=0&downloaded=0&left=0&numwant=2&key=3c8e3319&compact=0" url = "/users/yby47f04riwpndba456rqxtmifenqxx2/announce?info_hash=%89%d4%bcR%11%16%ca%1dB%a2%f3%0d%1f%27M%94%e4h%1d%af&peer_id=-TR2820-l71jtqkl898b&port=51413&uploaded=0&downloaded=0&left=0&numwant=2&key=3c8e3319&compact=0"
golden1 = "d8:completei1e10:incompletei2e8:intervali1800e12:min intervali900e5:peersld2:ip9:127.0.0.17:peer id20:-TR2820-l71jtqkl8xx14:porti34000eed2:ip32:2001:0:53aa:64c:0:7f83:bc43:dec97:peer id20:-TR2820-l71jtqkl8xx34:porti34000eeee" golden1 = "d8:completei1e10:incompletei2e8:intervali1800e12:min intervali900e5:peersld2:ip9:127.0.0.17:peer id20:-TR2820-l71jtqkl8xx14:porti34000eed2:ip32:2001:0:53aa:64c:0:7f83:bc43:dec97:peer id20:-TR2820-l71jtqkl8xx34:porti34000eeee"
got, err = testRoute(&cfg, url) got, err = testRoute(&cfg, url)
if err != nil { if err != nil {

12
http/http.go
View file

@ -64,13 +64,9 @@ 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("/users/:passkey/announce", makeHandler(t.ServeAnnounce))
r.GET("/:passkey/scrape", makeHandler(t.ServeScrape)) r.GET("/users/:passkey/scrape", makeHandler(t.ServeScrape))
r.PUT("/users/:passkey", makeHandler(t.putUser)) r.PUT("/users/:passkey", makeHandler(t.putUser))
r.DELETE("/users/:passkey", makeHandler(t.delUser)) r.DELETE("/users/:passkey", makeHandler(t.delUser))
@ -84,6 +80,10 @@ func setupRoutes(t *Tracker, cfg *config.Config) *httprouter.Router {
r.DELETE("/clients/:clientID", makeHandler(t.delClient)) r.DELETE("/clients/:clientID", makeHandler(t.delClient))
} }
r.GET("/torrents/:infohash", makeHandler(t.getTorrent))
r.PUT("/torrents/:infohash", makeHandler(t.putTorrent))
r.DELETE("/torrents/:infohash", makeHandler(t.delTorrent))
return r return r
} }