safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-1149: Merge correct regression in TOTP support if user accounts are not automatically created.

Browse Source
This commit is contained in:
Virtually Nick
2020-08-21 07:22:26 -04:00
committed by GitHub
parent 1af7b15825 b07356164c
commit 0091bb1aea
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderService.java
View File

@@ -133,7 +133,8 @@ public class JDBCAuthenticationProviderService implements AuthenticationProvider
// If auto account creation is enabled, add user to DB.
if (environment.autoCreateAbsentAccounts()) {
userService.createObject(new PrivilegedModeledAuthenticatedUser(user.getCurrentUser()), user);
ModeledUser createdUser = userService.createObject(new PrivilegedModeledAuthenticatedUser(user.getCurrentUser()), user);
user.setModel(createdUser.getModel());
}
}

14
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserService.java
View File

@@ -260,7 +260,19 @@ public class UserService extends ModeledDirectoryObjectService<ModeledUser, User
ModeledUser object, UserModel model) throws GuacamoleException {
super.beforeUpdate(user, object, model);
// Refuse to update if the user is a skeleton and does not actually
// exist in the database (this will happen if the user is authenticated
// via a non-database authentication provider)
if (object.isSkeleton()) {
logger.info("Data cannot be stored for user \"{}\" as they do not "
+ "have an account within the database. If this is "
+ "unexpected, consider allowing automatic creation of "
+ "user accounts.", object.getIdentifier());
throw new GuacamoleUnsupportedException("User does not exist "
+ "within the database and cannot be updated.");
}
// Username must not be blank
if (model.getIdentifier() == null || model.getIdentifier().trim().isEmpty())
throw new GuacamoleClientException("The username must not be blank.");