Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pleroma
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
Container registry
Model registry
Operate
Environments
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
jeff
pleroma
Commits
dafb6f0b
Commit
dafb6f0b
authored
6 years ago
by
kaniini
Browse files
Options
Downloads
Patches
Plain Diff
rich media: parser: reject OGP fields we cannot safely process
parent
bd89cdbe
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/pleroma/web/rich_media/parser.ex
+23
-3
23 additions, 3 deletions
lib/pleroma/web/rich_media/parser.ex
with
23 additions
and
3 deletions
lib/pleroma/web/rich_media/parser.ex
+
23
−
3
View file @
dafb6f0b
...
...
@@ -30,7 +30,7 @@ defmodule Pleroma.Web.RichMedia.Parser do
try
do
{
:ok
,
%
Tesla
.
Env
{
body:
html
}}
=
Pleroma
.
HTTP
.
get
(
url
,
[],
adapter:
[
pool:
:media
])
html
|>
maybe_parse
()
|>
get
_parsed_data
()
html
|>
maybe_parse
()
|>
clean_parsed_data
()
|>
check
_parsed_data
()
rescue
e
->
{
:error
,
"Parsing error:
#{
inspect
(
e
)
}
"
}
...
...
@@ -46,11 +46,31 @@ defmodule Pleroma.Web.RichMedia.Parser do
end
)
end
defp
get
_parsed_data
(%{
title:
title
}
=
data
)
when
is_binary
(
title
)
and
byte_size
(
title
)
>
0
do
defp
check
_parsed_data
(%{
title:
title
}
=
data
)
when
is_binary
(
title
)
and
byte_size
(
title
)
>
0
do
{
:ok
,
data
}
end
defp
get
_parsed_data
(
data
)
do
defp
check
_parsed_data
(
data
)
do
{
:error
,
"Found metadata was invalid or incomplete:
#{
inspect
(
data
)
}
"
}
end
defp
string_is_valid_unicode
(
data
)
do
data
|>
:unicode
.
characters_to_binary
()
|>
clean_string
()
end
defp
clean_string
({
:error
,
_
,
_
}),
do
:
{
:error
,
"Invalid data"
}
defp
clean_string
(
data
),
do
:
{
:ok
,
data
}
defp
clean_parsed_data
(
data
)
do
data
|>
Enum
.
reject
(
fn
{
_
,
val
}
->
case
string_is_valid_unicode
(
val
)
do
{
:ok
,
_
}
->
false
_
->
true
end
end
)
|>
Map
.
new
()
end
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