Merge branch 'v3.0.x-release' into snyk-fix-d9738715850964e841cf15f479c93e7a

Author: antobinary

…ub/actions/upload-blob-report/action.yml …merge-and-upload-blob-reports/action.yml.github/actions/upload-blob-report/action.yml renamed to .github/actions/merge-and-upload-blob-reports/action.yml .github/actions/upload-blob-report/action.yml renamed to .github/actions/merge-and-upload-blob-reports/action.yml

@@ -1,5 +1,5 @@
-name: Upload blob report
-description: Merge and upload the blob report to GitHub Actions Artifacts
+name: Merge and upload blob reports
+description: Merge and upload the blob reports to GitHub Actions Artifacts
 runs:
   using: composite
   steps:
@@ -31,6 +31,4 @@ runs:
       with:
         name: tests-report
         overwrite: true
-        path: |
-          bigbluebutton-tests/playwright/playwright-report
-          bigbluebutton-tests/playwright/test-results
+        path: bigbluebutton-tests/playwright/playwright-report

.github/actions/merge-branches/action.yml

@@ -14,4 +14,4 @@ runs:
         git config user.name "BBB Automated Tests"
         git config user.email "tests@bigbluebutton.org"
         git config pull.rebase false
-        git pull origin pull/${{ github.event.number }}/head:${{ github.head_ref }}
+        git pull --no-rebase --no-edit origin pull/${{ github.event.number }}/head:${{ github.head_ref }}

.github/dependabot.yml

@@ -120,4 +120,4 @@ jobs:
 
             ___
 
