You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/10/11 10:39:41 UTC
[1/2] guacamole-client git commit: GUACAMOLE-96: Do not require TOTP
for users that cannot enroll due to lack of permission to update their
account.
Repository: guacamole-client
Updated Branches:
refs/heads/staging/1.0.0 1f55349d2 -> fd1928e0b
GUACAMOLE-96: Do not require TOTP for users that cannot enroll due to lack of permission to update their account.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/d79988d5
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/d79988d5
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/d79988d5
Branch: refs/heads/staging/1.0.0
Commit: d79988d59e1c6fec528fdf7758e6030f3fcb53fb
Parents: 1f55349
Author: Michael Jumper <mj...@apache.org>
Authored: Thu Oct 11 01:35:51 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Thu Oct 11 01:35:51 2018 -0700
----------------------------------------------------------------------
.../guacamole/auth/totp/user/UserVerificationService.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/d79988d5/extensions/guacamole-auth-totp/src/main/java/org/apache/guacamole/auth/totp/user/UserVerificationService.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-totp/src/main/java/org/apache/guacamole/auth/totp/user/UserVerificationService.java b/extensions/guacamole-auth-totp/src/main/java/org/apache/guacamole/auth/totp/user/UserVerificationService.java
index 30108e1..2414ee8 100644
--- a/extensions/guacamole-auth-totp/src/main/java/org/apache/guacamole/auth/totp/user/UserVerificationService.java
+++ b/extensions/guacamole-auth-totp/src/main/java/org/apache/guacamole/auth/totp/user/UserVerificationService.java
@@ -29,6 +29,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.apache.guacamole.GuacamoleClientException;
import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
import org.apache.guacamole.GuacamoleUnsupportedException;
import org.apache.guacamole.auth.totp.conf.ConfigurationService;
import org.apache.guacamole.auth.totp.form.AuthenticationCodeField;
@@ -182,6 +183,15 @@ public class UserVerificationService {
try {
context.getUserDirectory().update(self);
}
+ catch (GuacamoleSecurityException e) {
+ logger.info("User \"{}\" cannot store their TOTP key as they "
+ + "lack permission to update their own account. TOTP "
+ + "will be disabled for this user.",
+ self.getIdentifier());
+ logger.debug("Permission denied to set TOTP key of user "
+ + "account.", e);
+ return false;
+ }
catch (GuacamoleUnsupportedException e) {
logger.debug("Extension storage for user is explicitly read-only. "
+ "Cannot update attributes to store TOTP key.", e);
[2/2] guacamole-client git commit: GUACAMOLE-96: Merge do not require
TOTP for users that cannot enroll.
Posted by vn...@apache.org.
GUACAMOLE-96: Merge do not require TOTP for users that cannot enroll.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/fd1928e0
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/fd1928e0
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/fd1928e0
Branch: refs/heads/staging/1.0.0
Commit: fd1928e0bb962e7969c64b3bfa3da2b490c2fd43
Parents: 1f55349 d79988d
Author: Nick Couchman <vn...@apache.org>
Authored: Thu Oct 11 06:39:00 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Thu Oct 11 06:39:00 2018 -0400
----------------------------------------------------------------------
.../guacamole/auth/totp/user/UserVerificationService.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------