mediaserver: Add stream keys for RTMP.

server/mediaserver.go

@@ -5,6 +5,7 @@ package server
 
 import (
 	"context"
+	"encoding/hex"
 	"errors"
 	"fmt"
 	"math/big"
@@ -46,6 +47,7 @@ var ErrUnknownStream = errors.New("ErrUnknownStream")
 const HLSWaitInterval = time.Second
 const HLSBufferCap = uint(43200) //12 hrs assuming 1s segment
 const HLSBufferWindow = uint(5)
+const StreamKeyBytes = 6
 
 const SegLen = 4 * time.Second
 const BroadcastRetry = 15 * time.Second
@@ -167,7 +169,8 @@ func createRTMPStreamIDHandler(s *LivepeerServer) func(url *url.URL) (strmID str
 		}
 
 		// Generate RTMP part of StreamID
-		id, err := core.MakeStreamID(vid, "RTMP")
+		key := hex.EncodeToString(core.RandomIdGenerator(StreamKeyBytes))
+		id, err := core.MakeStreamID(vid, key)
 		if err != nil {
 			glog.Errorf("Error making stream ID")
 			return ""

server/mediaserver_test.go

@@ -2,8 +2,10 @@ package server
 
 import (
 	"context"
+	"encoding/hex"
 	"fmt"
 	"math/big"
+	"math/rand"
 	"net/url"
 	"sync"
 	"testing"
@@ -112,12 +114,16 @@ func TestCreateRTMPStreamHandler(t *testing.T) {
 	endHandler := endRTMPStreamHandler(s)
 
 	// Test hlsStreamID query param
-	expectedSid, _ := core.MakeStreamID(core.RandomVideoID(), "RTMP")
+	rand.Seed(123)
+	key := hex.EncodeToString(core.RandomIdGenerator(StreamKeyBytes))
+	expectedSid, _ := core.MakeStreamID(core.RandomVideoID(), key)
+	rand.Seed(123)
 	u, _ := url.Parse("rtmp://localhost?hlsStrmID=" + expectedSid.String())
 	if sid := createSid(u); sid != expectedSid.String() {
 		t.Error("Unexpected streamid")
 	}
 	// Test normal case
+	rand.Seed(123)
 	u, _ = url.Parse("rtmp://localhost")
 	st := stream.NewBasicRTMPVideoStream(createSid(u))
 	if st.GetStreamID() == "" {
@@ -128,14 +134,15 @@ func TestCreateRTMPStreamHandler(t *testing.T) {
 		t.Error("Handler failed ", err)
 	}
 	// Test collisions via stream reuse
-	u, _ = url.Parse("rtmp://localhost?hlsStrmID=" + st.GetStreamID())
+	rand.Seed(123)
 	if sid := createSid(u); sid != "" {
 		t.Error("Expected failure due to naming collision")
 	}
 	// Ensure the stream ID is reusable after the stream ends
 	if err := endHandler(u, st); err != nil {
 		t.Error("Could not clean up stream")
 	}
+	rand.Seed(123)
 	if sid := createSid(u); sid != st.GetStreamID() {
 		t.Error("Mismatched streamid during stream reuse")
 	}