Commit Graph

73 Commits

Author SHA1 Message Date
Max Erenberg d6eead5e68 Merge branch 'v2' of https://github.com/bigbluebutton/greenlight into v2 2021-05-12 20:06:09 +00:00
Kai af638ca43d
Added parameter for log level (#2546)
* Added parameter for log level

* Added fix for Rubocop + RSpec check and `RAILS_LOG_LEVEL` is now optionally. Default value/log level is `info`.

* Set default log level from `info` to `debug` for RSpec check...

* Update application.rb

Moving it to config/environments/production.rb

* Update production.rb

* Update production.rb

Forgot to change the default logging level again from `:debug` to :info`

Co-authored-by: kaihen <>
2021-05-04 12:39:51 -04:00
zimmersi ba0ec6ba71
enable SMTPS: SMTP over direct TLS connection (#2485)
* enable SMTPS: SMTP over direct TLS connection

* remove gem 'sqlite3', '~> 1.3.6' as requested

* enable SMTPS: SMTP over direct TLS connection

* remove gem 'sqlite3', '~> 1.3.6' as requested

* changed image name to kwgl

* rebase and rubocop -a

* removed  gem 'sqlite3', '~> 1.3.6'
2021-03-01 18:50:00 -05:00
Max Erenberg d617a300ac add Debian packaging files 2021-02-21 07:16:15 +00:00
Jesus Federico 44abc0e91e
GRN2-XX: Patch to overcome performance issues with the database. (#2454) 2021-01-20 17:25:49 -05:00
Tobias Gall 8c9535b0ec
Increase Database pool size (#2445)
The required pool size is calculated by RAILS_MAX_THREADS (default 5) + #Action
Cable-Workers (default 4) = 9
The default pool size of 5 is to low for all required connections.

Co-authored-by: Jesus Federico <jesus@123it.ca>
2021-01-20 15:21:32 -05:00
Moritz Schlarb 3b7b45cc03
Refine OpenID Connect Authentication from #1194 (#1399)
* Adds OpenID Connect.

* Add CSS class for openid_connect omniauth provider

* Add translation (de_DE and en) for openid_connect omniauth provider label

* Make uid_field configurable for openid_connect omniauth provider

* updates to support for openid

* updates to support for openid

* updated ldap gem

* updated sample.env

Co-authored-by: mapidentity <git@mapidentity.com>
Co-authored-by: Jesus Federico <jesus@123it.ca>
Co-authored-by: mapidentity <49822181+mapidentity@users.noreply.github.com>
2021-01-07 15:11:17 -05:00
Ahmad Farhat 07557f45dc
Added env variable to set the default language (#2147) 2020-10-02 09:50:24 -04:00
Lars Kiesow 4286864263
Puma Worker Configuration (#1701)
We noticed that the current default settings perform very poorly under
load. We managed to literally take down Greenlight during a larger event
when people where accessing the landing page for rooms and when doing
some tests, I was more or less able to DoS Greenlight on my own.

This patch adds a default worker configuration similar to the previous
configuration with one worker, but lets users easily adjust it to more
workers which significantly improves the situation. The small, 4 core
machine I was testing on could handle about thrice the amount of
requests.

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-09-29 11:44:47 -04:00
Ahmad Farhat b89cbfad03
ENABLE_SSL is now defaulted to true for new installations (#2121) 2020-09-23 10:25:44 -04:00
Jordi Molina 5a38ae488e
Allow customization of test email recipient (#2107)
* Update configuration.rake

use env variable SMTP_TEST_RECIPIENT so customers using mail providers like Microsoft can specify RFC 2606 compliant destination test recipients

* add SMTP_TEST_RECIPIENT to sample.env

add SMTP_TEST_RECIPIENT to sample.env with default value to ensure retro compatibility

* default to notifications@example.com

default to notifications@example.com should SMTP_TEST_RECIPIENT not be defined

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-09-22 11:03:47 -04:00
Ahmad Farhat f992f76ae1
Set default cable adapter to postgres (#2096) 2020-09-17 15:02:54 -04:00
Ahmad Farhat 60cf5f7440
Merge v2.7-alpha (#1951)
* Fix wrong conditional (reported by LGTM) (#1477)

Signed-off-by: Stefan Weil <sw@weilnetz.de>

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Bump rack from 2.2.2 to 2.2.3 (#1839)

Bumps [rack](https://github.com/rack/rack) from 2.2.2 to 2.2.3.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/v2.2.2...2.2.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [FIX]  Unable to edit long recording names #1776  (#1780)

* Allow to set a filter for LDAP authentication

* [FIX] Unable to edit long recording names #1776

Co-authored-by: François Ménabé <francois.menabe@unistra.fr>
Co-authored-by: farhatahmad <ahmad.af.farhat@gmail.com>

* Desgin for Manage Users Tabs (#1777)

* Update _subtitle.html.erb

* Update _manage_users_tags.html.erb

* Update admins.scss

* Update _primary_themes.scss

* Update _manage_users_tags.html.erb

* Minor style changes to manage users (#1845)

* Maintenance banner moved to admin site (#1775)

* initial

* finish

* travis fixes

* travis again

* not required

* Co-authored-by: Tobias Fiebig <t.fiebig@tudelft.nl> (#1296)

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Enhance Room OpenGraph Metadata (#1601)

* Revert "Enhance Room OpenGraph Metadata (#1601)" (#1852)

This reverts commit 3b007c233ae12e0407f216ae269c63d6179f73b8.

* GRN2-xx: Tab title now displays the current page name (#1853)

* Tab title now displays the current page name

* Added page title for the rest of the pages

* Split Site Settings into 3 different tabs (#1858)

* Split Site Settings into 3 different tabs

* Fix copyright

* Added redirect to correct tab

* Make sure settings are displaying when they should

* Update en.yml (#1857)

* Build images for alpha branches (#1867)

* Upgraded jquery to latest version (#1896)

* Added favicon tag (#1898)

* Fixed XSS issue with role name (#1899)

* Update path for coloring redirect (#1908)

* Added a fourth section to the room uid (#1910)

* Fixed issue with insecure room sharing removal (#1914)

* Fixes typo (#1917)

Fixes typo: successfully was written incorrect.

* Fixed order of rooms in server rooms (#1915)

* Change default room sort to latest activity (#1919)

* GRN2-xx: Small changes/improvements to the recording settings (#1851)

* Small changes/improvements to the recording settings

* Replaced room warning with info flash

* Added global setting to enable/disable the recording consent feature

* Replace Legal with Terms (#1931)

* Added a more friendly OpenGraph description when invited to join a room (#1932)

* Fixed issue causing maintenance banner not to hide correctly (#1933)

* Hide recording menu and recording list when it is disabled (#1935)

* Hide recording menu and recording list when it is disabled

* Hide recording list when disabled

* GRN2-xx: Added an auto-refresh after 2 mins while waiting for room to start (#1947)

* Added an auto-refresh after 2 mins while waiting for room to start

* Fixed random issue with test case

* GRN2-xx: Added ability to preupload presentations to rooms (#1895)

* Added ability to preupload presentations to rooms (#1868)

* Added setting to site settings and allowed admins to change the presentation

* Added AWS S3 and GCS Storage ENV variables

* Added check to ensure file extension is correct

* Added icon to remove presentation

* Added testcases for preupload

* Add nginx redirect to solve issue with relative root

* Record title, instead of room name, in the popup (#1924)

* Update _public_recording_row.html.erb

* Update _recording_row.html.erb

Co-authored-by: Stefan Weil <sw@weilnetz.de>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: beckerr-rzht <beckerr@hochschule-trier.de>
Co-authored-by: François Ménabé <francois.menabe@unistra.fr>
Co-authored-by: MrKeksi <mrkeksi@users.noreply.github.com>
Co-authored-by: yanosz <yanosz@users.noreply.github.com>
Co-authored-by: Moritz Schlarb <moschlar@metalabs.de>
Co-authored-by: chronikum <34622984+chronikum@users.noreply.github.com>
Co-authored-by: Mitsutaka Sato <miztaka@honestyworks.jp>
Co-authored-by: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
2020-07-29 11:03:22 -04:00
Ahmad Farhat cf794db595
Added ability to map attributes for LDAP (#1779) 2020-06-11 11:28:55 -04:00
Ahmad Farhat a61b96289e
Updated sample env for SMTP setting (#1736) 2020-06-03 13:31:40 -04:00
LifeEncrypter b297fdfbaf
Added optional SMTP_OPENSSL_VERIFY_MODE (#1703)
* Added optional SMTP_OPENSSL_VERIFY_MODE to fix mailserver certificate issues

* Added optional SMTP_OPENSSL_VERIFY_MODE

Fixed to long line. [139/130]

* Fix multi-line indent

* Remove elseif statements and use much shorter way of checking for SMTP_OPENSSL_VERIFY_MODE

* Too long line again

* Moved SMTP_OPENSSL_VERIFY_OPTION. Specified what it does. Added security warning

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-06-03 10:13:08 -04:00
Jesus Federico 7411eba8e0
GRN2-xx: Added port to database configuration (#1550)
* GRN2-XX: Added port to database configuration

* GRN2-XX: Added port to database configuration
2020-05-08 16:13:57 -04:00
Ahmad Farhat 6fc402e40b
GRN2-xx: Added SAFE_HOSTS env variable to block unknown hosts (#1543)
* Added SAFE_HOSTS env variable to block unknown hosts

* Update sample.env
2020-05-08 13:33:02 -04:00
François Ménabé 8049ddbd01
Allow to set a filter for LDAP authentication (#1306) 2020-04-20 15:25:25 -04:00
Lars Kiesow 10ef20363a
Additional LDAP Authentication Methods (#1287)
This patch allows anonymous and user based authentication to LDAP
servers. This change is based on a patch against bn-ldap-authentication:

-  https://github.com/blindsidenetworks/bn-ldap-authentication/pull/2

The patch introduces a new environment variable `LDAP_AUTH` which
controls the authentication method used against the LDAP server:

- `anonymous` enables an anonymous bind to the LDAP with no password
  being used.

- `user` uses the user's own credentials to search for his data,
  enabling authenticated login to LDAP without the need for a user with
  global read privileges.

The default still remains at using a bind user, allowing for a seamless
upgrade path from the previous version.

This fixes #1082

Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-16 14:10:14 -04:00
Ahmad Farhat da82867abe
Remove report issue from being included automatically (#1257)
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-16 12:35:58 -04:00
Klaus 21cb768fc4
make help link configurable (#1161)
* make help link configurable

* change default help url

* use default help url in setups without env var

Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-16 10:56:34 -04:00
Justin Byrne 3eead129c9
Updated documentation urls (#1021)
The urls for the Auth settings were pointing towards the customise page these have been moved to the config page.
2020-03-19 11:14:14 -04:00
Ahmad Farhat 3e7fb7ecc2
GRN2-xx: Added option to specify different redirect url for google auth (#1016)
* Added option to specify different redirect url for google auth

* Made the redirect url generic so it works with 365

Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-03-18 16:26:45 -04:00
Ahmad Farhat feccee7d62
GRN2-164: Switched the default database to Postgres (#952)
* Switched the default database to Postgres

* Uncomment DB variables in sample.env
2020-02-18 15:22:51 -05:00
Ahmad Farhat e13e762349 GRN2-243: Added a report issue button to the 500 error page (#796)
* Added a report issue button to the 500 error page

* Removed unused code

* Removed unused quotes
2019-09-19 10:03:44 -04:00
farhatahmad 9ddc057589 Added a Maintenance Window flash (#758) 2019-08-22 12:15:01 -04:00
farhatahmad 96ace3265e Added Google Analytics (#749) 2019-08-19 08:51:57 -04:00
shawn-higgins1 1256554ce6 Configurable default registration (#733)
* Configurable default registration

* Remove unneeded if branch
2019-08-14 10:11:01 -04:00
farhatahmad 973c95339c Added All Join as Moderator room setting (#696) 2019-07-31 11:34:31 -04:00
jfederico 2775b18993 Merge branch 'v2' 2019-07-29 14:30:30 +00:00
farhatahmad 403a7c4e40 GRN2-xx: Removed readonly maintenance mode (#699)
* Removed readonly maintenance mode

* Removed full reference
2019-07-29 10:23:18 -04:00
shawn-higgins1 79188a6cae Add support for roles (#656)
* Add support for ldap roles

* Remove debugger

* Remove bundled with

* Update omniauth-bn-launcher version
2019-07-24 13:40:09 -04:00
shawn-higgins1 0934919e44 GRN2-206: Remove support for the flash client Fixes(#654) (#661)
* Remove ability to specify flash client

* Always join via html5

* Fix styling and tests
2019-07-24 09:37:59 -04:00
shawn-higgins1 7b96d5ae41 Add room setting to require moderator approval (#660) 2019-07-23 16:16:14 -04:00
Jesus Federico f7c88cfc6a
Merge branch 'v2.2.1-alpha' into master 2019-07-23 15:57:08 -04:00
shawn-higgins1 d3a9ae32a9 GRN2-202: Create a room in which everyone joins as Moderator (Fixed #628) (#650)
* Room setting to allow anyone to start a room

* Update sample.env

* merge v2.2.1
2019-07-23 14:54:46 -04:00
farhatahmad 02c0d577f8 Added an env variable that allows maitenance mode (#679) 2019-07-22 16:45:56 -04:00
farhatahmad ad2321e3e9 Update sample.env with the correct links (#637) 2019-07-12 16:55:11 -04:00
shawn-higgins1 fc18976b6d GRN2-107: Add office365 auth (#616)
* add office365 auth

* Delete conflicting file
2019-07-09 13:54:15 -04:00
shawn-higgins1 e153528fcc GRN2-162: Revert to sqlite in docker compose (#594)
* Revert to sqlite

* Missed uncomenting sqlite volume

* Update sample.env
2019-06-28 16:40:19 -04:00
shawn-higgins1 ccbd46f045 Improve container build: GRN2-156 (#582)
* Cache gems

* Remove debug statement

* Use postgress by default

* Update sample.env
2019-06-26 10:15:53 -04:00
jfederico e1fc628202 Add settings for postgres 2019-05-24 15:54:20 +00:00
farhatahmad 720dac6012 GRN2-6: Added the ability for admins to specify registration method (#520)
* Added the ability to invite users

* Small bug fix

* Added the ability to approve/decline users

* Small bug fixes

* More bug fixes

* More minor changes

* Final changes
2019-05-17 16:26:49 -04:00
Rafael Baldasso Audibert d8f6c3f872 Added Google calendar button (#429)
* implement first version of the recording authentication, redirecting to the playback URL with the jwt token

* set default recording visibility by environment variable

* use the http header, if present, to determine the client ip address

* fix email verification when disabled

* revert playback component to link_to, change method to get

* remove unnecessary variable

* Added "Add to Google Calendar" button on Room page

* Added Google Calendar button enable to env.sample

* Updated CSS for the Google Calendar Button row

* Added correct translation when copying room link

* Fixed new Google Calendar button mobile display

* GRN-80: Allow local accounts on multitenant (#428)

* Changed the way the omniauth providers are declared

* Allow local authentication for multitenant mode based on customer settings

* Cleanead up code mandated by rubocop

* Completed implementation for signin and added the one for signup

* Fixed issue with rubocop

* Renamed customer_name to lb_user

* Renamed lb_user -> user_domain, fixed issue with signup controller, email verification WAS NOT implemented

* Completed implementation of email_verification

* Fixed rubocop issue

* Final update

* Fix for test with loadbalancer

* Make sure loadbalancer mockup is only used when env defined

* Fix for test on rooms_controller

* Fixed most of the test failing on multitenant env

* Fixed issue detected by rubocop

* Fixed issue with activation tockens not working on resend

* Fixed new issue found by rubocop

* Updated travis script

* Harcoded credentials for mockup

* Updated expectation on start_session

* Fixed issue with duplication of home room

* Updated script for rubocop

* Restored Gemfile

* Update sample.env

* Update sample.env
2019-05-13 17:05:31 -04:00
farhatahmad 75f48f4979 GRN2-125: Added a configurable reCAPTCHA on sign up (#502)
* Added a configurable reCAPTCHA on sign up

* Added missing code
2019-05-07 09:21:04 -04:00
Jesus Federico 9f74b0e2c0
Admin panel (#496)
* Added the administrator role and functionality that comes with it  (#403)

* GRN-20: Added roles to the user model

* GRN-75: Added a view for admins to see their users

* GRN-77: Added Edit/Delete/Promote ability for admins

* GRN-71: Added admin account by default

* Changed the way locales are shown

* Updated the rest of the locales

* Changed the way available_locales are defined

* Updated locales in Russian

* Updated locaales for German

* Update user.rb

* Update admins.js

* GRN-15: Added the ability to change color and image from admin interface (#425)

* GRN-20: Added roles to the user model

* GRN-75: Added a view for admins to see their users

* GRN-77: Added Edit/Delete/Promote ability for admins

* GRN-71: Added admin account by default

* Changed the way locales are shown

* Updated the rest of the locales

* Changed the way available_locales are defined

* Updated locales in Russian

* Updated locaales for German

* GRN-15: Added the ability for admins to customize color and image

* Update user.rb

* Update user.rb

* Update routes.rb

* Update admins_controller.rb

* GRN-87:Added a super admin role and made changes to how to the design works (#430)

* GRN-20: Added roles to the user model

* GRN-75: Added a view for admins to see their users

* GRN-77: Added Edit/Delete/Promote ability for admins

* GRN-71: Added admin account by default

* Changed the way locales are shown

* Updated the rest of the locales

* Changed the way available_locales are defined

* Updated locales in Russian

* Updated locaales for German

* GRN-15: Added the ability for admins to customize color and image

* Added the super admin and completed the design tab

* Update user.rb

* Update themes_controller_spec.rb

* Update routes.rb

* Update admins_controller.rb

* Removed duplicated code that broke the build after last merge

* GRN-78: Restructured some of the views to make the UI more consistent and responsive (#435)

* GRN-20: Added roles to the user model

* GRN-75: Added a view for admins to see their users

* GRN-77: Added Edit/Delete/Promote ability for admins

* GRN-71: Added admin account by default

* GRN-15: Added the ability for admins to customize color and image

* Added the super admin and completed the design tab

* GRN-78: Cleaned up buttons and moved signin to its own page

* GRN-78: Moved the Rooms and Recordings link to nav bar

* Merge fix

* Views restructure fix (#458)

* Added cache to gitlab-ci.yml

* Restructured seed

* GRN2-99 -> GRN2-106: UI cleanup and refactoring (#478)

* GRN2-98: Change Fullname to Full name

* GRN2-105: Changed View Users to Manage Users

* GRN2-101/103: Updated email to match branding

* GRN2-100: Updated Email Sent flash to be more descriptive

* GRN2-104: Redirect user to sign in page w/ flash after clicking activation link

* GRN2-102: Changed the wording in the verification email

* GRN2-99: Added email form validation

* GRN2-106: Cleaned up Users list front end

* Fixes to rake and admin password validator for passing rubocop

* GRN2-113: Fixed issues with admin panel (#479)

* GRN2-116: Code clean up after restructure of views (#482)

* Removed unused references

* Rubocop

* Added pagination to admin view (#483)

* GRN2-114: Added the ability for admins to ban/unban users (#487)

* Added the ability for admins to ban and unban users

* Update sessions_helper.rb

*  Merge branch 'master' into admin-panel  (#492)

* Updated rubocop gem

* Updated rubocop and fixed issues (#490)

* Rubocop fixes

* GRN2-122: Updated sign in flow for admins and switch design tab to site settings (#489)

* Switched design tab to site settings

* Update _header with spaces instead of tabs

* Added more test cases to increase coverage (#494)
2019-05-03 13:05:12 -04:00
Jesus Federico 2b0301da38
GRN-93: Fix for issue with excesive requests to LB (#447)
* Fix for issue with excesive requests to lb

* Fixed issue with rspec on users not passing when run alone

* Include dotenv in production
2019-04-10 10:12:32 -04:00
Jesus Federico 57aa72ecee
GRN-73: Added settings for externalizing logs (#441)
* Added settoings for externalizing logs

* Fix for passing rubocop

* Attempt to fix jenkins fail

* Final Jenkins fix
2019-04-08 16:06:14 -04:00
farhatahmad c0b46be547 Added fix for multitenant error (#394)
* Added fix for multitenant error

* Fixed issue with room lock when using ldap

* Fixed test cases

* Fixed rubocop issue

* Included internal documentation for LDAP ENV variables
2019-03-13 15:56:57 -04:00