ips: log on activities, show on card

api-activities.go

@@ -138,6 +138,7 @@ func (app *appContext) GetActivities(gc *gin.Context) {
 			InviteCode: act.InviteCode,
 			Value:      act.Value,
 			Time:       act.Time.Unix(),
+			IP:         act.IP,
 		}
 		if act.Type == ActivityDeletion || act.Type == ActivityCreation {
 			resp.Activities[i].Username = act.Value

api-invites.go

@@ -102,7 +102,7 @@ func (app *appContext) checkInvites() {
 			InviteCode: data.Code,
 			Value:      data.Label,
 			Time:       time.Now(),
-		})
+		}, nil, false)
 	}
 }
 
@@ -161,7 +161,7 @@ func (app *appContext) checkInvite(code string, used bool, username string) bool
 			InviteCode: code,
 			Value:      inv.Label,
 			Time:       time.Now(),
-		})
+		}, nil, false)
 	} else if used {
 		del := false
 		newInv := inv
@@ -174,7 +174,7 @@ func (app *appContext) checkInvite(code string, used bool, username string) bool
 				InviteCode: code,
 				Value:      inv.Label,
 				Time:       time.Now(),
-			})
+			}, nil, false)
 		} else if newInv.RemainingUses != 0 {
 			// 0 means infinite i guess?
 			newInv.RemainingUses--
@@ -285,7 +285,7 @@ func (app *appContext) GenerateInvite(gc *gin.Context) {
 		InviteCode: invite.Code,
 		Value:      invite.Label,
 		Time:       time.Now(),
-	})
+	}, gc, false)
 
 	respondBool(200, true, gc)
 }
@@ -492,7 +492,7 @@ func (app *appContext) DeleteInvite(gc *gin.Context) {
 			InviteCode: req.Code,
 			Value:      inv.Label,
 			Time:       time.Now(),
-		})
+		}, gc, false)
 
 		app.info.Printf("%s: Invite deleted", req.Code)
 		respondBool(200, true, gc)

api-messages.go

@@ -573,6 +573,7 @@ func (app *appContext) MatrixCheckPIN(gc *gin.Context) {
 // @Failure 500 {object} boolResponse
 // @Param MatrixLoginDTO body MatrixLoginDTO true "Username & password."
 // @Router /matrix/login [post]
+// @Security Bearer
 // @tags Other
 func (app *appContext) MatrixLogin(gc *gin.Context) {
 	var req MatrixLoginDTO
@@ -608,6 +609,7 @@ func (app *appContext) MatrixLogin(gc *gin.Context) {
 // @Failure 500 {object} boolResponse
 // @Param MatrixConnectUserDTO body MatrixConnectUserDTO true "User's Jellyfin ID & Matrix user ID."
 // @Router /users/matrix [post]
+// @Security Bearer
 // @tags Other
 func (app *appContext) MatrixConnect(gc *gin.Context) {
 	var req MatrixConnectUserDTO
@@ -639,6 +641,7 @@ func (app *appContext) MatrixConnect(gc *gin.Context) {
 // @Failure 500 {object} boolResponse
 // @Param username path string true "username to search."
 // @Router /users/discord/{username} [get]
+// @Security Bearer
 // @tags Other
 func (app *appContext) DiscordGetUsers(gc *gin.Context) {
 	name := gc.Param("username")
@@ -665,6 +668,7 @@ func (app *appContext) DiscordGetUsers(gc *gin.Context) {
 // @Failure 500 {object} boolResponse
 // @Param DiscordConnectUserDTO body DiscordConnectUserDTO true "User's Jellyfin ID & Discord ID."
 // @Router /users/discord [post]
+// @Security Bearer
 // @tags Other
 func (app *appContext) DiscordConnect(gc *gin.Context) {
 	var req DiscordConnectUserDTO
@@ -688,7 +692,7 @@ func (app *appContext) DiscordConnect(gc *gin.Context) {
 		Source:     gc.GetString("jfId"),
 		Value:      "discord",
 		Time:       time.Now(),
-	})
+	}, gc, false)
 
 	linkExistingOmbiDiscordTelegram(app)
 	respondBool(200, true, gc)
@@ -699,6 +703,7 @@ func (app *appContext) DiscordConnect(gc *gin.Context) {
 // @Success 200 {object} boolResponse
 // @Param forUserDTO body forUserDTO true "User's Jellyfin ID."
 // @Router /users/discord [delete]
+// @Security Bearer
 // @Tags Users
 func (app *appContext) UnlinkDiscord(gc *gin.Context) {
 	var req forUserDTO
@@ -717,7 +722,7 @@ func (app *appContext) UnlinkDiscord(gc *gin.Context) {
 		Source:     gc.GetString("jfId"),
 		Value:      "discord",
 		Time:       time.Now(),
-	})
+	}, gc, false)
 
 	respondBool(200, true, gc)
 }
@@ -727,6 +732,7 @@ func (app *appContext) UnlinkDiscord(gc *gin.Context) {
 // @Success 200 {object} boolResponse
 // @Param forUserDTO body forUserDTO true "User's Jellyfin ID."
 // @Router /users/telegram [delete]
+// @Security Bearer
 // @Tags Users
 func (app *appContext) UnlinkTelegram(gc *gin.Context) {
 	var req forUserDTO
@@ -745,7 +751,7 @@ func (app *appContext) UnlinkTelegram(gc *gin.Context) {
 		Source:     gc.GetString("jfId"),
 		Value:      "telegram",
 		Time:       time.Now(),
-	})
+	}, gc, false)
 
 	respondBool(200, true, gc)
 }
@@ -755,6 +761,7 @@ func (app *appContext) UnlinkTelegram(gc *gin.Context) {
 // @Success 200 {object} boolResponse
 // @Param forUserDTO body forUserDTO true "User's Jellyfin ID."
 // @Router /users/matrix [delete]
+// @Security Bearer
 // @Tags Users
 func (app *appContext) UnlinkMatrix(gc *gin.Context) {
 	var req forUserDTO
@@ -773,7 +780,7 @@ func (app *appContext) UnlinkMatrix(gc *gin.Context) {
 		Source:     gc.GetString("jfId"),
 		Value:      "matrix",
 		Time:       time.Now(),
-	})
+	}, gc, false)
 
 	respondBool(200, true, gc)
 }

api-userpage.go

@@ -216,7 +216,7 @@ func (app *appContext) confirmMyAction(gc *gin.Context, key string) {
 			Source:     gc.GetString("jfId"),
 			Value:      "email",
 			Time:       time.Now(),
-		})
+		}, gc, true)
 
 		if app.config.Section("ombi").Key("enabled").MustBool(false) {
 			ombiUser, code, err := app.getOmbiUser(id)
@@ -378,7 +378,7 @@ func (app *appContext) MyDiscordVerifiedInvite(gc *gin.Context) {
 		Source:     gc.GetString("jfId"),
 		Value:      "discord",
 		Time:       time.Now(),
-	})
+	}, gc, true)
 
 	respondBool(200, true, gc)
 }
@@ -426,7 +426,7 @@ func (app *appContext) MyTelegramVerifiedInvite(gc *gin.Context) {
 		Source:     gc.GetString("jfId"),
 		Value:      "telegram",
 		Time:       time.Now(),
-	})
+	}, gc, true)
 
 	respondBool(200, true, gc)
 }
@@ -507,7 +507,7 @@ func (app *appContext) MatrixCheckMyPIN(gc *gin.Context) {
 		Source:     gc.GetString("jfId"),
 		Value:      "matrix",
 		Time:       time.Now(),
-	})
+	}, gc, true)
 
 	delete(app.matrix.tokens, pin)
 	respondBool(200, true, gc)
@@ -529,7 +529,7 @@ func (app *appContext) UnlinkMyDiscord(gc *gin.Context) {
 		Source:     gc.GetString("jfId"),
 		Value:      "discord",
 		Time:       time.Now(),
-	})
+	}, gc, true)
 
 	respondBool(200, true, gc)
 }
@@ -550,7 +550,7 @@ func (app *appContext) UnlinkMyTelegram(gc *gin.Context) {
 		Source:     gc.GetString("jfId"),
 		Value:      "telegram",
 		Time:       time.Now(),
-	})
+	}, gc, true)
 
 	respondBool(200, true, gc)
 }
@@ -571,7 +571,7 @@ func (app *appContext) UnlinkMyMatrix(gc *gin.Context) {
 		Source:     gc.GetString("jfId"),
 		Value:      "matrix",
 		Time:       time.Now(),
-	})
+	}, gc, true)
 
 	respondBool(200, true, gc)
 }
