Browse Source

Added functionality to display last user login (#1967)

Added functionality to display last login time for each user in the User Management page.
pull/2060/head
Glenn Wilkinson 11 months ago
committed by GitHub
parent
commit
b53cff0c98
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 32 additions and 7 deletions
  1. +5
    -0
      controllers/route.go
  2. +6
    -0
      db/db_mysql/migrations/20200914000000_0.11.0_last_login.sql
  3. +6
    -0
      db/db_sqlite3/migrations/20200914000000_0.11.0_last_login.sql
  4. +9
    -7
      models/user.go
  5. +5
    -0
      static/js/src/app/users.js
  6. +1
    -0
      templates/users.html

+ 5
- 0
controllers/route.go View File

@ -382,6 +382,11 @@ func (as *AdminServer) Login(w http.ResponseWriter, r *http.Request) {
as.handleInvalidLogin(w, r)
return
}
u.LastLogin = time.Now().UTC()
err = models.PutUser(&u)
if err != nil {
log.Error(err)
}
// If we've logged in, save the session and redirect to the dashboard
session.Values["id"] = u.Id
session.Save(r, w)

+ 6
- 0
db/db_mysql/migrations/20200914000000_0.11.0_last_login.sql View File

@ -0,0 +1,6 @@
-- +goose Up
-- SQL in section 'Up' is executed when this migration is applied
ALTER TABLE `users` ADD COLUMN last_login datetime;
-- +goose Down
-- SQL section 'Down' is executed when this migration is rolled back

+ 6
- 0
db/db_sqlite3/migrations/20200914000000_0.11.0_last_login.sql View File

@ -0,0 +1,6 @@
-- +goose Up
-- SQL in section 'Up' is executed when this migration is applied
ALTER TABLE users ADD COLUMN last_login datetime;
-- +goose Down
-- SQL section 'Down' is executed when this migration is rolled back

+ 9
- 7
models/user.go View File

@ -2,6 +2,7 @@ package models
import (
"errors"
"time"
log "github.com/gophish/gophish/logger"
)
@ -13,13 +14,14 @@ var ErrModifyingOnlyAdmin = errors.New("Cannot remove the only administrator")
// User represents the user model for gophish.
type User struct {
Id int64 `json:"id"`
Username string `json:"username" sql:"not null;unique"`
Hash string `json:"-"`
ApiKey string `json:"api_key" sql:"not null;unique"`
Role Role `json:"role" gorm:"association_autoupdate:false;association_autocreate:false"`
RoleID int64 `json:"-"`
PasswordChangeRequired bool `json:"password_change_required"`
Id int64 `json:"id"`
Username string `json:"username" sql:"not null;unique"`
Hash string `json:"-"`
ApiKey string `json:"api_key" sql:"not null;unique"`
Role Role `json:"role" gorm:"association_autoupdate:false;association_autocreate:false"`
RoleID int64 `json:"-"`
PasswordChangeRequired bool `json:"password_change_required"`
LastLogin time.Time `json:"last_login"`
}
// GetUser returns the user that the given id corresponds to. If no user is found, an

+ 5
- 0
static/js/src/app/users.js View File

@ -185,9 +185,14 @@ const load = () => {
userTable.clear();
userRows = []
$.each(users, (i, user) => {
lastlogin = "Never"
if (user.last_login != "0001-01-01T00:00:00Z") {
lastlogin = moment(user.last_login).format('MMMM Do YYYY, h:mm:ss a')
}
userRows.push([
escapeHtml(user.username),
escapeHtml(user.role.name),
lastlogin,
"<div class='pull-right'>\
<button class='btn btn-warning impersonate_button' data-user-id='" + user.id + "'>\
<i class='fa fa-retweet'></i>\

+ 1
- 0
templates/users.html View File

@ -23,6 +23,7 @@
<tr>
<th>Username</th>
<th>Role</th>
<th>Last Login</th>
<th class="col-md-2 no-sort"></th>
</tr>
</thead>

Loading…
Cancel
Save