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/02 01:16:40 UTC
[1/3] guacamole-client git commit: GUACAMOLE-360: Update active
connection permission check to support user groups.
Repository: guacamole-client
Updated Branches:
refs/heads/master 658ce7884 -> 220d9b299
GUACAMOLE-360: Update active connection permission check to support user groups.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/ad937def
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/ad937def
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/ad937def
Branch: refs/heads/master
Commit: ad937defa6f185444e7bf4cc2564a588d0a5fe6a
Parents: 658ce78
Author: Michael Jumper <mj...@apache.org>
Authored: Mon Oct 1 11:35:32 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Mon Oct 1 11:35:32 2018 -0700
----------------------------------------------------------------------
.../jdbc/activeconnection/ActiveConnectionPermissionService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/ad937def/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java
index 123a320..cb29c5a 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java
@@ -97,7 +97,7 @@ public class ActiveConnectionPermissionService
permissions.add(new ObjectPermission(ObjectPermission.Type.READ, identifier));
// If we're an admin, or the connection is ours, then we can DELETE
- if (isAdmin || targetUser.getIdentifier().equals(record.getUsername()))
+ if (isAdmin || (targetEntity.isUser() && targetEntity.getIdentifier().equals(record.getUsername())))
permissions.add(new ObjectPermission(ObjectPermission.Type.DELETE, identifier));
}
[2/3] guacamole-client git commit: GUACAMOLE-360: Add convenience
function for testing user identity.
Posted by vn...@apache.org.
GUACAMOLE-360: Add convenience function for testing user identity.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/ea142d15
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/ea142d15
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/ea142d15
Branch: refs/heads/master
Commit: ea142d15ce83d18c04d931046204d265278e6bf5
Parents: ad937de
Author: Michael Jumper <mj...@apache.org>
Authored: Mon Oct 1 11:45:25 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Mon Oct 1 11:46:34 2018 -0700
----------------------------------------------------------------------
.../ActiveConnectionPermissionService.java | 2 +-
.../guacamole/auth/jdbc/base/ModeledPermissions.java | 15 +++++++++++++++
.../jdbc/permission/AbstractPermissionService.java | 2 +-
3 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/ea142d15/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java
index cb29c5a..1e52571 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionPermissionService.java
@@ -97,7 +97,7 @@ public class ActiveConnectionPermissionService
permissions.add(new ObjectPermission(ObjectPermission.Type.READ, identifier));
// If we're an admin, or the connection is ours, then we can DELETE
- if (isAdmin || (targetEntity.isUser() && targetEntity.getIdentifier().equals(record.getUsername())))
+ if (isAdmin || targetEntity.isUser(record.getUsername()))
permissions.add(new ObjectPermission(ObjectPermission.Type.DELETE, identifier));
}
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/ea142d15/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledPermissions.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledPermissions.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledPermissions.java
index cda6f6a..965062c 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledPermissions.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ModeledPermissions.java
@@ -106,6 +106,21 @@ public abstract class ModeledPermissions<ModelType extends EntityModel>
}
/**
+ * Returns whether the underlying entity represents a specific user having
+ * the given username.
+ *
+ * @param username
+ * The username of a user.
+ *
+ * @return
+ * true if the underlying entity is a user that has the given username,
+ * false otherwise.
+ */
+ public boolean isUser(String username) {
+ return isUser() && getIdentifier().equals(username);
+ }
+
+ /**
* Returns whether the underlying entity is a user group. Entities may be
* either users or user groups.
*
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/ea142d15/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/AbstractPermissionService.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/AbstractPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/AbstractPermissionService.java
index 6e4ddfa..eea570f 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/AbstractPermissionService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/AbstractPermissionService.java
@@ -101,7 +101,7 @@ public abstract class AbstractPermissionService<PermissionSetType extends Permis
throws GuacamoleException {
// A user can always read their own permissions
- if (targetEntity.isUser() && user.getUser().getIdentifier().equals(targetEntity.getIdentifier()))
+ if (targetEntity.isUser(user.getUser().getIdentifier()))
return true;
// A system adminstrator can do anything
[3/3] guacamole-client git commit: GUACAMOLE-360: Merge update active
connection permission check to support user groups.
Posted by vn...@apache.org.
GUACAMOLE-360: Merge update active connection permission check to support user groups.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/220d9b29
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/220d9b29
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/220d9b29
Branch: refs/heads/master
Commit: 220d9b299461ea409bc4b21a9b1ba6bbeeb95b9b
Parents: 658ce78 ea142d1
Author: Nick Couchman <vn...@apache.org>
Authored: Mon Oct 1 21:15:51 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Mon Oct 1 21:15:51 2018 -0400
----------------------------------------------------------------------
.../ActiveConnectionPermissionService.java | 2 +-
.../guacamole/auth/jdbc/base/ModeledPermissions.java | 15 +++++++++++++++
.../jdbc/permission/AbstractPermissionService.java | 2 +-
3 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------