-            [Click here](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ needs.get-pr-data.outputs.workflow-id }}) to check the action test reports
+            [Click here](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ needs.get-pr-data.outputs.workflow-id }}) to check the action test reports (_to view the report locally, see the [docs](https://github.com/bigbluebutton/bigbluebutton/blob/v3.0.x-release/bigbluebutton-tests/playwright/README.md#check-test-results)_)

.github/workflows/automated-tests-publish-results.yml

@@ -69,7 +69,7 @@ jobs:
           - package: bbb-freeswitch
             build-list: bbb-freeswitch-core bbb-freeswitch-sounds
             cache-files-list: freeswitch.placeholder.sh
-            cache-urls-list: http://bigbluebutton.org/downloads/sounds.tar.gz
+            cache-urls-list: https://ubuntu.bigbluebutton.org/sounds.tar.gz
           - package: bbb-webrtc
             build-list: bbb-webrtc-sfu bbb-webrtc-recorder
             cache-files-list: bbb-webrtc-sfu.placeholder.sh bbb-webrtc-recorder.placeholder.sh
@@ -255,7 +255,40 @@ jobs:
         run: |
           sudo sh -c '
           apt --purge -y remove apache2-bin
-          apt-mark hold firefox #hold ff once bbb-install frequently stuck at `Installing the firefox snap`
+          apt-mark hold firefox #hold ff as bbb-install frequently stuck at `Installing the firefox snap`
+
+          #bbb-webrtc-sfu: removes the special scheduling policies
+          mkdir -p /etc/systemd/system/bbb-webrtc-sfu.service.d/
+          tee /etc/systemd/system/bbb-webrtc-sfu.service.d/override.conf > /dev/null <<EOL
+          [Service]
+          CPUSchedulingPolicy=other
+          Nice=19
+          EOL
+          systemctl daemon-reload
+
+          #Install Sipp for dial-in tests
+          apt install -y pkg-config dh-autoreconf ncurses-dev build-essential libssl-dev libpcap-dev libncurses5-dev libsctp-dev lksctp-tools cmake
+          git clone --recurse-submodules https://github.com/SIPp/sipp.git /opt/sipp
+          cd /opt/sipp
+          git checkout 4682fdba2b63007f13a632c6eb06f0ece84cb7df #Set an old commit as the current code is not working
+          cmake . -DUSE_SSL=1 -DUSE_SCTP=1 -DUSE_PCAP=1 -DUSE_GSL=1
+          make
+          sudo make install
+          rm -r /opt/sipp/gtest
+          rm -r /opt/sipp/src
+
+          # Set dial plan for internal calls
+          mkdir -p /opt/freeswitch/conf/dialplan/public/
+          cat << EOF > "/opt/freeswitch/conf/dialplan/public/bbb_sip.xml"
+          <include>
+            <extension name="bbb_sp_call" continue="true">
+                <condition field="network_addr" expression="\${domain}" break="on-false">
+                    <action application="set" data="bbb_authorized=true"/>
+                    <action application="transfer" data="\${destination_number} XML default"/>
+                </condition>
+            </extension>
+          </include>
+          EOF
           '
       - name: Install BBB
         env:
@@ -265,7 +298,7 @@ jobs:
           sudo -i <<'EOF'
           set -e
           cd /root/
-          wget -nv https://raw.githubusercontent.com/bigbluebutton/bbb-install/v3.0.x-release--no-mongo/bbb-install.sh -O bbb-install.sh
+          wget -nv https://raw.githubusercontent.com/bigbluebutton/bbb-install/v3.0.x-release/bbb-install.sh -O bbb-install.sh
           sed -i "s|> /etc/apt/sources.list.d/bigbluebutton.list||g" bbb-install.sh
           chmod +x bbb-install.sh
 
@@ -321,9 +354,6 @@ jobs:
             echo "Check if there is some process still locking:2"
             ps aux | grep -E 'dpkg|apt'
 
-            #remove all apt-update to make the install faster
-            sed -i 's/apt-get update/#apt-get update/g' bbb-install.sh
-
             RETRY_COUNT=$((RETRY_COUNT + 1))
           done
 
@@ -334,18 +364,22 @@ jobs:
 
           bbb-conf --salt bbbci
           sed -i "s/\"minify\": true,/\"minify\": false,/" /usr/share/etherpad-lite/settings.json
+          sed -i "s/\"loglevel\": \"INFO\"/\"loglevel\": \"DEBUG\"/" /usr/share/etherpad-lite/settings.json
+          sed -i "s/\"level\": \"info\"/\"level\": \"debug\"/" /usr/local/bigbluebutton/bbb-pads/config/settings.json
+          sed -i "s/exports.DEBUG = false/exports.DEBUG = true/" /usr/local/bigbluebutton/bbb-graphql-actions/config.js
           sudo yq e -i '.log_level = "TRACE"' /usr/share/bbb-graphql-middleware/config.yml
+          echo "HASURA_GRAPHQL_LOG_LEVEL=debug" | tee -a /etc/bigbluebutton/bbb-graphql-server.env
           cat > /etc/bigbluebutton/bbb-conf/apply-config.sh << HERE
           #!/bin/bash
-          
+
           # Pull in the helper functions for configuring BigBlueButton
           source /etc/bigbluebutton/bbb-conf/apply-lib.sh
-          
+
           # Available configuration options
-          
+
           enableHTML5ClientLog
           #enableUFWRules
-          
+
           HERE
           chmod +x /etc/bigbluebutton/bbb-conf/apply-config.sh
           bbb-conf --restart
@@ -358,25 +392,22 @@ jobs:
           EOF
       - name: Install test dependencies
         working-directory: ./bigbluebutton-tests/playwright
+        timeout-minutes: 25
         run: |
           sh -c '
           npm ci
           npx playwright install-deps
           npx playwright install
           '
       - name: Run tests
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 25
-          max_attempts: 2
-          command: |
-            cd ./bigbluebutton-tests/playwright
-            npm run test-chromium-ci -- --shard ${{ env.shard }}
+        working-directory: ./bigbluebutton-tests/playwright
+        timeout-minutes: 25
         env:
           NODE_EXTRA_CA_CERTS: /usr/local/share/ca-certificates/bbb-dev/bbb-dev-ca.crt
           ACTIONS_RUNNER_DEBUG: true
           BBB_URL: https://bbb-ci.test/bigbluebutton/api
           BBB_SECRET: bbbci
+        run: npm run test-chromium-ci -- --shard ${{ env.shard }}
       - name: Run Firefox tests
         working-directory: ./bigbluebutton-tests/playwright
         if: |
@@ -399,6 +430,17 @@ jobs:
         with:
           name: blob-report-${{ matrix.shard }}
           path: bigbluebutton-tests/playwright/blob-report
+      - if: always()
+        name: Generate the shard HTML report from blob report
+        shell: bash
+        working-directory: ./bigbluebutton-tests/playwright
+        run: npx playwright merge-reports --reporter html ./blob-report
+      - if: always()
+        name: Upload shard HTML report to GitHub Actions Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-report_shard-${{ matrix.shard }}
+          path: bigbluebutton-tests/playwright/playwright-report
       - if: failure()
         name: Prepare artifacts (configs and logs)
         run: |
@@ -437,14 +479,14 @@ jobs:
   upload-report:
     if: always() && !contains(github.event.head_commit.message, 'Merge pull request')
     needs: install-and-run-tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     env:
       hasReportData: ${{ needs.install-and-run-tests.result == 'success' || needs.install-and-run-tests.result == 'failure' }}
     steps:
       - uses: actions/checkout@v4
-      - name: Upload blob report
+      - name: Merge and upload the blob reports
         if: ${{ env.hasReportData }}
-        uses: ./.github/actions/upload-blob-report
+        uses: ./.github/actions/merge-and-upload-blob-reports
       - name: Remove unnecessary artifact
         uses: geekyeggo/delete-artifact@v5
         with:

.github/workflows/automated-tests.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Build website
         run: yarn build
       - name: upload build artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           path: ./docs/build
 

.github/workflows/deploy-docs.yml

@@ -12,7 +12,7 @@ stages:
 
 # define which docker image to use for builds
 default:
-  image: bigbluebutton/bbb-build:v3.0.x-release--2024-08-30-014114
+  image: bigbluebutton/bbb-build:v3.0.x-release--2025-03-12-163403
 
 # This stage uses git to find out since when each package has been unmodified.
 # it then checks an API endpoint on the package server to find out for which of

.gitlab-ci.yml

@@ -13,7 +13,7 @@ We designed BigBlueButton for online learning, it can be used for many other app
   * Group collaboration (many-to-many)
   * Online classes (one-to-many)
 
-The latest version is BigBlueButton 2.7.  You can install BigBlueButton 2.6 on Ubuntu 20.04 using [bbb-install.sh](https://github.com/bigbluebutton/bbb-install) within 30 minutes (or your money back 😉).
+The latest version is BigBlueButton 3.0.  You can install BigBlueButton it on Ubuntu 22.04 using [bbb-install.sh](https://github.com/bigbluebutton/bbb-install) within 30 minutes (or your money back 😉).
 
 For full technical documentation of BigBlueButton -- including architecture, features, API, and GreenLight (the default front-end) -- see [https://docs.bigbluebutton.org/](https://docs.bigbluebutton.org/).
 

README.md

@@ -6,14 +6,14 @@ We actively support BigBlueButton through the community forums and through secur
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 2.5.x (or earlier)  | :x:    |
-| 2.6.x   | :white_check_mark: |
+| 2.6.x (or earlier)  | :x:    |
 | 2.7.x   | :white_check_mark: |
-| 3.0.x   | :x: |
+| 3.0.x   | :white_check_mark: |
+| 3.1.x   | :x: |
 
-We have released 2.7 to the community and are going to support both 2.6 and 2.7 together for the coming months (while we're actively developing the next release).  Also, BigBlueButton 2.5 is now end of life.
+We have released 3.0 to the community and are going to support 3.0 for the coming months, while 2.7 will receive BigBlueButton patches until April 2025 when Ubuntu 20.04 will see its community support end.  Also, BigBlueButton 2.6 is now end of life.
 
-As such, we recommend that all administrators deploy 2.7 going forward.  You'll find [many improvements](https://docs.bigbluebutton.org/2.7/new-features) in this newer version.
+As such, we recommend that all administrators deploy 3.0 going forward.  You'll find [many improvements](https://docs.bigbluebutton.org/3.0/new-features) in this newer version.
 
 ## Reporting a Vulnerability
 

SECURITY.md

@@ -18,6 +18,9 @@ trait SystemConfiguration {
   lazy val bbbWebViewerPassword = Try(config.getString("services.viewerPassword")).getOrElse("changeme")
   lazy val keysExpiresInSec = Try(config.getInt("redis.keyExpiry")).getOrElse(14 * 86400) // 14 days
 
+  // Graphql Middleware API url
+  lazy val graphqlMiddlewareAPI = Try(config.getString("services.graphqlMiddlewareAPI")).getOrElse("http://127.0.0.1:8378")
+
   lazy val expireLastUserLeft = Try(config.getInt("expire.lastUserLeft")).getOrElse(60) // 1 minute
   lazy val expireNeverJoined = Try(config.getInt("expire.neverJoined")).getOrElse(5 * 60) // 5 minutes