For #1093, Refine HLS encryption wiki

ossrs · Aug 25, 2018 · 1e2cca4 · 1e2cca4
1 parent 37bc0a2
commit 1e2cca4
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 38 deletions.
diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf
@@ -1106,8 +1106,8 @@ vhost hls.srs.com {
         # default: off
         hls_keys        on; 
         # the number of clear ts which one key can encrypt.
-        # default: 10
-        hls_fragments_per_key 10;
+        # default: 5
+        hls_fragments_per_key 5;
         # the hls key file name.
         # we supports some variables to generate the filename.
         #       [vhost], the vhost of stream.
@@ -1120,6 +1120,7 @@ vhost hls.srs.com {
         # ./objs/nginx/html/[app]/[stream]-[seq].key
         hls_key_file_path    ./objs/nginx/html;
         # the key root URL, use this can support https.
+        # @remark It's optional.
         hls_key_url       https://localhost:8080;
 
         # on_hls, never config in here, should config in http_hooks.

diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp
@@ -6308,7 +6308,7 @@ bool SrsConfig::get_hls_keys(string vhost)
 
 int SrsConfig::get_hls_fragments_per_key(string vhost)
 {
-    static int DEFAULT = 10;
+    static int DEFAULT = 5;
 
     SrsConfDirective* conf = get_hls(vhost);
     if (!conf) {

diff --git a/trunk/src/app/srs_app_hls.cpp b/trunk/src/app/srs_app_hls.cpp
@@ -207,7 +207,7 @@ SrsHlsMuxer::SrsHlsMuxer()
     _sequence_no = 0;
     current = NULL;
     hls_keys = false;
-    hls_fragments_per_key = 10;
+    hls_fragments_per_key = 0;
     async = new SrsAsyncCallWorker();
     context = new SrsTsContext();
     segments = new SrsFragmentWindow();
@@ -325,10 +325,9 @@ srs_error_t SrsHlsMuxer::update_config(SrsRequest* r, string entry_prefix,
     }
 
     if (hls_keys && (hls_path != hls_key_file_path)) {
-        string key_file = hls_key_file;
-        key_file = srs_path_build_stream(key_file, req->vhost, req->app, req->stream);
-
-        string key_dir = srs_path_dirname(hls_key_file_path + "/" + key_file);
+        string key_file = srs_path_build_stream(hls_key_file, req->vhost, req->app, req->stream);
+        string key_url = hls_key_file_path + "/" + key_file;
+        string key_dir = srs_path_dirname(key_url);
         if ((err = srs_create_dir_recursively(key_dir)) != srs_success) {
             return srs_error_wrap(err, "create dir");
         }
@@ -665,36 +664,28 @@ srs_error_t SrsHlsMuxer::write_hls_key()
 
 #ifdef SRS_AUTO_SSL
     if (hls_keys && current->sequence_no % hls_fragments_per_key == 0) {
-        string key_file = hls_key_file;
-        key_file = srs_path_build_stream(key_file, req->vhost, req->app, req->stream);
-
-        if (true) {
-            std::stringstream ss;
-            ss << current->sequence_no;
-            key_file = srs_string_replace(key_file, "[seq]", ss.str());
-        }
-
-        string key_full_path = hls_key_file_path + "/" + key_file;
-
         if (RAND_bytes(key, 16) < 0) {
-            srs_error_wrap(err, "rand key failed.");
+            return srs_error_wrap(err, "rand key failed.");
         }
-
         if (RAND_bytes(iv, 16) < 0) {
-            srs_error_wrap(err, "rand iv failed.");
+            return srs_error_wrap(err, "rand iv failed.");
         }
 
-        SrsFileWriter fw;
+        string key_file = srs_path_build_stream(hls_key_file, req->vhost, req->app, req->stream);
+        key_file = srs_string_replace(key_file, "[seq]", srs_int2str(current->sequence_no));
+        string key_url = hls_key_file_path + "/" + key_file;
 
-        if ((err = fw.open(key_full_path)) != srs_success) {
-            return srs_error_wrap(err, "open file %s", key_full_path.c_str());
+        SrsFileWriter fw;
+        if ((err = fw.open(key_url)) != srs_success) {
+            return srs_error_wrap(err, "open file %s", key_url.c_str());
         }
 
-        if ((err = fw.write(key, 16, NULL)) != srs_success) {
+        err = fw.write(key, 16, NULL);
+        fw.close();
+
+        if (err != srs_success) {
             return srs_error_wrap(err, "write key");
         }
-
-        fw.close();
     }
 
     if (hls_keys) {
@@ -784,21 +775,24 @@ srs_error_t SrsHlsMuxer::_refresh_m3u8(string m3u8_file)
             ss << "#EXT-X-DISCONTINUITY" << SRS_CONSTS_LF;
         }
 
-        if(hls_keys && (segment->sequence_no%hls_fragments_per_key == 0))
-        {
-            string filename = req->stream+"-"+srs_int2str(segment->sequence_no)+".key";
+#ifdef SRS_AUTO_SSL
+        if(hls_keys && ((segment->sequence_no % hls_fragments_per_key) == 0)) {
             char hexiv[33];
-            srs_data_to_hex(hexiv,segment->iv,16);
+            srs_data_to_hex(hexiv, segment->iv, 16);
             hexiv[32] = '\0';
-            string key_path;
+
+            string key_file = srs_path_build_stream(hls_key_file, req->vhost, req->app, req->stream);
+            key_file = srs_string_replace(key_file, "[seq]", srs_int2str(segment->sequence_no));
+
+            string key_path = key_file;
             //if key_url is not set,only use the file name
-            if(hls_key_url == hls_key_file_path){
-                key_path = filename;
-            }else{
-                key_path = hls_key_url+"/"+filename;
+            if (!hls_key_url.empty()) {
+                key_path = hls_key_url + key_file;
             }
-            ss << "#EXT-X-KEY:METHOD=AES-128,URI=" << "\""<< key_path <<"\",IV=0x"<<hexiv<< SRS_CONSTS_LF;
+
+            ss << "#EXT-X-KEY:METHOD=AES-128,URI=" << "\"" << key_path << "\",IV=0x" << hexiv << SRS_CONSTS_LF;
         }
+#endif
 
         // "#EXTINF:4294967295.208,\n"
         ss.precision(3);