Commit Graph
24056 Commits
Author SHA1 Message Date
Tomasz Maczukin 4fc8c0d906 Update VERSION to 8.5.13 v8.5.13 2016-06-15 03:15:37 +02:00
Tomasz Maczukin da8a764b53 Update CHANGELOG for 8.5.13 2016-06-14 19:46:24 +02:00
Robert SpeicherandTomasz Maczukin 6de76857d1 Merge branch '17298-wiki-xss' into 'master'
Forbid scripting for wiki files

Wiki files (not pages - files in the repo) are just sent to the browser
with whatever content-type the mime_types gem assigns to them based on
their extension. As this is from the same domain as the GitLab
application, this is an XSS vulnerability.

Set a CSP forbidding all sources for scripting, CSS, XHR, etc. on these
files.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17298.

See merge request !1969
2016-06-14 19:45:24 +02:00
Douwe MaanandTomasz Maczukin 18968821dd Merge branch 'fix/unauthorized-access-to-build-data' into 'master'
Remove 'unscoped' from project builds selection

This is a fix for this security bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/18188

/cc @kamil @grzegorz @stanhu

See merge request !1968
2016-06-14 19:45:11 +02:00
Robert Speicher aba6bae46d Update VERSION to 8.5.12 v8.5.12 2016-04-27 14:23:53 -04:00
Robert Speicher 8e00d01072 Update CHANGELOG for 8.5.12
[ci skip]
2016-04-26 17:57:27 -04:00
Robert SpeicherandRobert Speicher 0f295530fe Merge branch 'rs-notes-privilege-escalation' into 'master'
Prevent privilege escalation via notes API

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15577

