Fixed reinvite null ref bug and updated webrtc projecct wtih vuln pac…

…kages. (#1234)
sipsorcery-org · Nov 19, 2024 · bbf0867 · bbf0867
1 parent 6245311
commit bbf0867
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/examples/SIPExamples/UserAgentClient/Program.cs b/examples/SIPExamples/UserAgentClient/Program.cs
@@ -52,7 +52,7 @@ static void Main(string[] args)
             bool isCallHungup = false;
             bool hasCallFailed = false;
 
-            Log = AddConsoleLogger(LogEventLevel.Verbose);
+            Log = AddConsoleLogger(LogEventLevel.Debug);
 
             SIPURI callUri = SIPURI.ParseSIPURI(DEFAULT_DESTINATION_SIP_URI);
             if (args?.Length > 0)

diff --git a/examples/WebRTCExamples/WebRTCAspNetMvc/WebRTCAspNet.csproj b/examples/WebRTCExamples/WebRTCAspNetMvc/WebRTCAspNet.csproj
@@ -5,10 +5,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
   </ItemGroup>
 
     <ItemGroup>

diff --git a/examples/WebRTCExamples/WebRTCDaemon/WebRTCDaemon.csproj b/examples/WebRTCExamples/WebRTCDaemon/WebRTCDaemon.csproj
@@ -23,6 +23,7 @@
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.9" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="4.1.2" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />

diff --git a/src/app/SIPUserAgents/SIPUserAgent.cs b/src/app/SIPUserAgents/SIPUserAgent.cs
@@ -1007,19 +1007,31 @@ private async Task DialogRequestReceivedAsync(SIPRequest sipRequest)
 
                 try
                 {
-                    SDP offer = SDP.ParseSDPDescription(sipRequest.Body);
+                    SDP offer = !string.IsNullOrWhiteSpace(sipRequest.Body) ? SDP.ParseSDPDescription(sipRequest.Body) : null;
 
                     if (sipRequest.Header.CallId == _oldCallID)
                     {
                         // A transfer is in progress and this re-INVITE belongs to the original call. More than likely
                         // the purpose of the request is to place us on hold. We'll respond with OK but not update any local state.
                         var answerSdp = MediaSession.CreateAnswer(null);
-                        var okResponse = reInviteTransaction.GetOkResponse(SDP.SDP_MIME_CONTENTTYPE, answerSdp.ToString());
-                        reInviteTransaction.SendFinalResponse(okResponse);
+
+                        if (answerSdp != null)
+                        {
+                            var okResponse = reInviteTransaction.GetOkResponse(SDP.SDP_MIME_CONTENTTYPE, answerSdp.ToString());
+                            reInviteTransaction.SendFinalResponse(okResponse);
+                        }
+                        else
+                        {
+                            logger.LogWarning("Unable to create an answer for the re-INVITE request.");
+                            var notAcceptableResponse = SIPResponse.GetResponse(sipRequest, SIPResponseStatusCodesEnum.NotAcceptable, "Unable to create an answer.");
+                            reInviteTransaction.SendFinalResponse(notAcceptableResponse);
+                        }
                     }
                     else
                     {
-                        var setRemoteResult = MediaSession.SetRemoteDescription(SdpType.offer, offer);
+                        // TODO: We should accept an empty re-INVITE body and send a new offer in the response. The remote peer can then send
+                        // back teh SDP answer in the ACK.
+                        var setRemoteResult = offer != null ?  MediaSession.SetRemoteDescription(SdpType.offer, offer) : SetDescriptionResultEnum.Error;
 
                         if (setRemoteResult != SetDescriptionResultEnum.OK)
                         {