Skip to content

SUP-50712: if partner has getEnforceHttpsApi then set protocol to https #13713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MaimanaGhnem wants to merge 3 commits into
base: Venus-22.9.0
Choose a base branch
from
+22 −2
Open

SUP-50712: if partner has getEnforceHttpsApi then set protocol to https #13713

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee8aac7
SUP-50712: if partner has getEnforceHttpsApi then set protocol to https
MaimanaGhnem Dec 10, 2025
12acd73
SUP-50712: if partner has getEnforceHttpsApi then set protocol to https
MaimanaGhnem Dec 10, 2025
a9e058a
SUP-50712: if partner has getEnforceHttpsApi then enforce https on as…
MaimanaGhnem Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions alpha/apps/kaltura/lib/kMrssManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,23 @@ public static function getEntryMrss(entry $entry, SimpleXMLElement $mrss = null,
$mrss = self::getEntryMrssXml($entry, $mrss, $mrssParams);
return $mrss->asXML();
}


protected static function enforceHttpsIfRequired($partnerId, $url)
{
try
{
$partner = PartnerPeer::retrieveByPK($partnerId);
if ($partner && $partner->getEnforceHttpsApi())
{
$url = str_replace('http://', 'https://', $url);
Copy link
Collaborator

@MosheMaorKaltura MosheMaorKaltura Dec 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In case the URL contains http:// more than once, better limit it to the first occurance
if (strpos($url, 'http://') === 0)
{
$url = 'https://' . substr($url, 7);
}

}
} catch (Exception $e)
{
KalturaLog::err('Failed to enforce HTTPS for URL: ' . $e->getMessage());
}
return $url;
}

/**
* @param thumbAsset $thumbAsset
* @param SimpleXMLElement $mrss
Expand All @@ -262,11 +278,13 @@ protected static function appendThumbAssetMrss(thumbAsset $thumbAsset, SimpleXML
{
$cdnUrl = $cdnUrlPartners[$thumbAsset->getPartnerId()];
$assetUrl = kAssetUtils::getAssetUrl($thumbAsset, false, null, null, '', $cdnUrl);
$assetUrl = self::enforceHttpsIfRequired($thumbAsset->getPartnerId(),$assetUrl);
Copy link
Collaborator

@MosheMaorKaltura MosheMaorKaltura Dec 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing space after come

$thumbnail->addAttribute('url', $assetUrl);
}
else
{
$assetUrl = kAssetUtils::getAssetUrl($thumbAsset);
$assetUrl = self::enforceHttpsIfRequired($thumbAsset->getPartnerId(),$assetUrl);
Copy link
Collaborator

@MosheMaorKaltura MosheMaorKaltura Dec 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing space after come

$thumbnail->addAttribute('url', !is_null($assetUrl) ? $assetUrl : '');
}
$thumbnail->addAttribute('thumbAssetId', $thumbAsset->getId());
Expand Down Expand Up @@ -477,7 +495,9 @@ public static function getEntryMrssXml(entry $entry, SimpleXMLElement $mrss = nu
$mrss->addChild('status', self::stringToSafeXml($entry->getStatus()));
$mrss->addChild('description', self::stringToSafeXml($entry->getDescription()));
$thumbnailUrl = $mrss->addChild('thumbnailUrl');
$thumbnailUrl->addAttribute('url', $entry->getThumbnailUrl($entry->getThumbnailVersion()));
$url = $entry->getThumbnailUrl($entry->getThumbnailVersion());
$url = self::enforceHttpsIfRequired($entry->getPartnerId(), $url);
$thumbnailUrl->addAttribute('url', $url);
if(trim($entry->getTags(), " \r\n\t"))
{
$tags = $mrss->addChild('tags');
Expand Down