See merge request !1964
2016-04-26 16:20:54 -04:00
Douwe Maan cd107220c9 Fix dumb specs 2016-04-26 18:12:42 +02:00
Douwe Maan 4375b65f88 Use sequence in label factory to get around uniqueness error 2016-04-26 17:31:19 +02:00
Douwe Maan f65a4af397 Update changelog 2016-04-26 17:20:34 +02:00
Douwe Maan d8e6386b64 Revert "Merge branch '15579-filter-milestone-confidential-issues-api' into 'master'"
This reverts commit 550f9a740c.
2016-04-26 17:20:26 +02:00
Rémy Coutable 9c3df5cf52 Remove wrong CHANGELOG item
[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-26 10:41:36 +02:00
Rémy CoutableandRémy Coutable 446f886651 Merge branch 'fix-project-hook-delete-permissions' into 'master'
Prevent users from deleting Webhooks via API they do not own

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15576

See merge request !1959

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-26 10:34:49 +02:00
Robert SpeicherandRémy Coutable 3b72afe0e1 Merge branch '15437-fix-xss-in-issue-tracker-service' into 'master'
Prevent XSS via custom issue tracker URL

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15437

See merge request !1955

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-26 10:33:42 +02:00
Robert SpeicherandRobert Speicher d9114c1516 Merge branch '15579-filter-milestone-confidential-issues-api' into 'master'
Prevent information disclosure via milestone API

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15579

See merge request !1961
2016-04-25 20:40:22 -04:00
Robert SpeicherandRobert Speicher b6b7bb530b Merge branch '15591-fix-project-leak-in-new-mr-view' into 'master'
Prevent information disclosure via new merge request page

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15591.

See merge request !1963
2016-04-25 17:14:07 -04:00
Robert SpeicherandRobert Speicher 017f87e8cd Merge branch 'fix-impersonation-issue' into 'master'
Prevent privilege escalation via "impersonate" feature

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15548

See merge request !1956
2016-04-25 16:55:12 -04:00
Robert SpeicherandRobert Speicher 30dc15f43e Merge branch 'fix-private-snippet-api' into 'master'
Prevent information disclosure via snippet API

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15580

See merge request !1958
2016-04-25 16:41:14 -04:00
Grzegorz BizonandRobert Speicher 8dc82011f5 Merge branch 'fix/private-labels-permissions' into 'master'
Fix vulnerability that leaks private labels and milestones

This fixes vulnerability that leaks information about private labels and milestones because of  insecure direct object reference in issueable create service.
This affects merge requests and issues.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/15439

This MR introduces additional check that rejects labels and milestone that does not belong to the same project issue/merg request does.

`IssuableBaseService` may benefit from encapsulating filters in separate class/module, which then may improve coherency in this class.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15439

See merge request !1954
2016-04-25 16:18:16 -04:00
Jacob SchatzandRobert Speicher 5c7de4358e Merge branch 'issue_15434' into 'master'
Fixes XSS injection

REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/15434

**Without the fix**

![xss1](/uploads/0a7b0b15fb87066965a7c73f1dbaa815/xss1.gif)


**With the fix**

![xss2](/uploads/473cfa0aa80656f24c58aebf1fd97fff/xss2.gif)


See merge request !1952
2016-04-25 16:01:36 -04:00
Robert SpeicherandRobert Speicher e76a2a2ef3 Merge branch 'dev_issue_15331' into 'master'
Fixes window.opener bug

Adds `noreferrer` value to rel attribute for external links

REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/15331

See merge request !1953
2016-04-25 15:51:37 -04:00
Rémy Coutable 2058b91228 Update VERSION to 8.5.11 v8.5.11 2016-04-20 17:59:09 +02:00
Douwe MaanandRémy Coutable 2c9cd67f78 Merge branch 'rs-issue-15126' into 'master'
Remove persistent XSS vulnerability in `commit_person_link` helper

Because we were incorrectly supplying the tooltip title as
`data-original-title` (which Bootstrap's Tooltip JS automatically
applies based on the `title` attribute; we should never be setting it
directly), the value was being passed through as-is.

Instead, we should be supplying the normal `title` attribute and letting
Rails escape the value, which also negates the need for us to call
`sanitize` on it.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15126

See merge request !1948

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-19 17:35:32 +02:00
Rémy Coutable 93e923fc04 Add 8.5.11 CHANGELOG
[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-19 16:20:35 +02:00
Robert Speicher 0c1d745abb Update VERSION to 8.5.10 v8.5.10 2016-04-07 16:14:23 -04:00
Rémy CoutableandRémy Coutable 4a9f5ef931 Merge branch 'fix/2fa-authentication-spoofing' into 'master'
Fix 2FA authentication spoofing

This is security fix for vulnerability described at
https://gitlab.com/gitlab-org/gitlab-ce/issues/14900.

Attacker was able to bypass password authentication of users that have 2FA enabled, and consequently sign is as a different user, without knowing his password, if he managed to guess 2FA One Time Password for that user.

It was also possible to enumerate users and check if they have 2FA enabled, because GitLab responded with different error for each case.

This MR attempts to change default user search scope if `otp_user_id` session variable has been set. If it is present, it means that user has 2FA enabled, and has already been verified with login and password. In this case we should look for user with `otp_user_id` first, before picking it up by `login`.

Both, 2FA authentication spoofing and 2FA discovery have been covered by specs.

Current 2FA code is a bit tricky, so it probably needs some refactoring.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-07 17:33:47 +02:00
Rémy Coutable 2b060c64e7 Update VERSION to 8.5.9 v8.5.9 2016-04-05 18:09:59 +02:00
Douwe MaanandRémy Coutable d583ef6f6c Merge branch 'fix-bad-fetch' into 'master'
Don't fetch any tags from a forked repo

Closes #13957

See merge request !3504

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-05 16:11:46 +02:00
Robert Speicher 46bb47accf Version 8.5.8 v8.5.8 2016-03-17 18:45:20 -04:00
Robert Speicher 2debf52f63 Merge branch '8-5-git-2-7-4' into '8-5-stable'
Bump Git version requirement to 2.7.4 (for 8.5)

[ci skip]

See merge request !3286
2016-03-17 21:56:36 +00:00
Douwe Maan 28669c86be Bump Git version requirement to 2.7.4 (for 8.5) 2016-03-17 22:45:24 +01:00
Jacob VosmaerandRémy Coutable 157e4c9a0d Merge branch 'git-version' into 'master'
Install Git 2.7.3, not 2.4.3



See merge request !3248
2016-03-17 18:07:45 +01:00
Robert Speicher 72913edb02 Version 8.5.7 v8.5.7 2016-03-15 18:46:41 -04:00
Robert SpeicherandRobert Speicher c7a3d75973 Merge branch 'git-2-7-3' into 'master'
Bump Git version requirement to 2.7.3

[ci skip]

See merge request !3240
2016-03-15 18:28:33 -04:00
Rémy Coutable 0424e72d29 Version 8.5.6 v8.5.6 2016-03-15 12:56:27 +01:00
Rémy Coutable 515f2a027e Add CHANGELOG entry for 8.5.6
[ci skip]
2016-03-15 12:33:05 +01:00
Rémy Coutable 42b785a9a8 Merge branch 'ldap-lease-8.5' into '8-5-stable'
Use leases for LDAP checks in 8.5

Back-port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3143

See merge request !3181
2016-03-15 11:30:49 +00:00
Jacob Vosmaer bf253a1087 Obtain lease before querying LDAP 2016-03-11 13:47:49 +01:00
Jacob Vosmaer 73c777cf67 Backport ExclusiveLease to 8.5 2016-03-11 13:38:58 +01:00
Rémy Coutable 11f388aaac Version 8.5.5 v8.5.5 2016-03-10 20:32:49 +01:00
Douwe MaanandRémy Coutable 5daf8923ef Merge branch 'fix-filtered-pagination' into 'master'
Allow filtered explore results to be paged. Fixes #14104

See merge request !3149
2016-03-10 18:48:35 +01:00
Jacob Schatz ea09a38f8c Merge branch 'fix/14168' into '8-5-stable'
Fix "Show all" link behavior

The "Show all" link was broken by recent refactors from @joshfng. I have fixed it very simply (I believe).

**Please note that this fix will be in 8.5.x only** (since the whole "Show all" stuff was moved to pagination recently (8.6).

Fixes #14168 

/cc @joshfng @dzaporozhets @razer6 

See merge request !3159
2016-03-10 15:13:29 +00:00
Rémy Coutable f8e220b6ff Fix "Show all" link behavior
Fixes #14168
2016-03-10 15:32:17 +01:00
Douglas Barbosa AlexandreandRémy Coutable fe4d3abead Merge branch 'fix-todos' into 'master'
Fix error 500 in Todos

Closes #14095

Closes #14075

Closes #14109

Closes #14151

See merge request !3141
2016-03-10 10:35:34 +01:00
Rémy Coutable 62fc5b6ab5 Version 8.5.5-rc1 v8.5.5-rc1 2016-03-08 13:02:20 +01:00
Robert SpeicherandRémy Coutable f38f579728 Merge branch 'add_show_role_boolean_to_group_member_view' into 'master'
Only show group member roles if explicitly requested

This very simply fixes an EE problem, but I made the change here so it's less prone to errors from merges.

In EE, prior to this change, group member roles were shown in project member list when a project is shared with a group. This is bad because the project explicitly shares with the group and sets a 'max access' level. If the max access level is 'developer' the project owner doesn't want to see 'Owner' in the group roles because it will confuse them. I verified that permissions are really being honored here, it was just an error in the view. You can see in https://gitlab.com/gitlab-org/gitlab-ee/blob/master/app/views/projects/project_members/_shared_group_members.html.haml#L18 where this was how it was intended to be. Likely a CE-EE merge introduced this bug. That's why I made the boolean required in CE even though this is for EE.

![Screen_Shot_2016-03-01_at_8.59.02_AM](/uploads/704ab3149f60c363dd8374bd0c06a46a/Screen_Shot_2016-03-01_at_8.59.02_AM.png)

![Screen_Shot_2016-03-01_at_9.17.54_AM](/uploads/5fcabef352cbc41dade037767f90ace3/Screen_Shot_2016-03-01_at_9.17.54_AM.png)

See merge request !3044
2016-03-08 12:22:55 +01:00
Rémy Coutable 2c6618b9a4 Version 8.5.4 v8.5.4 2016-03-04 13:48:05 +01:00
Rémy Coutable 145f7dda96 Remove "(unreleased)" from 8.5.4 release notes
[ci skip]
2016-03-04 13:23:07 +01:00
Rémy Coutable 60f9ce6af8 Merge branch 'fix/invalidate-builds-badge-cache' into 'master'
Invalidate cache for builds badge

This fixes cache issue with badges (we should not cache badge images).

Closes #13982

See merge request !3086
2016-03-04 13:20:49 +01:00
Rémy Coutable e6c783d32f Version 8.5.3 v8.5.3 2016-03-03 17:01:49 +01:00