Commit Graph
24040 Commits
Author SHA1 Message Date
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
Rémy Coutable 45469dd2de Merge branch 'renaming-repository-caching' into 'master'
Flush repository caches before renaming projects

This should hopefully solve gitlab-org/gitlab-ce#13790. Once I know the exact steps to reproduce the problem I should be able to confirm this.

cc @dblessing @inem

See merge request !2974
2016-03-03 16:37:24 +01:00
Rémy Coutable 3a93df83a1 Version 8.5.2 v8.5.2 2016-03-02 18:33:33 +01:00
Achilleas PipinellisandRémy Coutable 00b935b27d Merge branch 'docs_todos' into 'master'
Add Todos documentation

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

See merge request !3064
2016-03-02 14:08:19 +01:00
Douwe MaanandRémy Coutable e75989db43 Merge branch 'fix/13785-dashboard-projects-display-welcome-after-search' into 'master'
Don't show "Welcome to GitLab" when the search didn't return any projects

Fixes #13785. /cc @pixdrift

### Before

![Screen_Shot_2016-03-02_at_10.55.02](/uploads/b6b6ead2143d01e374ad296e72182d79/Screen_Shot_2016-03-02_at_10.55.02.png)

### After

![Screen_Shot_2016-03-02_at_12.12.33](/uploads/6e16c44e69039c534ea0fc3373c6060b/Screen_Shot_2016-03-02_at_12.12.33.png)

See merge request !3059
2016-03-02 14:06:00 +01:00
Rémy Coutable 5d534a1d4b Merge branch 'fix/13781-delete-tag-without-ajax' into 'master'
Tag deletion doesn't use AJAX anymore

See merge request !2986
2016-03-02 14:05:38 +01:00
Douwe MaanandRémy Coutable 4d857c08d5 Merge branch 'fix/deprecated-ci-badge-permissions' into 'master'
Fix permissions for deprecated CI build status badge

This fixes permissions for deprecated status badge, being unavailable even if project is public.

Closes #13324

See merge request !3030
2016-03-02 12:08:21 +01:00
Douwe MaanandRémy Coutable 26959be0cf Merge branch 'issue_13623' into 'master'
Show days remaining instead of elapsed time for Milestone.

Closes #13623

See merge request !2978
2016-03-02 11:57:50 +01:00
Rémy Coutable a8ca1d5016 Merge branch 'fix/12652-omniauth-import-from-gitlab-com-fails' into 'master'
Fix import from gitlab.com fails

_Originally opened at !2896 by @kazsw._

- - -

Fixes #12652

CGI.escape encodes '/' by default.
Second argument can be removed.

See merge request !2988
2016-03-02 11:43:19 +01:00
Rémy Coutable 1c3d8aaeef Merge branch 'shortcuts-help' into 'master'
Fix help keyboard shortcut for relative URL setups

Fixes gitlab-org/gitlab-ce#12751

See merge request !3016
2016-03-02 10:46:52 +01:00
Douwe MaanandRémy Coutable 58e247d83b Merge branch 'rel-url-fix' into 'master'
Fix relative URL

See https://github.com/gitlabhq/gitlabhq/issues/10053

 1. Same configuration way for relative URL like with Omnibus
 2. Loading the relative configuration from Rakefile as Rails do not load initializers for `asset:precompile`

First point has another positive side effect: no collisions (due to git controlled `application.rb`) any more during the upgrades of source based installations and relative url configuration

 - [x] tests on the source based installation
 - [x] tests on the centos&ubuntu omnibus packages

Fixes: gitlab-org/gitlab-ce#13730, gitlab-org/gitlab-ce#13727, gitlab-org/omnibus-gitlab#1143 and https://github.com/gitlabhq/gitlabhq/issues/10053

See merge request !2979
2016-03-01 17:37:51 +01:00
Dmitriy ZaporozhetsandRémy Coutable c081928d06 Merge branch 'sidebar-overlap-fix' into 'master'
Fix issue with overlap of sidebar links.

Thanks @iamphill for the help with this one. 

![Screen_Shot_2016-03-01_at_10.19.52_AM](/uploads/f203fde79ae397ad18f23c4108f1c306/Screen_Shot_2016-03-01_at_10.19.52_AM.png)

cc @iamphill @alfredo1 @dzaporozhets @rymai 

See merge request !3043
2016-03-01 17:34:16 +01:00
Douwe MaanandRémy Coutable c05bb00737 Merge branch 'rs-improve-grace-period' into 'master'
Don't show any "2FA required" message if it's not actually required

Prior, if the user had enabled and then disabled 2FA, they would be
shown a "You must enable Two-factor Authentication for your account."
message when going back to re-activate it, even if 2FA enforcement was
disabled.

See merge request !3014
2016-03-01 17:04:32 +01:00
Dmitriy ZaporozhetsandRémy Coutable e11ab453ee Merge branch 'issue_13648' into 'master'
Improve implementation to check read access to forks and add pagination.

Fixes #13648

The following optimizations where made:

- Pagination was added.
- Code to check for read permissions to forks was optimized, in the past we were doing too many queries for each project.

See merge request !2991
2016-03-01 12:13:32 +01:00
Douwe MaanandRémy Coutable 9052086d7b Merge branch 'issue_13621' into 'master'
Don't repeat labels listed on Labels tab.

Fixes #13622

See merge request !2924
2016-03-01 12:13:04 +01:00
Rémy Coutable 5c8f6ba3dd Merge branch 'issue_13851' into 'master'
Brings back missing "Gitlab" text on the logo

Closes #13851 

See merge request !2989
2016-03-01 11:57:27 +01:00
Dmitriy ZaporozhetsandRémy Coutable 710b3356ff Merge branch 'fix-migration' into 'master'
Fix broken migration

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

For !2927 

See merge request !3011
2016-03-01 11:48:53 +01:00