mirror of
https://github.com/gyurix1968/guacamole-client.git
synced 2025-09-06 21:27:40 +00:00
GUACAMOLE-220: Map and allow manipulation of the user members of user groups.
This commit is contained in:
@@ -85,6 +85,7 @@ import org.apache.guacamole.auth.jdbc.user.UserRecordMapper;
|
||||
import org.apache.guacamole.auth.jdbc.usergroup.ModeledUserGroup;
|
||||
import org.apache.guacamole.auth.jdbc.usergroup.UserGroupDirectory;
|
||||
import org.apache.guacamole.auth.jdbc.usergroup.UserGroupMapper;
|
||||
import org.apache.guacamole.auth.jdbc.usergroup.UserGroupMemberUserMapper;
|
||||
import org.apache.guacamole.auth.jdbc.usergroup.UserGroupService;
|
||||
import org.mybatis.guice.MyBatisModule;
|
||||
import org.mybatis.guice.datasource.builtin.PooledDataSourceProvider;
|
||||
@@ -136,6 +137,7 @@ public class JDBCAuthenticationProviderModule extends MyBatisModule {
|
||||
addMapperClass(SharingProfileParameterMapper.class);
|
||||
addMapperClass(SharingProfilePermissionMapper.class);
|
||||
addMapperClass(UserGroupMapper.class);
|
||||
addMapperClass(UserGroupMemberUserMapper.class);
|
||||
addMapperClass(UserGroupPermissionMapper.class);
|
||||
addMapperClass(UserMapper.class);
|
||||
addMapperClass(UserPermissionMapper.class);
|
||||
|
@@ -20,6 +20,7 @@
|
||||
package org.apache.guacamole.auth.jdbc.usergroup;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
@@ -74,10 +75,11 @@ public class ModeledUserGroup extends ModeledPermissions<UserGroupModel>
|
||||
)));
|
||||
|
||||
/**
|
||||
* Service for managing user groups.
|
||||
* Provider for RelatedObjectSets containing the users that are members of
|
||||
* this user group.
|
||||
*/
|
||||
@Inject
|
||||
private UserGroupService userGroupService;
|
||||
private Provider<UserGroupMemberUserSet> memberUserSetProvider;
|
||||
|
||||
/**
|
||||
* Whether attributes which control access restrictions should be exposed
|
||||
@@ -180,7 +182,9 @@ public class ModeledUserGroup extends ModeledPermissions<UserGroupModel>
|
||||
|
||||
@Override
|
||||
public RelatedObjectSet getMemberUsers() throws GuacamoleException {
|
||||
return new SimpleRelatedObjectSet();
|
||||
UserGroupMemberUserSet memberUserSet = memberUserSetProvider.get();
|
||||
memberUserSet.init(getCurrentUser(), this);
|
||||
return memberUserSet;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -0,0 +1,28 @@
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.guacamole.auth.jdbc.usergroup;
|
||||
|
||||
import org.apache.guacamole.auth.jdbc.base.ObjectRelationMapper;
|
||||
|
||||
/**
|
||||
* Mapper for the one-to-many relationship between a user group and its user
|
||||
* members.
|
||||
*/
|
||||
public interface UserGroupMemberUserMapper extends ObjectRelationMapper<UserGroupModel> {}
|
@@ -0,0 +1,57 @@
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.guacamole.auth.jdbc.usergroup;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import org.apache.guacamole.GuacamoleException;
|
||||
import org.apache.guacamole.auth.jdbc.base.ObjectRelationMapper;
|
||||
import org.apache.guacamole.auth.jdbc.base.RelatedObjectSet;
|
||||
import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
|
||||
|
||||
/**
|
||||
* RelatedObjectSet implementation which represents the one-to-many
|
||||
* relationship between a particular user group and its user members.
|
||||
*/
|
||||
public class UserGroupMemberUserSet extends RelatedObjectSet<ModeledUserGroup, UserGroupModel> {
|
||||
|
||||
/**
|
||||
* Mapper for the relation between user groups and their user members.
|
||||
*/
|
||||
@Inject
|
||||
private UserGroupMemberUserMapper userGroupMemberUserMapper;
|
||||
|
||||
@Override
|
||||
protected ObjectRelationMapper<UserGroupModel> getObjectRelationMapper() {
|
||||
return userGroupMemberUserMapper;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ObjectPermissionSet
|
||||
getParentObjectEffectivePermissionSet() throws GuacamoleException {
|
||||
return getCurrentUser().getUser().getEffectivePermissions().getUserGroupPermissions();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ObjectPermissionSet getChildObjectEffectivePermissionSet()
|
||||
throws GuacamoleException {
|
||||
return getCurrentUser().getUser().getEffectivePermissions().getUserPermissions();
|
||||
}
|
||||
|
||||
}
|
Reference in New Issue
Block a user