Skip to content

Regression: Fix oembed #19978

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

Merged
sampaiodiego merged 1 commit into from
Dec 28, 2020
Merged

Regression: Fix oembed #19978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/oembed/client/oembedFrameWidget.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
{{#if meta.oembedDescription}}
<p>{{meta.oembedDescription}}</p>
{{/if}}
<iframe sandbox="allow-scripts" srcdoc={{meta.oembedHtml}}></iframe>
{{{meta.oembedHtml}}}
{{/unless}}
</blockquote>
{{/if}}
Expand Down
67 changes: 44 additions & 23 deletions app/oembed/server/providers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,31 +101,52 @@ callbacks.add('oembed:beforeGetUrlContent', function(data) {
return data;
}, callbacks.priority.MEDIUM, 'oembed-providers-before');

const cleanupOembed = (data) => {
if (!data?.meta) {
return data;
}

// remove oembedHtml key from original meta
const { oembedHtml, ...meta } = data.meta;

return {
...data,
meta,
};
};

callbacks.add('oembed:afterParseContent', function(data) {
if (data.parsedUrl && data.parsedUrl.query) {
let queryString = data.parsedUrl.query;
if (_.isString(data.parsedUrl.query)) {
queryString = QueryString.parse(data.parsedUrl.query);
}
if (queryString.url != null) {
const { url } = queryString;
const provider = providers.getProviderForUrl(url);
if (provider != null) {
if (data.content && data.content.body) {
try {
const metas = JSON.parse(data.content.body);
_.each(metas, function(value, key) {
if (_.isString(value)) {
data.meta[camelCase(`oembed_${ key }`)] = value;
}
});
data.meta.oembedUrl = url;
} catch (error) {
console.log(error);
}
}
if (!data || !data.url || !data.content?.body || !data.parsedUrl?.query) {
return cleanupOembed(data);
}

let queryString = data.parsedUrl.query;
if (_.isString(data.parsedUrl.query)) {
queryString = QueryString.parse(data.parsedUrl.query);
}

if (!queryString.url) {
return cleanupOembed(data);
}

const { url: originalUrl } = data;
const provider = providers.getProviderForUrl(originalUrl);
if (!provider) {
return cleanupOembed(data);
}

const { url } = queryString;
data.meta.oembedUrl = url;

try {
const metas = JSON.parse(data.content.body);
_.each(metas, function(value, key) {
if (_.isString(value)) {
data.meta[camelCase(`oembed_${ key }`)] = value;
}
}
});
} catch (error) {
console.log(error);
}
return data;
}, callbacks.priority.MEDIUM, 'oembed-providers-after');
18 changes: 8 additions & 10 deletions app/oembed/server/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const toUtf8 = function(contentType, body) {
return iconv.decode(body, getCharset(contentType, body));
};

const getUrlContent = function(urlObj, redirectCount = 5, callback) {
const getUrlContent = Meteor.wrapAsync(function(urlObj, redirectCount = 5, callback) {
if (_.isString(urlObj)) {
urlObj = URL.parse(urlObj);
}
Expand Down Expand Up @@ -142,10 +142,9 @@ const getUrlContent = function(urlObj, redirectCount = 5, callback) {
return stream.on('error', function(err) {
error = err;
});
};
});

OEmbed.getUrlMeta = function(url, withFragment) {
const getUrlContentSync = Meteor.wrapAsync(getUrlContent);
const urlObj = URL.parse(url);
if (withFragment != null) {
const queryStringObj = querystring.parse(urlObj.query);
Expand All @@ -158,7 +157,7 @@ OEmbed.getUrlMeta = function(url, withFragment) {
}
urlObj.path = path;
}
const content = getUrlContentSync(urlObj, 5);
const content = getUrlContent(urlObj, 5);
if (!content) {
return;
}
Expand Down Expand Up @@ -190,28 +189,27 @@ OEmbed.getUrlMeta = function(url, withFragment) {
if (metas.fragment === '!' && (withFragment == null)) {
return OEmbed.getUrlMeta(url, true);
}
delete metas.oembedHtml;
}
let headers = undefined;
let data = undefined;


if (content && content.headers) {
if (content?.headers) {
headers = {};
const headerObj = content.headers;
Object.keys(headerObj).forEach((header) => {
headers[camelCase(header)] = headerObj[header];
});
}
if (content && content.statusCode !== 200) {
return data;
return;
}
data = callbacks.run('oembed:afterParseContent', {
return callbacks.run('oembed:afterParseContent', {
url,
meta: metas,
headers,
parsedUrl: content.parsedUrl,
content,
});
return data;
};

OEmbed.getUrlMetaWithCache = function(url, withFragment) {
Expand Down