Browse Source

[kaltura] Add explicit port to regexes
They should not match e.g. cdnapi.kaltura.computernetworks.com/...

Sergey M․ 8 years ago
parent
commit
ff24261ba0
1 changed files with 6 additions and 2 deletions
  1. 6 2
      youtube_dl/extractor/kaltura.py

+ 6 - 2
youtube_dl/extractor/kaltura.py

@@ -23,7 +23,7 @@ class KalturaIE(InfoExtractor):
                 (?:
                 (?:
                     kaltura:(?P<partner_id>\d+):(?P<id>[0-9a-z_]+)|
                     kaltura:(?P<partner_id>\d+):(?P<id>[0-9a-z_]+)|
                     https?://
                     https?://
-                        (:?(?:www|cdnapi(?:sec)?)\.)?kaltura\.com/
+                        (:?(?:www|cdnapi(?:sec)?)\.)?kaltura\.com(?::\d+)?/
                         (?:
                         (?:
                             (?:
                             (?:
                                 # flash player
                                 # flash player
@@ -98,6 +98,10 @@ class KalturaIE(InfoExtractor):
         {
         {
             'url': 'https://www.kaltura.com/index.php/extwidget/preview/partner_id/1770401/uiconf_id/37307382/entry_id/0_58u8kme7/embed/iframe?&flashvars[streamerType]=auto',
             'url': 'https://www.kaltura.com/index.php/extwidget/preview/partner_id/1770401/uiconf_id/37307382/entry_id/0_58u8kme7/embed/iframe?&flashvars[streamerType]=auto',
             'only_matching': True,
             'only_matching': True,
+        },
+        {
+            'url': 'https://www.kaltura.com:443/index.php/extwidget/preview/partner_id/1770401/uiconf_id/37307382/entry_id/0_58u8kme7/embed/iframe?&flashvars[streamerType]=auto',
+            'only_matching': True,
         }
         }
     ]
     ]
 
 
@@ -116,7 +120,7 @@ class KalturaIE(InfoExtractor):
             re.search(
             re.search(
                 r'''(?xs)
                 r'''(?xs)
                     (?P<q1>["\'])
                     (?P<q1>["\'])
-                        (?:https?:)?//cdnapi(?:sec)?\.kaltura\.com(?:(?!(?P=q1)).)*/(?:p|partner_id)/(?P<partner_id>\d+)(?:(?!(?P=q1)).)*
+                        (?:https?:)?//cdnapi(?:sec)?\.kaltura\.com(?::\d+)?/(?:(?!(?P=q1)).)*\b(?:p|partner_id)/(?P<partner_id>\d+)(?:(?!(?P=q1)).)*
                     (?P=q1).*?
                     (?P=q1).*?
                     (?:
                     (?:
                         entry_?[Ii]d|
                         entry_?[Ii]d|