@@ -701,7 +701,7 @@ func (app *appContext) ChangeMyPassword(gc *gin.Context) {
 		SourceType: ActivityUser,
 		Source:     user.ID,
 		Time:       time.Now(),
-	})
+	}, gc, true)
 
 	if app.config.Section("ombi").Key("enabled").MustBool(false) {
 		func() {

api-users.go

@@ -55,7 +55,7 @@ func (app *appContext) NewUserAdmin(gc *gin.Context) {
 		Source:     gc.GetString("jfId"),
 		Value:      user.Name,
 		Time:       time.Now(),
-	})
+	}, gc, false)
 
 	profile := app.storage.GetDefaultProfile()
 	if req.Profile != "" && req.Profile != "none" {
@@ -114,7 +114,7 @@ func (app *appContext) NewUserAdmin(gc *gin.Context) {
 type errorFunc func(gc *gin.Context)
 
 // Used on the form & when a users email has been confirmed.
-func (app *appContext) newUser(req newUserDTO, confirmed bool) (f errorFunc, success bool) {
+func (app *appContext) newUser(req newUserDTO, confirmed bool, gc *gin.Context) (f errorFunc, success bool) {
 	existingUser, _, _ := app.jf.UserByName(req.Username, false)
 	if existingUser.Name != "" {
 		f = func(gc *gin.Context) {
@@ -331,7 +331,7 @@ func (app *appContext) newUser(req newUserDTO, confirmed bool) (f errorFunc, suc
 		InviteCode: invite.Code,
 		Value:      user.Name,
 		Time:       time.Now(),
-	})
+	}, gc, true)
 
 	emailStore := EmailAddress{
 		Addr:    req.Email,
@@ -539,7 +539,7 @@ func (app *appContext) NewUser(gc *gin.Context) {
 			return
 		}
 	}
-	f, success := app.newUser(req, false)
+	f, success := app.newUser(req, false, gc)
 	if !success {
 		f(gc)
 		return
@@ -609,7 +609,7 @@ func (app *appContext) EnableDisableUsers(gc *gin.Context) {
 			SourceType: ActivityAdmin,
 			Source:     gc.GetString("jfId"),
 			Time:       time.Now(),
-		})
+		}, gc, false)
 
 		if sendMail && req.Notify {
 			if err := app.sendByID(msg, userID); err != nil {
@@ -687,7 +687,7 @@ func (app *appContext) DeleteUsers(gc *gin.Context) {
 			Source:     gc.GetString("jfId"),
 			Value:      username,
 			Time:       time.Now(),
-		})
+		}, gc, false)
 
 		if sendMail && req.Notify {
 			if err := app.sendByID(msg, userID); err != nil {
@@ -1208,7 +1208,7 @@ func (app *appContext) ModifyEmails(gc *gin.Context) {
 				Source:     gc.GetString("jfId"),
 				Value:      "email",
 				Time:       time.Now(),
-			})
+			}, gc, false)
 
 			if ombiEnabled {
 				ombiUser, code, err := app.getOmbiUser(id)

api.go

@@ -179,7 +179,7 @@ func (app *appContext) ResetSetPassword(gc *gin.Context) {
 		SourceType: ActivityUser,
 		Source:     user.ID,
 		Time:       time.Now(),
-	})
+	}, gc, true)
 
 	prevPassword := req.PIN
 	if isInternal {

auth.go

@@ -19,25 +19,22 @@ const (
 )
 
 func (app *appContext) logIpInfo(gc *gin.Context, user bool, out string) {
-	app.info.Printf(out)
 	if (user && LOGIPU) || (!user && LOGIP) {
-		app.info.Printf(" (ip=%s)", strings.TrimSpace(gc.Request.Header.Get("X-Real-IP")))
+		out += fmt.Sprintf(" (ip=%s)", gc.ClientIP())
 	}
-	app.info.Print("\n")
+	app.info.Println(out)
 }
 func (app *appContext) logIpDebug(gc *gin.Context, user bool, out string) {
-	app.debug.Printf(out)
 	if (user && LOGIPU) || (!user && LOGIP) {
-		app.debug.Printf(" (ip=%s)", strings.TrimSpace(gc.Request.Header.Get("X-Real-IP")))
+		out += fmt.Sprintf(" (ip=%s)", gc.ClientIP())
 	}
-	app.debug.Print("\n")
+	app.debug.Println(out)
 }
 func (app *appContext) logIpErr(gc *gin.Context, user bool, out string) {
-	app.err.Printf(out)
 	if (user && LOGIPU) || (!user && LOGIP) {
-		app.err.Printf(" (ip=%s)", strings.TrimSpace(gc.Request.Header.Get("X-Real-IP")))
+		out += fmt.Sprintf(" (ip=%s)", gc.ClientIP())
 	}
-	app.err.Print("\n")
+	app.err.Println(out)
 }
 
 func (app *appContext) webAuth() gin.HandlerFunc {
@@ -202,7 +199,7 @@ func (app *appContext) validateJellyfinCredentials(username, password string, gc
 // @tags Auth
 // @Security getTokenAuth
 func (app *appContext) getTokenLogin(gc *gin.Context) {
-	app.info.Println("Token requested (login attempt)")
+	app.logIpInfo(gc, false, "Token requested (login attempt)")
 	username, password, ok := app.decodeValidateLoginHeader(gc, false)
 	if !ok {
 		return
@@ -307,7 +304,7 @@ func (app *appContext) decodeValidateRefreshCookie(gc *gin.Context, cookieName s
 // @Router /token/refresh [get]
 // @tags Auth
 func (app *appContext) getTokenRefresh(gc *gin.Context) {
-	app.debug.Println("Token requested (refresh token)")
+	app.logIpInfo(gc, false, "Token requested (refresh token)")
 	claims, ok := app.decodeValidateRefreshCookie(gc, "refresh")
 	if !ok {
 		return

config/config-base.json

@@ -303,15 +303,15 @@
                     "requires_restart": true,
                     "type": "bool",
                     "value": false,
-                    "description": "Log IP addresses in console and in activities. See notice below on legality."
+                    "description": "Log IP addresses of admins and admin page requests in console and in activities. See notice below on legality."
                 },
-                "log_ips_userpage": {
+                "log_ips_users": {
                     "name": "Log IPs accessing User Page",
                     "required": false,
                     "requires_restart": true,
                     "type": "bool",
                     "value": false,
-                    "description": "Log IP addresses in console and in activities. See notice below on legality."
+                    "description": "Log IP addresses of users in console and in activities. See notice below on legality."
                 },
                 "ip_note": {
                     "name": "Logging IPs:",

models.go

@@ -444,6 +444,7 @@ type ActivityDTO struct {
 	InviteCode     string `json:"invite_code"`
 	Value          string `json:"value"`
 	Time           int64  `json:"time"`
+	IP             string `json:"ip"`
 }
 
 type GetActivitiesDTO struct {

storage.go

@@ -10,6 +10,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/gin-gonic/gin"
 	"github.com/hrfee/jfa-go/logger"
 	"github.com/hrfee/mediabrowser"
 	"github.com/timshannon/badgerhold/v4"
@@ -55,6 +56,7 @@ type Activity struct {
 	InviteCode string // Set for ActivityCreation, create/deleteInvite
 	Value      string // Used for ActivityContactLinked where it's "email/discord/telegram/matrix", Create/DeleteInvite, where it's the label, and Creation/Deletion, where it's the Username.
 	Time       time.Time
+	IP         string
 }
 
 type UserExpiry struct {
@@ -563,8 +565,12 @@ func (st *Storage) GetActivityKey(k string) (Activity, bool) {
 }
 
 // SetActivityKey stores value v in key k.
-func (st *Storage) SetActivityKey(k string, v Activity) {
+// If the IP should be logged, pass "gc", and whether or not the action is of a user
+func (st *Storage) SetActivityKey(k string, v Activity, gc *gin.Context, user bool) {
 	v.ID = k
+	if gc != nil && ((LOGIPU && user) || (LOGIP && !user)) {
+		v.IP = gc.ClientIP()
+	}
 	err := st.db.Upsert(k, v)
 	if err != nil {
 		// fmt.Printf("Failed to set custom content: %v\n", err)

ts/modules/activity.ts

@@ -14,6 +14,7 @@ export interface activity {
     time: number; 
     username: string;
     source_username: string;
+    ip: string;
 }
 
 var activityTypeMoods = {
@@ -43,6 +44,7 @@ export class Activity implements activity, SearchableItem {
     private _referrer: HTMLElement;
     private _expiryTypeBadge: HTMLElement;
     private _delete: HTMLElement;
+    private _ip: HTMLElement;
     private _act: activity;
     private _urlBase: string = ((): string => {
         let link = window.location.href;
@@ -205,6 +207,16 @@ export class Activity implements activity, SearchableItem {
         }
     }
 
+    get ip(): string { return this._act.ip; }
+    set ip(v: string) {
+        this._act.ip = v;
+        if (v) {
+            this._ip.innerHTML = `<span class="supra mr-2">IP</span><span class="font-mono bg-inherit">${v}</span>`;
+        } else {
+            this._ip.textContent = ``;
+        }
+    }
+
     get invite_code(): string { return this._act.invite_code; }
     set invite_code(v: string) {
         this._act.invite_code = v;
@@ -260,12 +272,13 @@ export class Activity implements activity, SearchableItem {
                 <span class="activity-expiry-type badge self-start md:self-end mt-1"></span>
             </div>
         </div>
-        <div class="flex flex-col md:flex-row justify-between">
+        <div class="flex flex-row justify-between items-end">
-            <div>
+            <div class="flex flex-col md:flex-row gap-2">
-                <span class="content supra mr-2 activity-source-type"></span><span class="activity-source"></span>
+                <div>    
-            </div>
+                    <span class="content supra mr-2 activity-source-type"></span><span class="activity-source"></span>
-            <div>
+                </div>
                 <span class="content activity-referrer"></span>
+                <span class="content activity-ip"></span>
             </div>
             <div>
                 <button class="button @low hover:~critical rounded-full px-1 py-px activity-delete" aria-label="${window.lang.strings("delete")}"><i class="ri-close-line"></i></button>
@@ -277,6 +290,7 @@ export class Activity implements activity, SearchableItem {
         this._time = this._card.querySelector(".activity-time");
         this._sourceType = this._card.querySelector(".activity-source-type");
         this._source = this._card.querySelector(".activity-source");
+        this._ip = this._card.querySelector(".activity-ip");
         this._referrer = this._card.querySelector(".activity-referrer");
         this._expiryTypeBadge = this._card.querySelector(".activity-expiry-type");
         this._delete = this._card.querySelector(".activity-delete");
@@ -324,6 +338,7 @@ export class Activity implements activity, SearchableItem {
         this.source = act.source;
         this.value = act.value;
         this.type  = act.type;
+        this.ip = act.ip;
     }
 
     delete = () => _delete("/activity/" + this._act.id, null, (req: XMLHttpRequest) => {

user-auth.go

@@ -45,7 +45,7 @@ func (app *appContext) getUserTokenLogin(gc *gin.Context) {
 		respond(500, "Contact Admin", gc)
 		return
 	}
-	app.info.Println("UserToken requested (login attempt)")
+	app.logIpInfo(gc, true, "UserToken requested (login attempt)")
 	username, password, ok := app.decodeValidateLoginHeader(gc, true)
 	if !ok {
 		return
@@ -86,7 +86,7 @@ func (app *appContext) getUserTokenRefresh(gc *gin.Context) {
 		return
 	}
 
-	app.info.Println("UserToken request (refresh token)")
+	app.logIpInfo(gc, true, "UserToken request (refresh token)")
 	claims, ok := app.decodeValidateRefreshCookie(gc, "user-refresh")
 	if !ok {
 		return

userdaemon.go

@@ -120,7 +120,7 @@ func (app *appContext) checkUsers() {
 				continue
 			}
 
-			app.storage.SetActivityKey(shortuuid.New(), activity)
+			app.storage.SetActivityKey(shortuuid.New(), activity, nil, false)
 
 			app.storage.DeleteUserExpiryKey(expiry.JellyfinID)
 			app.jf.CacheExpiry = time.Now()

views.go

@@ -361,7 +361,7 @@ func (app *appContext) ResetPassword(gc *gin.Context) {
 				SourceType: ActivityUser,
 				Source:     jfUser.ID,
 				Time:       time.Now(),
-			})
+			}, gc, true)
 		}
 	}
 
@@ -611,7 +611,7 @@ func (app *appContext) InviteProxy(gc *gin.Context) {
 			app.debug.Printf("Invalid key")
 			return
 		}
-		f, success := app.newUser(req, true)
+		f, success := app.newUser(req, true, gc)
 		if !success {
 			app.err.Printf("Failed to create new user")
 			// Not meant for us. Calling this will be a mess, but at least it might give us some information.