From 58acd1d5e3a997d27f60549b51bdf41df900c6c6 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Sat, 16 Dec 2017 12:15:33 -0800 Subject: Rename sessions table to user_sessions --- storage/migration.go | 2 +- storage/session.go | 132 ---------------------------------------------- storage/user_session.go | 135 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 136 insertions(+), 133 deletions(-) delete mode 100644 storage/session.go create mode 100644 storage/user_session.go (limited to 'storage') diff --git a/storage/migration.go b/storage/migration.go index 04ffce3..368c567 100644 --- a/storage/migration.go +++ b/storage/migration.go @@ -12,7 +12,7 @@ import ( "github.com/miniflux/miniflux/sql" ) -const schemaVersion = 8 +const schemaVersion = 9 // Migrate run database migrations. func (s *Storage) Migrate() { diff --git a/storage/session.go b/storage/session.go deleted file mode 100644 index dbf2dc3..0000000 --- a/storage/session.go +++ /dev/null @@ -1,132 +0,0 @@ -// Copyright 2017 Frédéric Guillot. All rights reserved. -// Use of this source code is governed by the Apache 2.0 -// license that can be found in the LICENSE file. - -package storage - -import ( - "database/sql" - "fmt" - - "github.com/miniflux/miniflux/helper" - "github.com/miniflux/miniflux/model" -) - -// Sessions returns the list of sessions for the given user. -func (s *Storage) Sessions(userID int64) (model.Sessions, error) { - query := `SELECT id, user_id, token, created_at, user_agent, ip FROM sessions WHERE user_id=$1 ORDER BY id DESC` - rows, err := s.db.Query(query, userID) - if err != nil { - return nil, fmt.Errorf("unable to fetch sessions: %v", err) - } - defer rows.Close() - - var sessions model.Sessions - for rows.Next() { - var session model.Session - err := rows.Scan( - &session.ID, - &session.UserID, - &session.Token, - &session.CreatedAt, - &session.UserAgent, - &session.IP, - ) - - if err != nil { - return nil, fmt.Errorf("unable to fetch session row: %v", err) - } - - sessions = append(sessions, &session) - } - - return sessions, nil -} - -// CreateSession creates a new sessions. -func (s *Storage) CreateSession(username, userAgent, ip string) (sessionID string, err error) { - var userID int64 - - err = s.db.QueryRow("SELECT id FROM users WHERE username = $1", username).Scan(&userID) - if err != nil { - return "", fmt.Errorf("unable to fetch UserID: %v", err) - } - - token := helper.GenerateRandomString(64) - query := "INSERT INTO sessions (token, user_id, user_agent, ip) VALUES ($1, $2, $3, $4)" - _, err = s.db.Exec(query, token, userID, userAgent, ip) - if err != nil { - return "", fmt.Errorf("unable to create session: %v", err) - } - - s.SetLastLogin(userID) - - return token, nil -} - -// SessionByToken finds a session by the token. -func (s *Storage) SessionByToken(token string) (*model.Session, error) { - var session model.Session - - query := "SELECT id, user_id, token, created_at, user_agent, ip FROM sessions WHERE token = $1" - err := s.db.QueryRow(query, token).Scan( - &session.ID, - &session.UserID, - &session.Token, - &session.CreatedAt, - &session.UserAgent, - &session.IP, - ) - - if err == sql.ErrNoRows { - return nil, fmt.Errorf("session not found: %s", token) - } else if err != nil { - return nil, fmt.Errorf("unable to fetch session: %v", err) - } - - return &session, nil -} - -// RemoveSessionByToken remove a session by using the token. -func (s *Storage) RemoveSessionByToken(userID int64, token string) error { - result, err := s.db.Exec(`DELETE FROM sessions WHERE user_id=$1 AND token=$2`, userID, token) - if err != nil { - return fmt.Errorf("unable to remove this session: %v", err) - } - - count, err := result.RowsAffected() - if err != nil { - return fmt.Errorf("unable to remove this session: %v", err) - } - - if count != 1 { - return fmt.Errorf("nothing has been removed") - } - - return nil -} - -// RemoveSessionByID remove a session by using the ID. -func (s *Storage) RemoveSessionByID(userID, sessionID int64) error { - result, err := s.db.Exec(`DELETE FROM sessions WHERE user_id=$1 AND id=$2`, userID, sessionID) - if err != nil { - return fmt.Errorf("unable to remove this session: %v", err) - } - - count, err := result.RowsAffected() - if err != nil { - return fmt.Errorf("unable to remove this session: %v", err) - } - - if count != 1 { - return fmt.Errorf("nothing has been removed") - } - - return nil -} - -// FlushAllSessions removes all sessions from the database. -func (s *Storage) FlushAllSessions() (err error) { - _, err = s.db.Exec(`DELETE FROM sessions`) - return -} diff --git a/storage/user_session.go b/storage/user_session.go new file mode 100644 index 0000000..da9ceba --- /dev/null +++ b/storage/user_session.go @@ -0,0 +1,135 @@ +// Copyright 2017 Frédéric Guillot. All rights reserved. +// Use of this source code is governed by the Apache 2.0 +// license that can be found in the LICENSE file. + +package storage + +import ( + "database/sql" + "fmt" + + "github.com/miniflux/miniflux/helper" + "github.com/miniflux/miniflux/model" +) + +// UserSessions returns the list of sessions for the given user. +func (s *Storage) UserSessions(userID int64) (model.UserSessions, error) { + query := `SELECT + id, user_id, token, created_at, user_agent, ip + FROM user_sessions + WHERE user_id=$1 ORDER BY id DESC` + rows, err := s.db.Query(query, userID) + if err != nil { + return nil, fmt.Errorf("unable to fetch user sessions: %v", err) + } + defer rows.Close() + + var sessions model.UserSessions + for rows.Next() { + var session model.UserSession + err := rows.Scan( + &session.ID, + &session.UserID, + &session.Token, + &session.CreatedAt, + &session.UserAgent, + &session.IP, + ) + + if err != nil { + return nil, fmt.Errorf("unable to fetch user session row: %v", err) + } + + sessions = append(sessions, &session) + } + + return sessions, nil +} + +// CreateUserSession creates a new sessions. +func (s *Storage) CreateUserSession(username, userAgent, ip string) (sessionID string, err error) { + var userID int64 + + err = s.db.QueryRow("SELECT id FROM users WHERE username = $1", username).Scan(&userID) + if err != nil { + return "", fmt.Errorf("unable to fetch UserID: %v", err) + } + + token := helper.GenerateRandomString(64) + query := "INSERT INTO user_sessions (token, user_id, user_agent, ip) VALUES ($1, $2, $3, $4)" + _, err = s.db.Exec(query, token, userID, userAgent, ip) + if err != nil { + return "", fmt.Errorf("unable to create user session: %v", err) + } + + s.SetLastLogin(userID) + + return token, nil +} + +// UserSessionByToken finds a session by the token. +func (s *Storage) UserSessionByToken(token string) (*model.UserSession, error) { + var session model.UserSession + + query := "SELECT id, user_id, token, created_at, user_agent, ip FROM user_sessions WHERE token = $1" + err := s.db.QueryRow(query, token).Scan( + &session.ID, + &session.UserID, + &session.Token, + &session.CreatedAt, + &session.UserAgent, + &session.IP, + ) + + if err == sql.ErrNoRows { + return nil, fmt.Errorf("user session not found: %s", token) + } else if err != nil { + return nil, fmt.Errorf("unable to fetch user session: %v", err) + } + + return &session, nil +} + +// RemoveUserSessionByToken remove a session by using the token. +func (s *Storage) RemoveUserSessionByToken(userID int64, token string) error { + result, err := s.db.Exec(`DELETE FROM user_sessions WHERE user_id=$1 AND token=$2`, userID, token) + if err != nil { + return fmt.Errorf("unable to remove this user session: %v", err) + } + + count, err := result.RowsAffected() + if err != nil { + return fmt.Errorf("unable to remove this user session: %v", err) + } + + if count != 1 { + return fmt.Errorf("nothing has been removed") + } + + return nil +} + +// RemoveUserSessionByID remove a session by using the ID. +func (s *Storage) RemoveUserSessionByID(userID, sessionID int64) error { + result, err := s.db.Exec(`DELETE FROM user_sessions WHERE user_id=$1 AND id=$2`, userID, sessionID) + if err != nil { + return fmt.Errorf("unable to remove this user session: %v", err) + } + + count, err := result.RowsAffected() + if err != nil { + return fmt.Errorf("unable to remove this user session: %v", err) + } + + if count != 1 { + return fmt.Errorf("nothing has been removed") + } + + return nil +} + +// FlushAllSessions removes all user sessions from the database. +func (s *Storage) FlushAllSessions() (err error) { + _, err = s.db.Exec(`DELETE FROM user_sessions`) + return +} -- cgit v1.2.3