summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@gitlab.com>2018-10-01 16:47:16 +0000
committerBob Van Landuyt <bob@gitlab.com>2018-10-01 16:47:16 +0000
commit1735088e7c5bf62a8f896a2b0e384964de83d118 (patch)
treeaba06cb9e7f8df96aed72dfddc2edd8750026e0c /spec
parentb93f1d3cf8d5325c9fc9283afacfca069ddc3d62 (diff)
parent3bd607f280b70bdc7c574a4c217168adb1a88ecd (diff)
downloadgitlab-ce-1735088e7c5bf62a8f896a2b0e384964de83d118.tar.gz
Merge branch 'security-package-json-xss' into 'master'
[master] Fix XSS vulnerability sourced from package.json's homepage Closes #2702 See merge request gitlab/gitlabhq!2496
Diffstat (limited to 'spec')
-rw-r--r--spec/models/blob_viewer/package_json_spec.rb21
1 files changed, 17 insertions, 4 deletions
diff --git a/spec/models/blob_viewer/package_json_spec.rb b/spec/models/blob_viewer/package_json_spec.rb
index 5ed2f4400bc..fbaa8d47a71 100644
--- a/spec/models/blob_viewer/package_json_spec.rb
+++ b/spec/models/blob_viewer/package_json_spec.rb
@@ -40,13 +40,14 @@ describe BlobViewer::PackageJson do
end
context 'when package.json has "private": true' do
+ let(:homepage) { 'http://example.com' }
let(:data) do
<<-SPEC.strip_heredoc
{
"name": "module-name",
"version": "10.3.1",
"private": true,
- "homepage": "myawesomepackage.com"
+ "homepage": #{homepage.to_json}
}
SPEC
end
@@ -54,10 +55,22 @@ describe BlobViewer::PackageJson do
subject { described_class.new(blob) }
describe '#package_url' do
- it 'returns homepage if any' do
- expect(subject).to receive(:prepare!)
+ context 'when the homepage has a valid URL' do
+ it 'returns homepage URL' do
+ expect(subject).to receive(:prepare!)
+
+ expect(subject.package_url).to eq(homepage)
+ end
+ end
+
+ context 'when the homepage has an invalid URL' do
+ let(:homepage) { 'javascript:alert()' }
+
+ it 'returns nil' do
+ expect(subject).to receive(:prepare!)
- expect(subject.package_url).to eq('myawesomepackage.com')
+ expect(subject.package_url).to be_nil
+ end
end
end