Skip to content

Populate the time locked status value when local user locked#25023

Merged
stevenGravy merged 3 commits intomasterfrom
stevenGravy/lockedtime
May 15, 2023
Merged

Populate the time locked status value when local user locked#25023
stevenGravy merged 3 commits intomasterfrom
stevenGravy/lockedtime

Conversation

@stevenGravy
Copy link
Copy Markdown
Contributor

@stevenGravy stevenGravy commented Apr 22, 2023 •
edited
Loading

The locked_time field was not set when a user was locked. Now it will be populated when the lock is being set instead of 0001-01-01T00:00:00Z. This is for local user locks after failed login attempts or password resets.

kind: user
metadata:
  id: 1682131098799299000
  name: steven2
spec:
  expires: "0001-01-01T00:00:00Z"
  roles:
  - access
  status:
    is_locked: true
    lock_expires: "2023-04-22T02:58:18.798894Z"
    locked_message: user has exceeded maximum failed login attempts
    locked_time: "2023-04-22T02:38:18.798906Z"
    recovery_attempt_lock_expires: "0001-01-01T00:00:00Z"

@stevenGravy stevenGravy enabled auto-merge April 22, 2023 02:42
@github-actions github-actions Bot requested review from jimbishopp and r0mant April 22, 2023 02:42
@stevenGravy stevenGravy changed the title Populate the time locked status value when user locked Populate the time locked status value when local user locked Apr 22, 2023
zmb3
zmb3 reviewed Apr 24, 2023
View reviewed changes
Comment thread api/types/user.go Outdated
@stevenGravy @zmb3
remove extra line
c21c032 
Co-authored-by: Zac Bergquist <zac.bergquist@goteleport.com>
rosstimothy
rosstimothy reviewed Apr 25, 2023
View reviewed changes
Comment thread api/types/user.go Outdated
@stevenGravy @rosstimothy
use UTC
30d5674 
Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>
@stevenGravy
Copy link
Copy Markdown
Contributor Author

stevenGravy commented May 15, 2023

@zmb3 @rosstimothy anything else we need to do here before approving?

@stevenGravy stevenGravy added this pull request to the merge queue May 15, 2023
Merged via the queue into master with commit 8d53253 May 15, 2023
@stevenGravy stevenGravy deleted the stevenGravy/lockedtime branch May 15, 2023 16:35
@public-teleport-github-review-bot
Copy link
Copy Markdown

public-teleport-github-review-bot Bot commented May 15, 2023

@stevenGravy See the table below for backport results.

Branch Result
branch/v11 Create PR
branch/v12 Create PR
branch/v13 Create PR

This was referenced May 15, 2023
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@zmb3 zmb3 zmb3 approved these changes

@rosstimothy rosstimothy rosstimothy approved these changes

Assignees

No one assigned

Labels

size/sm

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@stevenGravy @zmb3 @rosstimothy