Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
bd9e47e9
Commit
bd9e47e9
authored
6 years ago
by
ThibG
Committed by
Eugen Rochko
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Handle relative URLs when fetching OEmbed/OpenGraph cards (#8669)
parent
25dd5238
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/services/fetch_link_card_service.rb
+10
-8
10 additions, 8 deletions
app/services/fetch_link_card_service.rb
app/services/fetch_oembed_service.rb
+1
-1
1 addition, 1 deletion
app/services/fetch_oembed_service.rb
with
11 additions
and
9 deletions
app/services/fetch_link_card_service.rb
+
10
−
8
View file @
bd9e47e9
...
...
@@ -87,34 +87,36 @@ class FetchLinkCardService < BaseService
end
def
attempt_oembed
embed
=
FetchOEmbedService
.
new
.
call
(
@url
,
html:
@html
)
service
=
FetchOEmbedService
.
new
embed
=
service
.
call
(
@url
,
html:
@html
)
url
=
Addressable
::
URI
.
parse
(
service
.
endpoint_url
)
return
false
if
embed
.
nil?
@card
.
type
=
embed
[
:type
]
@card
.
title
=
embed
[
:title
]
||
''
@card
.
author_name
=
embed
[
:author_name
]
||
''
@card
.
author_url
=
embed
[
:author_url
]
||
''
@card
.
author_url
=
embed
[
:author_url
]
.
present?
?
(
url
+
embed
[
:author_url
]).
to_s
:
''
@card
.
provider_name
=
embed
[
:provider_name
]
||
''
@card
.
provider_url
=
embed
[
:provider_url
]
||
''
@card
.
provider_url
=
embed
[
:provider_url
]
.
present?
?
(
url
+
embed
[
:provider_url
]).
to_s
:
''
@card
.
width
=
0
@card
.
height
=
0
case
@card
.
type
when
'link'
@card
.
image_remote_url
=
embed
[
:thumbnail_url
]
if
embed
[
:thumbnail_url
].
present?
@card
.
image_remote_url
=
(
url
+
embed
[
:thumbnail_url
]
).
to_s
if
embed
[
:thumbnail_url
].
present?
when
'photo'
return
false
if
embed
[
:url
].
blank?
@card
.
embed_url
=
embed
[
:url
]
@card
.
image_remote_url
=
embed
[
:url
]
@card
.
embed_url
=
(
url
+
embed
[
:url
]
).
to_s
@card
.
image_remote_url
=
(
url
+
embed
[
:url
]
).
to_s
@card
.
width
=
embed
[
:width
].
presence
||
0
@card
.
height
=
embed
[
:height
].
presence
||
0
when
'video'
@card
.
width
=
embed
[
:width
].
presence
||
0
@card
.
height
=
embed
[
:height
].
presence
||
0
@card
.
html
=
Formatter
.
instance
.
sanitize
(
embed
[
:html
],
Sanitize
::
Config
::
MASTODON_OEMBED
)
@card
.
image_remote_url
=
embed
[
:thumbnail_url
]
if
embed
[
:thumbnail_url
].
present?
@card
.
image_remote_url
=
(
url
+
embed
[
:thumbnail_url
]
).
to_s
if
embed
[
:thumbnail_url
].
present?
when
'rich'
# Most providers rely on <script> tags, which is a no-no
return
false
...
...
@@ -146,7 +148,7 @@ class FetchLinkCardService < BaseService
@card
.
title
=
meta_property
(
page
,
'og:title'
).
presence
||
page
.
at_xpath
(
'//title'
)
&
.
content
||
''
@card
.
description
=
meta_property
(
page
,
'og:description'
).
presence
||
meta_property
(
page
,
'description'
)
||
''
@card
.
image_remote_url
=
meta_property
(
page
,
'og:image'
)
if
meta_property
(
page
,
'og:image'
)
@card
.
image_remote_url
=
(
Addressable
::
URI
.
parse
(
@url
)
+
meta_property
(
page
,
'og:image'
)
).
to_s
if
meta_property
(
page
,
'og:image'
)
return
if
@card
.
title
.
blank?
&&
@card
.
html
.
blank?
...
...
This diff is collapsed.
Click to expand it.
app/services/fetch_oembed_service.rb
+
1
−
1
View file @
bd9e47e9
...
...
@@ -31,7 +31,7 @@ class FetchOEmbedService
return
if
@endpoint_url
.
blank?
@endpoint_url
=
Addressable
::
URI
.
parse
(
@endpoint_url
).
to_s
@endpoint_url
=
(
Addressable
::
URI
.
parse
(
@url
)
+
@endpoint_url
).
to_s
rescue
Addressable
::
URI
::
InvalidURIError
@endpoint_url
=
nil
end
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment