Template
fix: login session IP parsing and username lookup
This commit is contained in:
@@ -3,12 +3,15 @@ package handler
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/panelhosting/panel/internal/auth"
|
"github.com/panelhosting/panel/internal/auth"
|
||||||
"github.com/panelhosting/panel/internal/authsvc"
|
"github.com/panelhosting/panel/internal/authsvc"
|
||||||
"github.com/panelhosting/panel/internal/config"
|
"github.com/panelhosting/panel/internal/config"
|
||||||
|
"github.com/panelhosting/panel/internal/httputil"
|
||||||
"github.com/panelhosting/panel/internal/middleware"
|
"github.com/panelhosting/panel/internal/middleware"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -34,9 +37,9 @@ func (h *AuthHandler) Login(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
result, err := h.svc.Login(r.Context(), authsvc.LoginInput{
|
result, err := h.svc.Login(r.Context(), authsvc.LoginInput{
|
||||||
Username: req.Username,
|
Username: strings.TrimSpace(req.Username),
|
||||||
Password: req.Password,
|
Password: req.Password,
|
||||||
IP: r.RemoteAddr,
|
IP: httputil.ClientIP(r),
|
||||||
UserAgent: r.UserAgent(),
|
UserAgent: r.UserAgent(),
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -44,6 +47,7 @@ func (h *AuthHandler) Login(w http.ResponseWriter, r *http.Request) {
|
|||||||
writeError(w, http.StatusUnauthorized, "invalid credentials")
|
writeError(w, http.StatusUnauthorized, "invalid credentials")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
log.Printf("login error: %v", err)
|
||||||
writeError(w, http.StatusInternalServerError, "login failed")
|
writeError(w, http.StatusInternalServerError, "login failed")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
package httputil
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
func ClientIP(r *http.Request) string {
|
||||||
|
if xff := r.Header.Get("X-Forwarded-For"); xff != "" {
|
||||||
|
if ip := strings.TrimSpace(strings.Split(xff, ",")[0]); ip != "" {
|
||||||
|
return ip
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if xri := strings.TrimSpace(r.Header.Get("X-Real-IP")); xri != "" {
|
||||||
|
return xri
|
||||||
|
}
|
||||||
|
if host, _, err := net.SplitHostPort(r.RemoteAddr); err == nil {
|
||||||
|
return host
|
||||||
|
}
|
||||||
|
return r.RemoteAddr
|
||||||
|
}
|
||||||
|
|
||||||
|
func ValidIP(ip string) (string, bool) {
|
||||||
|
parsed := net.ParseIP(strings.TrimSpace(ip))
|
||||||
|
if parsed == nil {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
return parsed.String(), true
|
||||||
|
}
|
||||||
@@ -8,6 +8,7 @@ import (
|
|||||||
|
|
||||||
"github.com/jackc/pgx/v5"
|
"github.com/jackc/pgx/v5"
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
"github.com/panelhosting/panel/internal/httputil"
|
||||||
"github.com/panelhosting/panel/internal/models"
|
"github.com/panelhosting/panel/internal/models"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -16,7 +17,7 @@ var ErrUserNotFound = errors.New("user not found")
|
|||||||
func (r *UserRepository) GetByUsername(ctx context.Context, username string) (*models.User, error) {
|
func (r *UserRepository) GetByUsername(ctx context.Context, username string) (*models.User, error) {
|
||||||
const q = `
|
const q = `
|
||||||
SELECT id, uuid, email, username, password_hash, role, status, locale, timezone, last_login_at, created_at, updated_at
|
SELECT id, uuid, email, username, password_hash, role, status, locale, timezone, last_login_at, created_at, updated_at
|
||||||
FROM users WHERE username = $1
|
FROM users WHERE LOWER(username) = LOWER($1)
|
||||||
`
|
`
|
||||||
var u models.User
|
var u models.User
|
||||||
err := r.pool.QueryRow(ctx, q, username).Scan(
|
err := r.pool.QueryRow(ctx, q, username).Scan(
|
||||||
@@ -65,11 +66,16 @@ func NewSessionRepository(pool *pgxpool.Pool) *SessionRepository {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (r *SessionRepository) Create(ctx context.Context, userID int64, tokenHash string, ip, userAgent string, expiresAt time.Time) error {
|
func (r *SessionRepository) Create(ctx context.Context, userID int64, tokenHash string, ip, userAgent string, expiresAt time.Time) error {
|
||||||
|
var ipArg any
|
||||||
|
if normalized, ok := httputil.ValidIP(ip); ok {
|
||||||
|
ipArg = normalized
|
||||||
|
}
|
||||||
|
|
||||||
const q = `
|
const q = `
|
||||||
INSERT INTO sessions (user_id, token_hash, ip_address, user_agent, expires_at)
|
INSERT INTO sessions (user_id, token_hash, ip_address, user_agent, expires_at)
|
||||||
VALUES ($1, $2, NULLIF($3, '')::inet, NULLIF($4, ''), $5)
|
VALUES ($1, $2, $3, NULLIF($4, ''), $5)
|
||||||
`
|
`
|
||||||
_, err := r.pool.Exec(ctx, q, userID, tokenHash, ip, userAgent, expiresAt)
|
_, err := r.pool.Exec(ctx, q, userID, tokenHash, ipArg, userAgent, expiresAt)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("create session: %w", err)
|
return fmt.Errorf("create session: %w", err)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user