Compare commits
2 Commits
994db90ecc
...
0b1d9e9da3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0b1d9e9da3 | ||
|
|
753f23cc03 |
@@ -11,9 +11,3 @@ func Peer_GetByAPIKey(tx TX, apiKey string) (*Peer, error) {
|
|||||||
Peer_SelectQuery+` WHERE APIKey=?`,
|
Peer_SelectQuery+` WHERE APIKey=?`,
|
||||||
apiKey)
|
apiKey)
|
||||||
}
|
}
|
||||||
|
|
||||||
func Peer_Exists(tx TX, networkID int64, ip byte) (exists bool, err error) {
|
|
||||||
const query = `SELECT EXISTS(SELECT 1 FROM peers WHERE NetworkID=? AND PeerIP=?)`
|
|
||||||
err = tx.QueryRow(query, networkID, ip).Scan(&exists)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
package hub
|
package hub
|
||||||
|
|
||||||
const (
|
const (
|
||||||
SESSION_ID_COOKIE_NAME = "SessionID"
|
sessionIDCookieName = "SessionID"
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ type handlerFunc func(s *api.Session, w http.ResponseWriter, r *http.Request) er
|
|||||||
|
|
||||||
func (app *App) handlePub(pattern string, fn handlerFunc) {
|
func (app *App) handlePub(pattern string, fn handlerFunc) {
|
||||||
wrapped := func(w http.ResponseWriter, r *http.Request) {
|
wrapped := func(w http.ResponseWriter, r *http.Request) {
|
||||||
sessionID := app.getCookie(r, SESSION_ID_COOKIE_NAME)
|
sessionID := app.getCookie(r, sessionIDCookieName)
|
||||||
s, err := app.api.Session_Get(sessionID)
|
s, err := app.api.Session_Get(sessionID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("Failed to get session: %v", err)
|
log.Printf("Failed to get session: %v", err)
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ func (a *App) _signinSubmit(s *api.Session, w http.ResponseWriter, r *http.Reque
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
a.setCookie(w, SESSION_ID_COOKIE_NAME, sess.SessionID)
|
a.setCookie(w, sessionIDCookieName, sess.SessionID)
|
||||||
|
|
||||||
return a.redirect(w, r, "/")
|
return a.redirect(w, r, "/")
|
||||||
}
|
}
|
||||||
@@ -51,7 +51,7 @@ func (a *App) _adminSignOutSubmit(s *api.Session, w http.ResponseWriter, r *http
|
|||||||
if err := a.api.Session_Delete(s.SessionID); err != nil {
|
if err := a.api.Session_Delete(s.SessionID); err != nil {
|
||||||
log.Printf("Failed to delete session cookie %s: %v", s.SessionID, err)
|
log.Printf("Failed to delete session cookie %s: %v", s.SessionID, err)
|
||||||
}
|
}
|
||||||
a.deleteCookie(w, SESSION_ID_COOKIE_NAME)
|
a.deleteCookie(w, sessionIDCookieName)
|
||||||
return a.redirect(w, r, "/")
|
return a.redirect(w, r, "/")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user