Add media encryption options.

livekit · Nov 25, 2024 · a880c6a · a880c6a
1 parent 96cae88
commit a880c6a
Show file tree

Hide file tree

Showing 11 changed files with 970 additions and 810 deletions.
diff --git a/livekit/livekit_sip.pb.go b/livekit/livekit_sip.pb.go
diff --git a/livekit/livekit_sip.twirp.go b/livekit/livekit_sip.twirp.go
diff --git a/protobufs/livekit_sip.proto b/protobufs/livekit_sip.proto
@@ -110,6 +110,13 @@ enum SIPTransport {
   SIP_TRANSPORT_TLS = 3;
 }
 
+enum SIPMediaEncryption {
+  SIP_MEDIA_ENCRYPT_WITH_TLS = 0; // require encryption with TLS
+  SIP_MEDIA_ENCRYPT_DISABLE = 1; // do not enable encryption
+  SIP_MEDIA_ENCRYPT_REQUIRE = 2; // require encryption
+  SIP_MEDIA_ENCRYPT_ALLOW = 3; // use encryption if available
+}
+
 message SIPTrunkInfo {
   option deprecated = true;
 
@@ -154,7 +161,8 @@ message SIPTrunkInfo {
   // User-defined metadata for the Trunk.
   string metadata = 12;
 
-  // NEXT ID: 15
+  SIPMediaEncryption media_encryption = 15;
+  // NEXT ID: 16
 }
 
 message CreateSIPInboundTrunkRequest {
@@ -197,6 +205,7 @@ message SIPInboundTrunkInfo {
   google.protobuf.Duration max_call_duration = 12;
 
   bool krisp_enabled = 13;
+  SIPMediaEncryption media_encryption = 14;
 }
 
 message CreateSIPOutboundTrunkRequest {
@@ -421,7 +430,9 @@ message CreateSIPParticipantRequest {
 
   // Enable voice isolation for the callee.
   bool enable_krisp = 14;
-  // NEXT ID: 16
+  SIPMediaEncryption media_encryption = 16;
+
+  // NEXT ID: 17
 }
 
 message SIPParticipantInfo {

diff --git a/protobufs/rpc/io.proto b/protobufs/rpc/io.proto
@@ -177,7 +177,9 @@ message EvaluateSIPDispatchRulesResponse {
   // Max call duration.
   google.protobuf.Duration max_call_duration = 17;
 
-  // NEXT ID: 18
+  livekit.SIPMediaEncryption media_encryption = 18;
+
+  // NEXT ID: 19
 }
 
 message UpdateSIPCallStateRequest {

diff --git a/protobufs/rpc/sip.proto b/protobufs/rpc/sip.proto
@@ -89,7 +89,9 @@ message InternalCreateSIPParticipantRequest {
   // Max call duration.
   google.protobuf.Duration max_call_duration = 24;
 
-  // NEXT ID: 26
+  livekit.SIPMediaEncryption media_encryption = 26;
+
+  // NEXT ID: 27
 }
 
 message InternalCreateSIPParticipantResponse {

diff --git a/rpc/io.pb.go b/rpc/io.pb.go
diff --git a/rpc/io.psrpc.go b/rpc/io.psrpc.go
diff --git a/rpc/sip.go b/rpc/sip.go
@@ -79,5 +79,6 @@ func NewCreateSIPParticipantRequest(
 		EnabledFeatures:       features,
 		RingingTimeout:        req.RingingTimeout,
 		MaxCallDuration:       req.MaxCallDuration,
+		MediaEncryption:       req.MediaEncryption,
 	}, nil
 }
diff --git a/rpc/sip.pb.go b/rpc/sip.pb.go
diff --git a/rpc/sip.psrpc.go b/rpc/sip.psrpc.go
diff --git a/sip/sip.go b/sip/sip.go
@@ -18,13 +18,13 @@ import (
 	"crypto/sha256"
 	"encoding/hex"
 	"fmt"
-	"github.com/twitchtv/twirp"
 	"maps"
 	"math"
 	"net/netip"
 	"sort"
 	"strings"
 
+	"github.com/twitchtv/twirp"
 	"golang.org/x/exp/slices"
 
 	"github.com/livekit/protocol/livekit"
@@ -517,6 +517,7 @@ func EvaluateDispatchRule(projectID string, trunk *livekit.SIPInboundTrunkInfo,
 		resp.HeadersToAttributes = trunk.HeadersToAttributes
 		resp.RingingTimeout = trunk.RingingTimeout
 		resp.MaxCallDuration = trunk.MaxCallDuration
+		resp.MediaEncryption = trunk.MediaEncryption
 		if trunk.KrispEnabled {
 			resp.EnabledFeatures = append(resp.EnabledFeatures, rpc.SIPFeature_KRISP_ENABLED)
 		}