Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set owasp score to 7, change default value of sendAudioLevelToViewers #6462

Merged
merged 3 commits into from
Jul 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions owasp-suppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,14 @@
<packageUrl regex="true">^pkg:maven/org\.bytedeco/(ffmpeg|cuda).*@.*$</packageUrl>
<cve>CVE-2023-34112</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: ffmpeg-5.1.2-1.5.8.jar,ffmpeg-platform-5.1.2-1.5.8.jar, ffmpeg-5.1.2-1.5.8-linux-x86.jar
This vulnerability is about using mpegvideoencoder. We don't use mpegvideo encoder in our end
]]></notes>
<packageUrl regex="true">^pkg:maven/org\.bytedeco/(ffmpeg|cuda).*@.*$</packageUrl>
<cve>CVE-2024-32230</cve>
</suppress>


</suppressions>
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
<artifactId>dependency-check-maven</artifactId>
<version>${owasp.version}</version>
<configuration>
<failBuildOnCVSS>8</failBuildOnCVSS>
<failBuildOnCVSS>7</failBuildOnCVSS>
<suppressionFile>owasp-suppressions.xml</suppressionFile>
</configuration>
<executions>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/antmedia/AppSettings.java
Original file line number Diff line number Diff line change
Expand Up @@ -2061,8 +2061,8 @@ public boolean isWriteStatsToDatastore() {
*
* Ant Media Server sends audio level 5 times in a second
*/
@Value("${sendAudioLevelToViewers:true}")
private boolean sendAudioLevelToViewers = true;
@Value("${sendAudioLevelToViewers:false}")
private boolean sendAudioLevelToViewers = false;

/**
* Enable/disable video frame scaling in GPU when there is an adaptive bitrate
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/io/antmedia/datastore/db/types/Broadcast.java
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,12 @@ public Broadcast() {
@Schema(description ="If this broadcast is a track of a WebRTC stream. This variable is Id of that stream.")
private String mainTrackStreamId;

/*
* Refactor: remove this field and store everything as streams in the database.
* On the other hand, we can keep the number of subtracks here
*
* Lastly, there is also an dependency in the webpanel, it just plays the multitrack by looking at this field.
*/
@Schema(description ="If this broadcast is main track. This variable hold sub track ids.")
private List<String> subTrackStreamIds = new ArrayList<>();

Expand Down
6 changes: 6 additions & 0 deletions src/main/server/webapps/root/images/icons/mute-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/main/server/webapps/root/images/icons/readme
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The icons(mute-icon, speaker-icon) are being used in multitrack-play.html
7 changes: 7 additions & 0 deletions src/main/server/webapps/root/images/icons/speaker-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/test/java/io/antmedia/test/AppSettingsUnitTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ public void testUnsetAppSettings(AppSettings appSettings) {
assertEquals(150, appSettings.getAbrUpScaleRTTMs(), 0.0001);
assertNotNull(appSettings.getClusterCommunicationKey());
assertEquals(false, appSettings.isId3TagEnabled());
assertEquals(true, appSettings.isSendAudioLevelToViewers());
assertEquals(false, appSettings.isSendAudioLevelToViewers());
assertNull(appSettings.getTimeTokenSecretForPublish());
assertNull(appSettings.getTimeTokenSecretForPlay());

Expand Down
Loading