Skip to content

Security: cleanup code in file stores #30348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 10, 2018
Merged

Security: cleanup code in file stores #30348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
14e2aa3
Security: cleanup code in file stores
jaymode May 2, 2018
5e12a10
Merge branch 'master' into cleanup_file_stores
jaymode May 4, 2018
ee75c31
changelog entry
jaymode May 4, 2018
bf3a1f0
Merge branch 'master' into cleanup_file_stores
jaymode May 9, 2018
567041d
Merge branch 'master' into cleanup_file_stores
jaymode May 10, 2018
e579b21
remove changelog entry
jaymode May 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...curity/src/main/java/org/elasticsearch/xpack/security/authc/file/FileUserPasswdStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public int usersCount() {
}

public AuthenticationResult verifyPassword(String username, SecureString password, java.util.function.Supplier<User> user) {
char[] hash = users.get(username);
final char[] hash = users.get(username);
if (hash == null) {
return AuthenticationResult.notHandled();
}
Expand All @@ -91,7 +91,7 @@ public AuthenticationResult verifyPassword(String username, SecureString passwor
}

public boolean userExists(String username) {
return users != null && users.containsKey(username);
return users.containsKey(username);
}

public static Path resolveFile(Environment env) {
Expand Down
19 changes: 4 additions & 15 deletions ...ecurity/src/main/java/org/elasticsearch/xpack/security/authc/file/FileUserRolesStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,8 @@ int entriesCount() {
}

public String[] roles(String username) {
if (userRoles == null) {
return Strings.EMPTY_ARRAY;
}
String[] roles = userRoles.get(username);
return roles == null ? Strings.EMPTY_ARRAY : userRoles.get(username);
final String[] roles = userRoles.get(username);
return roles == null ? Strings.EMPTY_ARRAY : roles;
}

public static Path resolveFile(Environment env) {
Expand Down Expand Up @@ -160,11 +157,7 @@ public static Map<String, String[]> parseFile(Path path, @Nullable Logger logger
}

for (String user : roleUsers) {
List<String> roles = userToRoles.get(user);
if (roles == null) {
roles = new ArrayList<>();
userToRoles.put(user, roles);
}
List<String> roles = userToRoles.computeIfAbsent(user, k -> new ArrayList<>());
roles.add(role);
}
}
Expand All @@ -185,11 +178,7 @@ public static void writeFile(Map<String, String[]> userToRoles, Path path) {
HashMap<String, List<String>> roleToUsers = new HashMap<>();
for (Map.Entry<String, String[]> entry : userToRoles.entrySet()) {
for (String role : entry.getValue()) {
List<String> users = roleToUsers.get(role);
if (users == null) {
users = new ArrayList<>();
roleToUsers.put(role, users);
}
List<String> users = roleToUsers.computeIfAbsent(role, k -> new ArrayList<>());
users.add(entry.getKey());
}
}
Expand Down