archives/trantor
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pass the session to the 404 page

Browse source
This commit is contained in:
Las Zenow 2013-06-01 20:51:21 +02:00
parent 3da8cae762
commit e72fd6e4d4
5 changed files with 33 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
admin.go
View file

@ -15,7 +15,7 @@ type settingsData struct {
func settingsHandler(w http.ResponseWriter, r *http.Request, sess *Session) { func settingsHandler(w http.ResponseWriter, r *http.Request, sess *Session) {
if sess.User == "" { if sess.User == "" {
notFound(w) notFound(w, r)
return return
} }
if r.Method == "POST" { if r.Method == "POST" {
@ -40,7 +40,7 @@ func settingsHandler(w http.ResponseWriter, r *http.Request, sess *Session) {
func deleteHandler(w http.ResponseWriter, r *http.Request, sess *Session) { func deleteHandler(w http.ResponseWriter, r *http.Request, sess *Session) {
if sess.User == "" { if sess.User == "" {
notFound(w) notFound(w, r)
return return
} }
@ -81,13 +81,13 @@ func deleteHandler(w http.ResponseWriter, r *http.Request, sess *Session) {
func editHandler(w http.ResponseWriter, r *http.Request, sess *Session) { func editHandler(w http.ResponseWriter, r *http.Request, sess *Session) {
idStr := mux.Vars(r)["id"] idStr := mux.Vars(r)["id"]
if sess.User == "" || !bson.IsObjectIdHex(idStr) { if sess.User == "" || !bson.IsObjectIdHex(idStr) {
notFound(w) notFound(w, r)
return return
} }
id := bson.ObjectIdHex(idStr) id := bson.ObjectIdHex(idStr)
books, _, err := db.GetBooks(bson.M{"_id": id}) books, _, err := db.GetBooks(bson.M{"_id": id})
if err != nil { if err != nil {
notFound(w) notFound(w, r)
return return
} }
@ -110,7 +110,7 @@ func cleanEmptyStr(s []string) []string {
func saveHandler(w http.ResponseWriter, r *http.Request, sess *Session) { func saveHandler(w http.ResponseWriter, r *http.Request, sess *Session) {
idStr := mux.Vars(r)["id"] idStr := mux.Vars(r)["id"]
if sess.User == "" || !bson.IsObjectIdHex(idStr) { if sess.User == "" || !bson.IsObjectIdHex(idStr) {
notFound(w) notFound(w, r)
return return
} }
@ -132,7 +132,7 @@ func saveHandler(w http.ResponseWriter, r *http.Request, sess *Session) {
book["keywords"] = keywords(book) book["keywords"] = keywords(book)
err := db.UpdateBook(id, book) err := db.UpdateBook(id, book)
if err != nil { if err != nil {
notFound(w) notFound(w, r)
return return
} }
@ -161,7 +161,7 @@ type newData struct {
func newHandler(w http.ResponseWriter, r *http.Request, sess *Session) { func newHandler(w http.ResponseWriter, r *http.Request, sess *Session) {
if sess.User == "" { if sess.User == "" {
notFound(w) notFound(w, r)
return return
} }
@ -204,7 +204,7 @@ func newHandler(w http.ResponseWriter, r *http.Request, sess *Session) {
func storeHandler(w http.ResponseWriter, r *http.Request, sess *Session) { func storeHandler(w http.ResponseWriter, r *http.Request, sess *Session) {
if sess.User == "" { if sess.User == "" {
notFound(w) notFound(w, r)
return return
} }

8
cover.go
View file

@ -24,13 +24,13 @@ import (
func coverHandler(w http.ResponseWriter, r *http.Request) { func coverHandler(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r) vars := mux.Vars(r)
if !bson.IsObjectIdHex(vars["id"]) { if !bson.IsObjectIdHex(vars["id"]) {
notFound(w) notFound(w, r)
return return
} }
id := bson.ObjectIdHex(vars["id"]) id := bson.ObjectIdHex(vars["id"])
books, _, err := db.GetBooks(bson.M{"_id": id}) books, _, err := db.GetBooks(bson.M{"_id": id})
if err != nil || len(books) == 0 { if err != nil || len(books) == 0 {
notFound(w) notFound(w, r)
return return
} }
book := books[0] book := books[0]
@ -38,7 +38,7 @@ func coverHandler(w http.ResponseWriter, r *http.Request) {
if !book.Active { if !book.Active {
sess := GetSession(r) sess := GetSession(r)
if sess.User == "" { if sess.User == "" {
notFound(w) notFound(w, r)
return return
} }
} }
@ -52,7 +52,7 @@ func coverHandler(w http.ResponseWriter, r *http.Request) {
} }
if err != nil { if err != nil {
log.Println("Error while opening image:", err) log.Println("Error while opening image:", err)
notFound(w) notFound(w, r)
return return
} }
defer f.Close() defer f.Close()

16
reader.go
View file

@ -133,14 +133,14 @@ func readStartHandler(w http.ResponseWriter, r *http.Request, sess *Session) {
id := mux.Vars(r)["id"] id := mux.Vars(r)["id"]
e, _ := openReadEpub(w, r, sess) e, _ := openReadEpub(w, r, sess)
if e == nil { if e == nil {
notFound(w) notFound(w, r)
return return
} }
defer e.Close() defer e.Close()
it, err := e.Spine() it, err := e.Spine()
if err != nil { if err != nil {
notFound(w) notFound(w, r)
return return
} }
http.Redirect(w, r, "/read/"+id+"/"+it.Url(), http.StatusTemporaryRedirect) http.Redirect(w, r, "/read/"+id+"/"+it.Url(), http.StatusTemporaryRedirect)
@ -151,7 +151,7 @@ func readHandler(w http.ResponseWriter, r *http.Request, sess *Session) {
file := mux.Vars(r)["file"] file := mux.Vars(r)["file"]
e, book := openReadEpub(w, r, sess) e, book := openReadEpub(w, r, sess)
if e == nil { if e == nil {
notFound(w) notFound(w, r)
return return
} }
defer e.Close() defer e.Close()
@ -200,32 +200,32 @@ func contentHandler(w http.ResponseWriter, r *http.Request, sess *Session) {
id := vars["id"] id := vars["id"]
file := vars["file"] file := vars["file"]
if file == "" || !bson.IsObjectIdHex(id) { if file == "" || !bson.IsObjectIdHex(id) {
notFound(w) notFound(w, r)
return return
} }
books, _, err := db.GetBooks(bson.M{"_id": bson.ObjectIdHex(id)}) books, _, err := db.GetBooks(bson.M{"_id": bson.ObjectIdHex(id)})
if err != nil || len(books) == 0 { if err != nil || len(books) == 0 {
notFound(w) notFound(w, r)
return return
} }
book := books[0] book := books[0]
if !book.Active { if !book.Active {
if sess.User == "" { if sess.User == "" {
notFound(w) notFound(w, r)
return return
} }
} }
e, err := OpenBook(book.File) e, err := OpenBook(book.File)
if err != nil { if err != nil {
notFound(w) notFound(w, r)
return return
} }
defer e.Close() defer e.Close()
html, err := e.OpenFile(file) html, err := e.OpenFile(file)
if err != nil { if err != nil {
notFound(w) notFound(w, r)
return return
} }
defer html.Close() defer html.Close()

2
templates/404.html
View file

@ -1,4 +1,4 @@
{{template "header.html" .}} {{template "header.html" .S}}
<div class="row"> <div class="row">
<div class="span10 offset1"> <div class="span10 offset1">

21
trantor.go
View file

@ -59,7 +59,7 @@ type bookData struct {
func bookHandler(w http.ResponseWriter, r *http.Request, sess *Session) { func bookHandler(w http.ResponseWriter, r *http.Request, sess *Session) {
idStr := mux.Vars(r)["id"] idStr := mux.Vars(r)["id"]
if !bson.IsObjectIdHex(idStr) { if !bson.IsObjectIdHex(idStr) {
notFound(w) notFound(w, r)
return return
} }
@ -68,7 +68,7 @@ func bookHandler(w http.ResponseWriter, r *http.Request, sess *Session) {
id := bson.ObjectIdHex(idStr) id := bson.ObjectIdHex(idStr)
books, _, err := db.GetBooks(bson.M{"_id": id}) books, _, err := db.GetBooks(bson.M{"_id": id})
if err != nil || len(books) == 0 { if err != nil || len(books) == 0 {
notFound(w) notFound(w, r)
return return
} }
data.Book = books[0] data.Book = books[0]
@ -79,14 +79,14 @@ func bookHandler(w http.ResponseWriter, r *http.Request, sess *Session) {
func downloadHandler(w http.ResponseWriter, r *http.Request, sess *Session) { func downloadHandler(w http.ResponseWriter, r *http.Request, sess *Session) {
idStr := mux.Vars(r)["id"] idStr := mux.Vars(r)["id"]
if !bson.IsObjectIdHex(idStr) { if !bson.IsObjectIdHex(idStr) {
notFound(w) notFound(w, r)
return return
} }
id := bson.ObjectIdHex(idStr) id := bson.ObjectIdHex(idStr)
books, _, err := db.GetBooks(bson.M{"_id": id}) books, _, err := db.GetBooks(bson.M{"_id": id})
if err != nil || len(books) == 0 { if err != nil || len(books) == 0 {
notFound(w) notFound(w, r)
return return
} }
book := books[0] book := books[0]
@ -94,7 +94,7 @@ func downloadHandler(w http.ResponseWriter, r *http.Request, sess *Session) {
if !book.Active { if !book.Active {
sess := GetSession(r) sess := GetSession(r)
if sess.User == "" { if sess.User == "" {
notFound(w) notFound(w, r)
return return
} }
} }
@ -102,7 +102,7 @@ func downloadHandler(w http.ResponseWriter, r *http.Request, sess *Session) {
fs := db.GetFS(FS_BOOKS) fs := db.GetFS(FS_BOOKS)
f, err := fs.OpenId(book.File) f, err := fs.OpenId(book.File)
if err != nil { if err != nil {
notFound(w) notFound(w, r)
return return
} }
defer f.Close() defer f.Close()
@ -135,9 +135,12 @@ func indexHandler(w http.ResponseWriter, r *http.Request, sess *Session) {
loadTemplate(w, "index", data) loadTemplate(w, "index", data)
} }
func notFound(w http.ResponseWriter) { func notFound(w http.ResponseWriter, r *http.Request) {
var data statusData
data.S = GetStatus(w, r)
w.WriteHeader(http.StatusNotFound) w.WriteHeader(http.StatusNotFound)
loadTemplate(w, "404", nil) loadTemplate(w, "404", data)
} }
func main() { func main() {
@ -154,7 +157,7 @@ func main() {
func setUpRouter() { func setUpRouter() {
r := mux.NewRouter() r := mux.NewRouter()
var notFoundHandler http.HandlerFunc var notFoundHandler http.HandlerFunc
notFoundHandler = GatherStats(func(w http.ResponseWriter, r *http.Request, sess *Session) { notFound(w) }) notFoundHandler = GatherStats(func(w http.ResponseWriter, r *http.Request, sess *Session) { notFound(w, r) })
r.NotFoundHandler = notFoundHandler r.NotFoundHandler = notFoundHandler
r.HandleFunc("/", GatherStats(indexHandler)) r.HandleFunc("/", GatherStats(indexHandler))