Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement and enforce user account status (#9374)
* Add AccountStatus field to User * Try to cope with incomplete LDAP user entries. - If we can't get the userNameAttribute, simply use the username - Fill in dummy email address if none can't be found * Prevent user logins for disabled accounts * Add account_status to UserSummary * Add endpoint to modify user acount status * Add auditevent * Double check that an account is enabled in AD This deliberately ignores the pre-auth flag set by the HTTPHeaderAuthRealm. * Fix review comments Fixes #9077
- Loading branch information
Showing
20 changed files
with
301 additions
and
128 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
91 changes: 91 additions & 0 deletions
91
...log2-server/src/main/java/org/graylog/security/authservice/ldap/ADUserAccountControl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /** | ||
| * This file is part of Graylog. | ||
| * | ||
| * Graylog is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * Graylog is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with Graylog. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package org.graylog.security.authservice.ldap; | ||
|
|
||
| import com.google.auto.value.AutoValue; | ||
|
|
||
| import java.util.EnumSet; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| /** | ||
| * Active Directory UserAccountControl flags. | ||
| * | ||
| * See: https://docs.microsoft.com/en-us/troubleshoot/windows-server/identity/useraccountcontrol-manipulate-account-properties | ||
| */ | ||
|
|
||
| @AutoValue | ||
| public abstract class ADUserAccountControl { | ||
|
|
||
| public abstract EnumSet<Flags> flags(); | ||
|
|
||
| public static ADUserAccountControl create(int userAccountControlField) { | ||
| EnumSet<Flags> set = EnumSet.noneOf(Flags.class); | ||
| for (Flags flag : Flags.values()) { | ||
| if (flag.isSetIn(userAccountControlField)) { | ||
| set.add(flag); | ||
| } | ||
| } | ||
| return new AutoValue_ADUserAccountControl(set); | ||
| } | ||
|
|
||
| public boolean accountIsDisabled() { | ||
| return flags().contains(Flags.ACCOUNTDISABLE); | ||
| } | ||
|
|
||
| public boolean isUserAccount() { | ||
| return flags().contains(Flags.NORMAL_ACCOUNT); | ||
| } | ||
|
|
||
| public boolean passwordExpired() { | ||
| return flags().contains(Flags.PASSWORD_EXPIRED); | ||
| } | ||
|
|
||
| public String printFlags() { | ||
| return flags().stream().sorted().map(Enum::toString).collect(Collectors.joining("|")); | ||
| } | ||
|
|
||
| public enum Flags { | ||
| /** | ||
| * The user account is disabled. | ||
| */ | ||
| ACCOUNTDISABLE(0x2), | ||
|
|
||
| /** | ||
| * This is a default account type that represents a typical user. (not a computer, for example) | ||
| */ | ||
| NORMAL_ACCOUNT(0x200), | ||
|
|
||
| /** | ||
| * The user password has expired. (This doesn't work with newer AD implementations) | ||
| */ | ||
| PASSWORD_EXPIRED(0x800000); | ||
|
|
||
| public int getFlagValue() { | ||
| return flagValue; | ||
| } | ||
|
|
||
| private final int flagValue; | ||
|
|
||
| Flags(int flagValue) { | ||
| this.flagValue = flagValue; | ||
| } | ||
|
|
||
| public boolean isSetIn(int userAccountControlValue) { | ||
| return (userAccountControlValue & flagValue) > 0; | ||
| } | ||
| } | ||
| } |
52 changes: 0 additions & 52 deletions
52
...server/src/main/java/org/graylog/security/authservice/ldap/ADUserAccountControlFlags.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.