You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2016/07/17 22:28:39 UTC
[11/19] incubator-guacamole-client git commit: GUACAMOLE-5: Bring
JDBC authentication up to date with sharing profile API changes.
GUACAMOLE-5: Bring JDBC authentication up to date with sharing profile API changes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/2131abb4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/2131abb4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/2131abb4
Branch: refs/heads/master
Commit: 2131abb4807b55949912af0af81605645fa9c655
Parents: 4eebc3b
Author: Michael Jumper <mj...@apache.org>
Authored: Fri Jul 15 13:29:39 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Jul 16 11:42:47 2016 -0700
----------------------------------------------------------------------
.../TrackedActiveConnection.java | 31 ++++++++++++++++++--
.../auth/jdbc/connection/ModeledConnection.java | 7 +++++
.../connection/ModeledConnectionRecord.java | 10 +++++++
.../jdbc/tunnel/ActiveConnectionRecord.java | 10 +++++++
.../guacamole/auth/jdbc/user/ModeledUser.java | 7 +++++
.../guacamole/auth/jdbc/user/UserContext.java | 14 +++++++++
6 files changed, 76 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/2131abb4/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/TrackedActiveConnection.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/TrackedActiveConnection.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/TrackedActiveConnection.java
index c02e54d..d4a23ff 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/TrackedActiveConnection.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/activeconnection/TrackedActiveConnection.java
@@ -20,11 +20,14 @@
package org.apache.guacamole.auth.jdbc.activeconnection;
import java.util.Date;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
import org.apache.guacamole.auth.jdbc.base.RestrictedObject;
import org.apache.guacamole.auth.jdbc.tunnel.ActiveConnectionRecord;
import org.apache.guacamole.auth.jdbc.user.AuthenticatedUser;
import org.apache.guacamole.net.GuacamoleTunnel;
import org.apache.guacamole.net.auth.ActiveConnection;
+import org.apache.guacamole.net.auth.credentials.UserCredentials;
/**
* An implementation of the ActiveConnection object which has an associated
@@ -45,6 +48,11 @@ public class TrackedActiveConnection extends RestrictedObject implements ActiveC
private String connectionIdentifier;
/**
+ * The identifier of the associated sharing profile.
+ */
+ private String sharingProfileIdentifier;
+
+ /**
* The date and time this active connection began.
*/
private Date startDate;
@@ -90,9 +98,10 @@ public class TrackedActiveConnection extends RestrictedObject implements ActiveC
super.init(currentUser);
// Copy all non-sensitive data from given record
- this.connectionIdentifier = activeConnectionRecord.getConnection().getIdentifier();
- this.identifier = activeConnectionRecord.getUUID().toString();
- this.startDate = activeConnectionRecord.getStartDate();
+ this.connectionIdentifier = activeConnectionRecord.getConnectionIdentifier();
+ this.sharingProfileIdentifier = activeConnectionRecord.getSharingProfileIdentifier();
+ this.identifier = activeConnectionRecord.getUUID().toString();
+ this.startDate = activeConnectionRecord.getStartDate();
// Include sensitive data, too, if requested
if (includeSensitiveInformation) {
@@ -124,6 +133,22 @@ public class TrackedActiveConnection extends RestrictedObject implements ActiveC
}
@Override
+ public String getSharingProfileIdentifier() {
+ return sharingProfileIdentifier;
+ }
+
+ @Override
+ public void setSharingProfileIdentifier(String sharingProfileIdentifier) {
+ this.sharingProfileIdentifier = sharingProfileIdentifier;
+ }
+
+ @Override
+ public UserCredentials getSharingCredentials(String identifier)
+ throws GuacamoleException {
+ throw new GuacamoleSecurityException("Permission denied");
+ }
+
+ @Override
public Date getStartDate() {
return startDate;
}
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/2131abb4/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
index caa9675..6cd30d4 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
@@ -27,6 +27,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.apache.guacamole.auth.jdbc.tunnel.GuacamoleTunnelService;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.auth.jdbc.JDBCEnvironment;
@@ -157,6 +158,12 @@ public class ModeledConnection extends ModeledGroupedDirectoryObject<ConnectionM
}
@Override
+ public Set<String> getSharingProfileIdentifiers()
+ throws GuacamoleException {
+ return Collections.<String>emptySet();
+ }
+
+ @Override
public List<? extends ConnectionRecord> getHistory() throws GuacamoleException {
return connectionService.retrieveHistory(getCurrentUser(), this);
}
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/2131abb4/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnectionRecord.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnectionRecord.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnectionRecord.java
index 4296b6d..41a5fdb 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnectionRecord.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnectionRecord.java
@@ -59,6 +59,16 @@ public class ModeledConnectionRecord implements ConnectionRecord {
}
@Override
+ public String getSharingProfileIdentifier() {
+ return null;
+ }
+
+ @Override
+ public String getSharingProfileName() {
+ return null;
+ }
+
+ @Override
public Date getStartDate() {
return model.getStartDate();
}
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/2131abb4/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ActiveConnectionRecord.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ActiveConnectionRecord.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ActiveConnectionRecord.java
index 45122cd..a34e339 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ActiveConnectionRecord.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ActiveConnectionRecord.java
@@ -172,6 +172,16 @@ public class ActiveConnectionRecord implements ConnectionRecord {
}
@Override
+ public String getSharingProfileIdentifier() {
+ return null;
+ }
+
+ @Override
+ public String getSharingProfileName() {
+ return null;
+ }
+
+ @Override
public Date getStartDate() {
return startDate;
}
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/2131abb4/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java
index 8b17523..26bdbcf 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java
@@ -49,6 +49,7 @@ import org.apache.guacamole.net.auth.User;
import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
import org.apache.guacamole.net.auth.permission.SystemPermission;
import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
+import org.apache.guacamole.net.auth.simple.SimpleObjectPermissionSet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -252,6 +253,12 @@ public class ModeledUser extends ModeledDirectoryObject<UserModel> implements Us
}
@Override
+ public ObjectPermissionSet getSharingProfilePermissions()
+ throws GuacamoleException {
+ return new SimpleObjectPermissionSet();
+ }
+
+ @Override
public ObjectPermissionSet getActiveConnectionPermissions()
throws GuacamoleException {
return activeConnectionPermissionService.getPermissionSet(getCurrentUser(), this);
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/2131abb4/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserContext.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserContext.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserContext.java
index 8df1d3c..7cb52f0 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserContext.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserContext.java
@@ -26,6 +26,7 @@ import org.apache.guacamole.auth.jdbc.connection.ConnectionDirectory;
import com.google.inject.Inject;
import com.google.inject.Provider;
import java.util.Collection;
+import java.util.Collections;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.auth.jdbc.base.RestrictedObject;
import org.apache.guacamole.auth.jdbc.activeconnection.ActiveConnectionDirectory;
@@ -38,7 +39,9 @@ import org.apache.guacamole.net.auth.AuthenticationProvider;
import org.apache.guacamole.net.auth.Connection;
import org.apache.guacamole.net.auth.ConnectionGroup;
import org.apache.guacamole.net.auth.Directory;
+import org.apache.guacamole.net.auth.SharingProfile;
import org.apache.guacamole.net.auth.User;
+import org.apache.guacamole.net.auth.simple.SimpleDirectory;
/**
* UserContext implementation which is driven by an arbitrary, underlying
@@ -135,6 +138,12 @@ public class UserContext extends RestrictedObject
}
@Override
+ public Directory<SharingProfile> getSharingProfileDirectory()
+ throws GuacamoleException {
+ return new SimpleDirectory<SharingProfile>();
+ }
+
+ @Override
public Directory<ActiveConnection> getActiveConnectionDirectory()
throws GuacamoleException {
return activeConnectionDirectory;
@@ -173,4 +182,9 @@ public class UserContext extends RestrictedObject
return ModeledConnectionGroup.ATTRIBUTES;
}
+ @Override
+ public Collection<Form> getSharingProfileAttributes() {
+ return Collections.<Form>emptyList();
+ }
+
}