Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
D
diaspora
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
diasporg
diaspora
Commits
32cd7647
Unverified
Commit
32cd7647
authored
Nov 08, 2018
by
Benjamin Neff
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix XSS via OpenGraph on mobile
parent
f23791b7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
43 deletions
+28
-43
Changelog.md
Changelog.md
+4
-0
app/helpers/open_graph_helper.rb
app/helpers/open_graph_helper.rb
+0
-10
app/views/status_messages/_status_message.mobile.haml
app/views/status_messages/_status_message.mobile.haml
+7
-1
spec/helpers/open_graph_helper_spec.rb
spec/helpers/open_graph_helper_spec.rb
+0
-32
spec/views/status_messages/_status_message.mobile.haml_spec.rb
...views/status_messages/_status_message.mobile.haml_spec.rb
+17
-0
No files found.
Changelog.md
View file @
32cd7647
# 0.7.7.1
Fixes a potential cross-site scripting issue with maliciously crafted OpenGraph metadata on the mobile interface.
# 0.7.7.0
## Refactor
...
...
app/helpers/open_graph_helper.rb
View file @
32cd7647
# frozen_string_literal: true
module
OpenGraphHelper
def
og_html
(
cache
)
"<a href=
\"
#{
cache
.
url
}
\"
target=
\"
_blank
\"
>"
+
" <div>"
+
" <img src=
\"
#{
cache
.
image
}
\"
/>"
+
" <strong>
#{
cache
.
title
}
</strong>"
+
" <p>
#{
truncate
(
cache
.
description
,
length:
250
,
separator:
' '
)
}
</p>"
+
" </div>"
+
"</a>"
end
def
link_to_oembed_image
(
cache
,
prefix
=
'thumbnail_'
)
link_to
(
oembed_image_tag
(
cache
,
prefix
),
cache
.
url
,
:target
=>
'_blank'
)
end
...
...
app/views/status_messages/_status_message.mobile.haml
View file @
32cd7647
...
...
@@ -20,4 +20,10 @@
!=
o_embed_html
post
.
o_embed_cache
-
if
post
.
open_graph_cache
.opengraph
!=
og_html
post
.
open_graph_cache
%a
{
href:
post
.
open_graph_cache
.
url
,
target:
"_blank"
}
%div
=
image_tag
post
.
open_graph_cache
.
image
%strong
=
post
.
open_graph_cache
.
title
%p
=
truncate
(
post
.
open_graph_cache
.
description
,
length:
250
,
separator:
" "
)
spec/helpers/open_graph_helper_spec.rb
deleted
100644 → 0
View file @
f23791b7
# frozen_string_literal: true
describe
OpenGraphHelper
,
:type
=>
:helper
do
describe
'og_html'
do
scenarios
=
{
"article"
=>
{
"url"
=>
"http://opengraph-enabled-site.com/articles/1332-scientists-discover-new-planet"
,
"image"
=>
"http://opengraph-enabled-site.com/images/1332-lead.jpg"
,
"title"
=>
"Scientists discover new planet"
,
"description"
=>
"A new planet was found yesterday"
},
}
scenarios
.
each
do
|
type
,
data
|
specify
'for type "'
+
type
+
'"'
do
cache
=
OpenGraphCache
.
new
(
:url
=>
data
[
'url'
])
cache
.
ob_type
=
type
cache
.
image
=
data
[
'image'
]
cache
.
title
=
data
[
'title'
]
cache
.
description
=
data
[
'description'
]
formatted
=
og_html
(
cache
)
expect
(
formatted
).
to
match
(
/
#{
data
[
'url'
]
}
/
)
expect
(
formatted
).
to
match
(
/
#{
data
[
'title'
]
}
/
)
expect
(
formatted
).
to
match
(
/
#{
data
[
'image'
]
}
/
)
expect
(
formatted
).
to
match
(
/
#{
data
[
'description'
]
}
/
)
end
end
end
end
spec/views/status_messages/_status_message.mobile.haml_spec.rb
0 → 100644
View file @
32cd7647
# frozen_string_literal: true
describe
"status_messages/_status_message.mobile.haml"
do
it
"escapes the OpenGraph metadata"
do
open_graph_cache
=
OpenGraphCache
.
new
(
url:
"<script>alert(0);</script>"
,
title:
"<script>alert(0);</script>"
,
image:
"https://example.org/
\"
><script>alert(0);</script>"
,
description:
"<script>alert(0);</script>"
)
post
=
FactoryGirl
.
create
(
:status_message
,
public:
true
,
open_graph_cache:
open_graph_cache
)
render
file:
"status_messages/_status_message.mobile.haml"
,
locals:
{
post:
post
,
photos:
post
.
photos
}
expect
(
rendered
).
to_not
include
(
"<script>"
)
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment