diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-01-15 08:53:31 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-01-15 08:53:31 +0000 |
commit | 5e3ef30259f9d257a084ed6b72ccbd713f0f8294 (patch) | |
tree | b0febea9db2195a14de522ceb25c708476bc8104 /doc | |
parent | 598d81cd3a47dee648db1f511457e3d9ba94e13d (diff) | |
parent | 0d187a9a65c5a8eae4bcb09228270cb974abd466 (diff) | |
download | gitlab-ce-5e3ef30259f9d257a084ed6b72ccbd713f0f8294.tar.gz |
Merge branch 'sh-log-when-user-blocked' into 'master'
Log and send a system hook if a blocked user attempts to login
Closes #41633
See merge request gitlab-org/gitlab-ce!16451
Diffstat (limited to 'doc')
-rw-r--r-- | doc/system_hooks/system_hooks.md | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/doc/system_hooks/system_hooks.md b/doc/system_hooks/system_hooks.md index f2a9b1d769b..8c8501bcc23 100644 --- a/doc/system_hooks/system_hooks.md +++ b/doc/system_hooks/system_hooks.md @@ -11,6 +11,7 @@ Your GitLab instance can perform HTTP POST requests on the following events: - `user_remove_from_team` - `user_create` - `user_destroy` +- `user_failed_login` - `user_rename` - `key_create` - `key_destroy` @@ -22,6 +23,8 @@ Your GitLab instance can perform HTTP POST requests on the following events: The triggers for most of these are self-explanatory, but `project_update` and `project_rename` deserve some clarification: `project_update` is fired any time an attribute of a project is changed (name, description, tags, etc.) *unless* the `path` attribute is also changed. In that case, a `project_rename` is triggered instead (so that, for instance, if all you care about is the repo URL, you can just listen for `project_rename`). +`user_failed_login` is sent whenever a **blocked** user attempts to login and denied access. + System hooks can be used, e.g. for logging or changing information in a LDAP server. > **Note:** @@ -196,6 +199,23 @@ Please refer to `group_rename` and `user_rename` for that case. } ``` +**User failed login:** + +```json +{ + "event_name": "user_failed_login", + "created_at": "2017-10-03T06:08:48Z", + "updated_at": "2018-01-15T04:52:06Z", + "name": "John Smith", + "email": "user4@example.com", + "user_id": 26, + "username": "user4", + "state": "blocked" +} +``` + +If the user is blocked via LDAP, `state` will be `ldap_blocked`. + **User renamed:** ```json |