BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve conflicts

Browse Source
This commit is contained in:
Dennis Benz 2024-06-02 15:01:15 +02:00 committed by Gustavo Trott
parent 4063ee811b
commit c8e2d8b239
19 changed files with 92 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ChangeUserRoleCmdMsgHdlr.scala
View File

@ -31,7 +31,7 @@ trait ChangeUserRoleCmdMsgHdlr extends RightsManagementTrait {
} yield {
RegisteredUsers.updateUserRole(liveMeeting.registeredUsers, u, userRole)
}
val promoteGuest = !liveMeeting.props.usersProp.authenticatedGuest
val promoteGuest = !liveMeeting.props.usersProp.authenticatedGuest || liveMeeting.props.usersProp.allowPromoteGuestToModerator
if (msg.body.role == Roles.MODERATOR_ROLE && (!uvo.guest || promoteGuest)) {
// Promote non-guest users.
val notifyEvent = MsgBuilder.buildNotifyUserInMeetingEvtMsg(

7
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/db/MeetingUsersPoliciesDAO.scala
View File

@ -19,7 +19,8 @@ case class MeetingUsersPoliciesDbModel(
meetingLayout: String,
allowModsToUnmuteUsers: Boolean,
allowModsToEjectCameras: Boolean,
authenticatedGuest: Boolean
authenticatedGuest: Boolean,
allowPromoteGuestToModerator: Boolean
)
class MeetingUsersPoliciesDbTableDef(tag: Tag) extends Table[MeetingUsersPoliciesDbModel](tag, "meeting_usersPolicies") {
@ -34,10 +35,11 @@ class MeetingUsersPoliciesDbTableDef(tag: Tag) extends Table[MeetingUsersPolicie
val allowModsToUnmuteUsers = column[Boolean]("allowModsToUnmuteUsers")
val allowModsToEjectCameras = column[Boolean]("allowModsToEjectCameras")
val authenticatedGuest = column[Boolean]("authenticatedGuest")
val allowPromoteGuestToModerator = column[Boolean]("allowPromoteGuestToModerator")
// val fk_meetingId: ForeignKeyQuery[MeetingDbTableDef, MeetingDbModel] = foreignKey("fk_meetingId", meetingId, TableQuery[MeetingDbTableDef])(_.meetingId)
override val * : ProvenShape[MeetingUsersPoliciesDbModel] = (meetingId, maxUsers, maxUserConcurrentAccesses, webcamsOnlyForModerator, userCameraCap, guestPolicy, guestLobbyMessage, meetingLayout, allowModsToUnmuteUsers, allowModsToEjectCameras, authenticatedGuest) <> (MeetingUsersPoliciesDbModel.tupled, MeetingUsersPoliciesDbModel.unapply)
override val * : ProvenShape[MeetingUsersPoliciesDbModel] = (meetingId, maxUsers, maxUserConcurrentAccesses, webcamsOnlyForModerator, userCameraCap, guestPolicy, guestLobbyMessage, meetingLayout, allowModsToUnmuteUsers, allowModsToEjectCameras, authenticatedGuest, allowPromoteGuestToModerator) <> (MeetingUsersPoliciesDbModel.tupled, MeetingUsersPoliciesDbModel.unapply)
}
object MeetingUsersPoliciesDAO {
@ -56,6 +58,7 @@ object MeetingUsersPoliciesDAO {
allowModsToUnmuteUsers = usersProp.allowModsToUnmuteUsers,
allowModsToEjectCameras = usersProp.allowModsToEjectCameras,
authenticatedGuest = usersProp.authenticatedGuest,
allowPromoteGuestToModerator = usersProp.allowPromoteGuestToModerator,
)
)
).onComplete {

3
akka-bbb-apps/src/test/scala/org/bigbluebutton/core/AppsTestFixtures.scala
View File

@ -44,6 +44,7 @@ trait AppsTestFixtures {
val allowModsToUnmuteUsers = false
val allowModsToEjectCameras = false
val authenticatedGuest = false
val allowPromoteGuestToModerator = false
val meetingLayout = ""
val captureNotesFilename = s"Room 0${sequence} (Notes)"
val captureSlidesFilename = s"Room 0${sequence} (Whiteboard)"
@ -69,7 +70,7 @@ trait AppsTestFixtures {
val usersProp = UsersProp(maxUsers = maxUsers, webcamsOnlyForModerator = webcamsOnlyForModerator,
userCameraCap = userCameraCap,
guestPolicy = guestPolicy, allowModsToUnmuteUsers = allowModsToUnmuteUsers, allowModsToEjectCameras = allowModsToEjectCameras,
authenticatedGuest = authenticatedGuest, meetingLayout = meetingLayout)
authenticatedGuest = authenticatedGuest, allowPromoteGuestToModerator = allowPromoteGuestToModerator, meetingLayout = meetingLayout)
val metadataProp = new MetadataProp(metadata)
val defaultProps = DefaultProps(meetingProp, breakoutProps, durationProps, password, recordProp, welcomeProp, voiceProp,

5
bbb-common-message/src/main/scala/org/bigbluebutton/common2/domain/Meeting2x.scala
View File

@ -42,7 +42,7 @@ case class VoiceProp(telVoice: String, voiceConf: String, dialNumber: String, mu
case class UsersProp(
maxUsers: Int,
maxUserConcurrentAccesses:Int,
maxUserConcurrentAccesses: Int,
webcamsOnlyForModerator: Boolean,
userCameraCap: Int,
guestPolicy: String,
@ -50,7 +50,8 @@ case class UsersProp(
allowModsToUnmuteUsers: Boolean,
allowModsToEjectCameras: Boolean,
authenticatedGuest: Boolean,
waitingGuestUsersTimeout: Long,
allowPromoteGuestToModerator: Boolean,
waitingGuestUsersTimeout: Long
)
case class MetadataProp(metadata: collection.immutable.Map[String, String])

3
bbb-common-message/src/test/scala/org/bigbluebutton/common2/TestFixtures.scala
View File

@ -44,6 +44,7 @@ trait TestFixtures {
val keepEvents = false
val guestPolicy = "ALWAYS_ASK"
val authenticatedGuest = false
val allowPromoteGuestToModerator = false
val metadata: collection.immutable.Map[String, String] = Map("foo" -> "bar", "bar" -> "baz", "baz" -> "foo")
val captureNotesFilename = s"Room 0${sequence} (Notes)"
val captureSlidesFilename = s"Room 0${sequence} (Whiteboard)"
@ -71,7 +72,7 @@ trait TestFixtures {
val voiceProp = VoiceProp(telVoice = voiceConfId, voiceConf = voiceConfId, dialNumber = dialNumber, muteOnStart = muteOnStart)
val usersProp = UsersProp(maxUsers = maxUsers, webcamsOnlyForModerator = webcamsOnlyForModerator,
userCameraCap = userCameraCap,
guestPolicy = guestPolicy, allowModsToUnmuteUsers = allowModsToUnmuteUsers, allowModsToEjectCameras = allowModsToEjectCameras, authenticatedGuest = authenticatedGuest)
guestPolicy = guestPolicy, allowModsToUnmuteUsers = allowModsToUnmuteUsers, allowModsToEjectCameras = allowModsToEjectCameras, authenticatedGuest = authenticatedGuest, allowPromoteGuestToModerator = allowPromoteGuestToModerator)
val metadataProp = new MetadataProp(metadata)
val defaultProps = DefaultProps(meetingProp, breakoutProps, durationProps, password, recordProp, welcomeProp, voiceProp,
usersProp, metadataProp)

1
bbb-common-web/src/main/java/org/bigbluebutton/api/ApiParams.java
View File

@ -33,6 +33,7 @@ public class ApiParams {
public static final String FREE_JOIN = "freeJoin";
public static final String FULL_NAME = "fullName";
public static final String GUEST_POLICY = "guestPolicy";
public static final String ALLOW_PROMOTE_GUEST_TO_MODERATOR = "allowPromoteGuestToModerator";
public static final String MEETING_LAYOUT = "meetingLayout";
public static final String IS_BREAKOUT = "isBreakout";
public static final String LOGO = "logo";

5
bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
View File

@ -423,9 +423,8 @@ public class MeetingService implements MessageListener {
m.getWebcamsOnlyForModerator(), m.getMeetingCameraCap(), m.getUserCameraCap(), m.getMaxPinnedCameras(), m.getModeratorPassword(), m.getViewerPassword(),
m.getLearningDashboardAccessToken(), m.getCreateTime(),
formatPrettyDate(m.getCreateTime()), m.isBreakout(), m.getSequence(), m.isFreeJoin(), m.getMetadata(),
m.getGuestPolicy(), m.getAuthenticatedGuest(), m.getWaitingGuestUsersTimeout(), m.getMeetingLayout(),
m.getWelcomeMessageTemplate(), m.getWelcomeMessage(), m.getWelcomeMsgForModerators(),
m.getDialNumber(), m.getMaxUsers(), m.getMaxUserConcurrentAccesses(),
m.getGuestPolicy(), m.getAuthenticatedGuest(), m.getAllowPromoteGuestToModerator(), m.getWaitingGuestUsersTimeout(), m.getMeetingLayout(), m.getWelcomeMessageTemplate(), m.getWelcomeMessage(),
m.getWelcomeMsgForModerators(), m.getDialNumber(), m.getMaxUsers(), m.getMaxUserConcurrentAccesses(),
m.getMeetingExpireIfNoUserJoinedInMinutes(), m.getMeetingExpireWhenLastUserLeftInMinutes(),
m.getUserInactivityInspectTimerInMinutes(), m.getUserInactivityThresholdInMinutes(),
m.getUserActivitySignResponseDelayInMinutes(), m.getEndWhenNoModerator(), m.getEndWhenNoModeratorDelayInMinutes(),

14
bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java
View File

@ -77,12 +77,14 @@ public class ParamsProcessorUtil {
private String defaultHTML5ClientUrl;
private String graphqlWebsocketUrl;
private String defaultGuestWaitURL;
private Boolean allowRequestsWithoutSession = false;
private Integer defaultHttpSessionTimeout = 14400;
private Boolean useDefaultAvatar = false;
private String defaultAvatarURL;
private String defaultGuestPolicy;
private Boolean authenticatedGuest;
private Boolean defaultAllowPromoteGuestToModerator;
private Long waitingGuestUsersTimeout;
private String defaultMeetingLayout;
private int defaultMeetingDuration;
@ -678,6 +680,11 @@ public class ParamsProcessorUtil {
guestPolicy = params.get(ApiParams.GUEST_POLICY);
}
Boolean allowPromoteGuestToModerator = defaultAllowPromoteGuestToModerator;
if (!StringUtils.isEmpty(params.get(ApiParams.ALLOW_PROMOTE_GUEST_TO_MODERATOR))) {
allowPromoteGuestToModerator = Boolean.parseBoolean(params.get(ApiParams.ALLOW_PROMOTE_GUEST_TO_MODERATOR));
}
String presentationUploadExternalDescription = defaultPresentationUploadExternalDescription;
if (!StringUtils.isEmpty(params.get(ApiParams.PRESENTATION_UPLOAD_EXTERNAL_DESCRIPTION))) {
presentationUploadExternalDescription = params.get(ApiParams.PRESENTATION_UPLOAD_EXTERNAL_DESCRIPTION);
@ -767,6 +774,7 @@ public class ParamsProcessorUtil {
.withIsBreakout(isBreakout)
.withGuestPolicy(guestPolicy)
.withAuthenticatedGuest(authenticatedGuest)
.withAllowPromoteGuestToModerator(allowPromoteGuestToModerator)
.withWaitingGuestUsersTimeout(waitingGuestUsersTimeout)
.withAllowRequestsWithoutSession(allowRequestsWithoutSession)
.withMeetingLayout(meetingLayout)
@ -1302,7 +1310,7 @@ public class ParamsProcessorUtil {
this.useDefaultAvatar = value;
}
public void setdefaultAvatarURL(String url) {
public void setDefaultAvatarURL(String url) {
this.defaultAvatarURL = url;
}
@ -1314,6 +1322,10 @@ public class ParamsProcessorUtil {
this.authenticatedGuest = value;
}
public void setDefaultAllowPromoteGuestToModerator(Boolean value) {
this.defaultAllowPromoteGuestToModerator = value;
}
public void setWaitingGuestUsersTimeout(Long value) {
this.waitingGuestUsersTimeout = value;
}

20
bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
View File

@ -81,6 +81,7 @@ public class Meeting {
private String guestLobbyMessage = "";
private Map<String,String> usersWithGuestLobbyMessages;
private Boolean authenticatedGuest = false;
private Boolean allowPromoteGuestToModerator = false;
private long waitingGuestUsersTimeout = 30000;
private String meetingLayout = MeetingLayout.SMART_LAYOUT;
private boolean userHasJoined = false;
@ -166,6 +167,7 @@ public class Meeting {
isBreakout = builder.isBreakout;
guestPolicy = builder.guestPolicy;
authenticatedGuest = builder.authenticatedGuest;
allowPromoteGuestToModerator = builder.allowPromoteGuestToModerator;
waitingGuestUsersTimeout = builder.waitingGuestUsersTimeout;
meetingLayout = builder.meetingLayout;
allowRequestsWithoutSession = builder.allowRequestsWithoutSession;
@ -503,6 +505,14 @@ public class Meeting {
return authenticatedGuest;
}
public void setAllowPromoteGuestToModerator(Boolean value) {
allowPromoteGuestToModerator = value;
}
public Boolean getAllowPromoteGuestToModerator() {
return allowPromoteGuestToModerator;
}
public void setWaitingGuestUsersTimeout(long waitingGuestUsersTimeout) {
waitingGuestUsersTimeout = waitingGuestUsersTimeout;
}
@ -920,6 +930,7 @@ public class Meeting {
private boolean isBreakout;
private String guestPolicy;
private Boolean authenticatedGuest;
private Boolean allowPromoteGuestToModerator;
private long waitingGuestUsersTimeout;
private Boolean allowRequestsWithoutSession;
private String meetingLayout;
@ -1107,8 +1118,13 @@ public class Meeting {
return this;
}
public Builder withWaitingGuestUsersTimeout(long waitingGuestUsersTimeout) {
this.waitingGuestUsersTimeout = waitingGuestUsersTimeout;
public Builder withAllowPromoteGuestToModerator(Boolean value) {
allowPromoteGuestToModerator = value;
return this;
}
public Builder withWaitingGuestUsersTimeout(long value) {
waitingGuestUsersTimeout = value;
return this;
}

12
bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java
View File

@ -16,14 +16,9 @@ import org.bigbluebutton.presentation.messages.IDocConversionMsg;
public interface IBbbWebApiGWApp {
void send(String channel, String message);
void createMeeting(String meetingID,
String externalMeetingID,
String parentMeetingID,
String meetingName,
Boolean recorded,
String voiceBridge,
Integer duration,
Boolean autoStartRecording,
void createMeeting(String meetingID, String externalMeetingID,
String parentMeetingID, String meetingName, Boolean recorded,
String voiceBridge, Integer duration, Boolean autoStartRecording,
Boolean allowStartStopRecording,
Boolean recordFullDurationMedia,
Boolean webcamsOnlyForModerator,
@ -41,6 +36,7 @@ public interface IBbbWebApiGWApp {
Map<String, String> metadata,
String guestPolicy,
Boolean authenticatedGuest,
Boolean allowPromoteGuestToModerator,
Long waitingGuestUsersTimeout,
String meetingLayout,
String welcomeMsgTemplate,

3
bbb-common-web/src/main/java/org/bigbluebutton/api2/domain/UsersProp2.java
View File

@ -7,6 +7,7 @@ public class UsersProp2 {
public final String guestPolicy;
public final String meetingLayout;
public final boolean authenticatedGuest;
public final boolean allowPromoteGuestToModerator;
public final boolean userHasJoined;
public final boolean webcamsOnlyForModerator;
public final int userCameraCap;
@ -21,6 +22,7 @@ public class UsersProp2 {
String guestPolicy,
String meetingLayout,
boolean authenticatedGuest,
boolean allowPromoteGuestToModerator,
boolean userHasJoined,
Map<String, String> userCustomData,
Map<String, User2> users,
@ -31,6 +33,7 @@ public class UsersProp2 {
this.guestPolicy = guestPolicy;
this.meetingLayout = meetingLayout;
this.authenticatedGuest = authenticatedGuest;
this.allowPromoteGuestToModerator = allowPromoteGuestToModerator;
this.userHasJoined = userHasJoined;
this.userCustomData = userCustomData;
this.users = users;

3
bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
View File

@ -6,7 +6,6 @@ import org.apache.pekko.event.Logging
import org.bigbluebutton.api.domain.{BreakoutRoomsParams, Group, LockSettingsParams}
import org.bigbluebutton.api.messaging.converters.messages._
import org.bigbluebutton.api.messaging.messages.ChatMessageFromApi
import org.bigbluebutton.api.model.request.SendChatMessage
import org.bigbluebutton.api2.bus._
import org.bigbluebutton.api2.endpoint.redis.WebRedisSubscriberActor
import org.bigbluebutton.common2.redis.MessageSender
@ -135,6 +134,7 @@ class BbbWebApiGWApp(
metadata: java.util.Map[String, String],
guestPolicy: String,
authenticatedGuest: java.lang.Boolean,
allowPromoteGuestToModerator: java.lang.Boolean,
waitingGuestUsersTimeout: java.lang.Long,
meetingLayout: String,
welcomeMsgTemplate: String, welcomeMsg: String, welcomeMsgForModerators: String,
@ -222,6 +222,7 @@ class BbbWebApiGWApp(
guestPolicy = guestPolicy, meetingLayout = meetingLayout, allowModsToUnmuteUsers = allowModsToUnmuteUsers.booleanValue(),
allowModsToEjectCameras = allowModsToEjectCameras.booleanValue(),
authenticatedGuest = authenticatedGuest.booleanValue(),
allowPromoteGuestToModerator = allowPromoteGuestToModerator.booleanValue(),
waitingGuestUsersTimeout = waitingGuestUsersTimeout.longValue()
)
val metadataProp = MetadataProp(mapAsScalaMap(metadata).toMap)

4
bbb-graphql-server/bbb_schema.sql
View File

@ -136,7 +136,8 @@ create table "meeting_usersPolicies" (
"meetingLayout" varchar(100),
"allowModsToUnmuteUsers" boolean,
"allowModsToEjectCameras" boolean,
"authenticatedGuest" boolean
"authenticatedGuest" boolean,
"allowPromoteGuestToModerator" boolean
);
create index "idx_meeting_usersPolicies_meetingId" on "meeting_usersPolicies"("meetingId");
@ -152,6 +153,7 @@ SELECT "meeting_usersPolicies"."meetingId",
"meeting_usersPolicies"."allowModsToUnmuteUsers",
"meeting_usersPolicies"."allowModsToEjectCameras",
"meeting_usersPolicies"."authenticatedGuest",
"meeting_usersPolicies"."allowPromoteGuestToModerator",
"meeting"."isBreakout" is false "moderatorsCanMuteAudio",
"meeting"."isBreakout" is false and "meeting_usersPolicies"."allowModsToUnmuteUsers" is true "moderatorsCanUnmuteAudio"
FROM "meeting_usersPolicies"

1
bbb-graphql-server/metadata/databases/BigBlueButton/tables/public_v_meeting_usersPolicies.yaml
View File

@ -8,6 +8,7 @@ select_permissions:
- allowModsToEjectCameras
- allowModsToUnmuteUsers
- authenticatedGuest
- allowPromoteGuestToModerator
- guestLobbyMessage
- guestPolicy
- maxUserConcurrentAccesses

1
bigbluebutton-html5/imports/ui/Types/meeting.ts
View File

@ -48,6 +48,7 @@ export interface UsersPolicies {
allowModsToEjectCameras: boolean;
allowModsToUnmuteUsers: boolean;
authenticatedGuest: boolean;
allowPromoteGuestToModerator: boolean;
guestPolicy: string;
maxUserConcurrentAccesses: number;
maxUsers: number;

1
bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-participants/queries.ts
View File

@ -20,6 +20,7 @@ subscription MeetingPermissions {
allowModsToEjectCameras
allowModsToUnmuteUsers
authenticatedGuest
allowPromoteGuestToModerator
guestPolicy
maxUserConcurrentAccesses
maxUsers

4
bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-participants/user-actions/service.ts
View File

@ -55,14 +55,14 @@ export const generateActionsPermissions = (
&& !isSubjectUserModerator
&& !isDialInUser
&& !isBreakout
&& !(isSubjectUserGuest && usersPolicies?.authenticatedGuest);
&& !(isSubjectUserGuest && usersPolicies?.authenticatedGuest && !usersPolicies?.allowPromoteGuestToModerator);
const allowedToDemote = amIModerator
&& !amISubjectUser
&& isSubjectUserModerator
&& !isDialInUser
&& !isBreakout
&& !(isSubjectUserGuest && usersPolicies?.authenticatedGuest);
&& !(isSubjectUserGuest && usersPolicies?.authenticatedGuest && !usersPolicies?.allowPromoteGuestToModerator);
const allowedToChangeStatus = amISubjectUser && USER_STATUS_ENABLED;

3
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
View File

@ -160,6 +160,9 @@ defaultGuestPolicy=ALWAYS_ACCEPT
# Enables or disables authenticated guest
authenticatedGuest=true
# Allows moderators to promote guests to moderators when authenticatedGuest is enabled
defaultAllowPromoteGuestToModerator=false
#---------------------------------------------------
# Default Meeting Layout
# Accepted values are the standard layouts: CUSTOM_LAYOUT, SMART_LAYOUT, PRESENTATION_FOCUS, VIDEO_FOCUS

1
bigbluebutton-web/grails-app/conf/spring/resources.xml
View File

@ -161,6 +161,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<property name="defaultAvatarURL" value="${defaultAvatarURL}"/>
<property name="defaultGuestPolicy" value="${defaultGuestPolicy}"/>
<property name="authenticatedGuest" value="${authenticatedGuest}"/>
<property name="defaultAllowPromoteGuestToModerator" value="${defaultAllowPromoteGuestToModerator}"/>
<property name="waitingGuestUsersTimeout" value="${waitingGuestUsersTimeout}"/>
<property name="defaultMeetingLayout" value="${defaultMeetingLayout}"/>
<property name="meetingExpireIfNoUserJoinedInMinutes" value="${meetingExpireIfNoUserJoinedInMinutes}"/>