added IP to session

netwatcherio · Sep 20, 2024 · fe0a114 · fe0a114
1 parent 31f1368
commit fe0a114
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/internal/auth/auth.go b/internal/auth/auth.go
@@ -22,7 +22,7 @@ type Login struct {
 }
 
 // Login returns error on fail, nil on success
-func (r *Login) Login(db *mongo.Database) (string, error) {
+func (r *Login) Login(ip string, db *mongo.Database) (string, error) {
 	if r.Email == "" {
 		ee := internal.ErrorFormat{Package: "internal.auth", Level: log.ErrorLevel, Function: "auth.Login", Message: "invalid email address"}
 		ee.Print()
@@ -45,6 +45,7 @@ func (r *Login) Login(db *mongo.Database) (string, error) {
 	session := Session{
 		ID:      user.ID,
 		IsAgent: false,
+		IP:      ip,
 	}
 
 	err = session.Create(db)
@@ -202,7 +203,7 @@ type AgentLogin struct {
 }
 
 // AgentLogin returns error on fail, nil on success
-func (r *AgentLogin) AgentLogin(db *mongo.Database) (string, error) {
+func (r *AgentLogin) AgentLogin(ip string, db *mongo.Database) (string, error) {
 	ee := internal.ErrorFormat{Package: "internal.auth", Level: log.ErrorLevel, Function: "auth.AgentLogin"}
 
 	if r.PIN == "" {
@@ -241,6 +242,7 @@ func (r *AgentLogin) AgentLogin(db *mongo.Database) (string, error) {
 	session := Session{
 		ID:      u.ID,
 		IsAgent: true,
+		IP:      ip,
 	}
 
 	err = session.Create(db)

diff --git a/internal/auth/session.go b/internal/auth/session.go
@@ -15,11 +15,12 @@ import (
 )
 
 type Session struct {
-	ID        primitive.ObjectID `json:"item_id"bson:"item_id"`
-	IsAgent   bool               `json:"is_agent"bson:"is_agent"`
-	SessionID primitive.ObjectID `json:"session_id"bson:"_id"`
-	Expiry    time.Time          `json:"expiry"bson:"expiry"`
-	WSConn    string             `json:"ws_conn"bson:"ws_conn"`
+	ID        primitive.ObjectID `json:"item_id" bson:"item_id"`
+	IsAgent   bool               `json:"is_agent" bson:"is_agent"`
+	SessionID primitive.ObjectID `json:"session_id" bson:"_id"`
+	Expiry    time.Time          `json:"expiry" bson:"expiry"`
+	WSConn    string             `json:"ws_conn" bson:"ws_conn"`
+	IP        string             `json:"ip,omitempty" bson:"ip"`
 }
 
 // Create a session from user id, and include expiry, return error if fails

diff --git a/web/agent_api.go b/web/agent_api.go
@@ -27,7 +27,7 @@ func addRouteAgentAPI(r *Router) []*Route {
 				return nil
 			}
 
-			t, err := l.AgentLogin(r.DB)
+			t, err := l.AgentLogin(ctx.RemoteAddr(), r.DB)
 			if err != nil {
 				ctx.StatusCode(http.StatusUnauthorized)
 				return nil

diff --git a/web/auth.go b/web/auth.go
@@ -23,7 +23,7 @@ func addRouteAuth(r *Router) []*Route {
 				return nil
 			}
 
-			t, err := l.Login(r.DB)
+			t, err := l.Login(ctx.RemoteAddr(), r.DB)
 			if err != nil {
 				ctx.StatusCode(http.StatusUnauthorized)
 				return nil