add secure link token

kaltura · Sep 15, 2016 · 779b960 · 779b960
1 parent a2ca22b
commit 779b960
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/packager/config/nginx.conf.live.bootstrap.template b/packager/config/nginx.conf.live.bootstrap.template
@@ -11,7 +11,7 @@ if ($playlist = '') {
 alias @CONTENT_DIR@/$entryId/$playlist;
 
 
-add_header X-DEBUG-HEADER "entryId=$entryId; token=$token; key=$tokenKey; host=$host";
+add_header X-DEBUG-HEADER "entryId=$entryId; token=$token; key=$scheme://$http_host$tokenKey; host=$host; secure_link=$secure_link";
 
 #if ($secure_link = "") {
 #    return 403 "Incorrect Url provided";

diff --git a/packager/config/nginx.conf.template b/packager/config/nginx.conf.template
@@ -73,25 +73,25 @@ http {
             return 200 "Kaltura";
         }
 
-        location ~ ^/live/(?<tokenKey>.*/p/\d+/entryId/(?<entryId>[^/]+)(/playlist/(?<playlist>[^/]+))?)(/token/(?<token>[^/]+))?/ {
+        location ~ ^(?<tokenKey>/(scf|s/)?.*/\d+/entryId/(?<entryId>[^/]+)(/playlist/(?<playlist>[^/]+))?)(/token/(?<token>[^/]+))?/ {
 
-            #secure_link $token;
-            #secure_link_md5 "KKK $http_host $tokenKey";
+            secure_link $token;
+            secure_link_md5 "test $scheme://$http_host$tokenKey";
 
-            location ~ ^/live/hls/ {
+            location ~ /live/hls/ {
                 include nginx.conf.live.bootstrap;
                 vod hls;
             }
 
-            location ~ ^/live/enc/hls/ {
+            location ~ /live/enc/hls/ {
                 include nginx.conf.live.bootstrap;
                 vod hls;
                 vod_secret_key "jKsf!hAuaJak $vod_suburi";
                 vod_hls_encryption_method aes-128;
             }
 
 
-            location ~ ^/live/hds/ {
+            location ~ /live/hds/ {
                 include nginx.conf.live.bootstrap;
                 vod hds;
             }