Commit Graph
25487 Commits
Author SHA1 Message Date
Robert SpeicherandRobert Speicher 5e3f9b6076 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:35:32 -04:00
Grzegorz BizonandRobert Speicher 09e5616777 Merge branch 'fix/private-labels-permissions' into 'master'
Fix vulnerability that leaks private labels and milestones

## Summary

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

## Fix

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

## Further work

`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:11:04 -04:00
Jacob SchatzandRobert Speicher aae70565ee 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:48 -04:00
Robert SpeicherandRobert Speicher 95fb7209a9 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:52:00 -04:00
Rémy Coutable 1d70d7cd58 Update VERSION to 8.6.7 v8.6.7 2016-04-20 17:29:16 +02:00
Robert Speicher b6e8aca9de Remove XSS vulnerability in Label and Milestone dropdowns 2016-04-19 15:00:59 -04:00
Douwe MaanandRémy Coutable 70ada081ed 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:24:13 +02:00
Rémy Coutable bb10571ef5 Remove 8.7.0 CHANGELOG
[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-19 16:37:07 +02:00
Douwe MaanandRémy Coutable ae1e3fb81a Merge branch 'fix/link-group-permissions' into 'master'
Check permissions when sharing project with group

## Summary

Unprivileged user was able to share project with group he didn't have access to, and therefore gain partial access to that group, which opened possibilities for further actions like listing private projects in that group.

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

## Fix

This change introduces additional check for group read access.

## Further work

We can think about preventing such problems in the future (this is quite common problem) by moving permissions checks to another layer of abstraction (TBD).

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

See merge request !1949

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-19 16:09:48 +02:00
Rémy Coutable 1fdf8908b9 Remove 8.7.0 CHANGELOG
[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-15 19:10:44 +02:00
Rémy Coutable 6d3805b694 Update VERSION to 8.6.6 v8.6.6 2016-04-15 18:50:53 +02:00
Rémy Coutable 248c06243a Merge branch 'connorshea/gitlab-ce-revoke-authorized-application' into 'master'
Fix revoking of authorized OAuth applications

Users were not able to revoke access to authorized OAuth applications. Clicking the "Revoke" button would result in a 404 page, and the application would still be authorized.

Added a spec and also found that the `gon` variables were not being set for this view.

Closes #14370

See merge request !3690

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-15 18:07:02 +02:00
Yorick PeterseandRémy Coutable 0b38dbe346 Merge branch 'reorder-project-expire-cache' into 'master'
Expire the exists cache before deletion to ensure project dir actually exists

See merge request !3413

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-15 18:05:56 +02:00
Rémy Coutable 6ef1adc727 Merge branch 'feature/fix-14753' into 'master'
Fix #14753: Check if head is born before trying to detect main language

This MR makes sure that head exists before trying to detect the main language.
This prevents errors on repo's without a master branch.

Closes #14753

See merge request !3654
2016-04-15 18:04:34 +02:00
Robert Speicher e63f120e9a Update VERSION to 8.6.5 v8.6.5 2016-04-07 15:05:14 -04:00
Robert SpeicherandRobert Speicher 0a3f36681e Merge branch 'patch/fix-ldap-unblock-user-logic' into 'master'
Unblocks user when active_directory is disabled and it can be found

We implemented a specific block state to handle user blocking that originates from LDAP filtering rules / directory state in !2242.

That introduced a regression in LDAP authentication when Active Directory support was disabled. You could have a scenario where the user would not be temporarily found (like a filtering rule), that would mark the user as `ldap_blocked`, but will never unblock it automatically when that state changed.

Fixes #14253, #13179, #13259, #13959

See merge request !3550
2016-04-07 14:12:53 -04:00
Yorick PeterseandRémy Coutable 44c035427e Merge branch 'reorder-language' into 'master'
Update language after doing all other operations

See merge request !3533

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-07 16:24:48 +02:00
Rémy CoutableandRémy Coutable ea1b80aebf Merge branch 'fix/2fa-authentication-spoofing' into 'master'
Fix 2FA authentication spoofing

## Summary

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.

## Fix

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.

## Further work

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

See merge request !1947

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-07 15:58:42 +02:00
Rémy Coutable 5294f536ec Merge branch 'return-303-for-branch-deletion' into 'master'
Return status code 303 after a branch DELETE operation to avoid project deletion

Closes #14994

See merge request !3583

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-07 15:56:40 +02:00
Rémy Coutable 09be580026 Merge branch 'update_main_lang_if_unset' into 'master'
Only update main language if it is not already set

Related to gitlab-org/gitlab-ce#14937 (but does not fully fix) This is a temporary fix so performance isn't affected so much.

cc @yorickpeterse @ayufan how does this look?

See merge request !3556

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-07 15:54:48 +02:00
Douwe MaanandRémy Coutable 2ac04162f3 Merge branch 'fix/permissions-when-importing-members' into 'master'
Check permissions when importing project members

Closes #14899

See merge request !3535

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-07 15:48:50 +02:00
Yorick PeterseandRémy Coutable d55df63455 Merge branch 'fix-gh-pr-import' into 'master'
Fix Importing repos from GHE doesn't work

See merge request !3529

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-07 15:47:49 +02:00
Rémy Coutable e47b581433 Update VERSION to 8.6.4 v8.6.4 2016-04-04 12:12:21 +02:00
Douwe MaanandRémy Coutable 59b6a137b0 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-04 10:59:27 +02:00
Rémy Coutable e5fed077c8 Fix completely messed-up 8.6.3 CHANGELOG items
[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-01 18:48:38 +02:00
Rémy Coutable 36572f8ec7 Update VERSION to 8.6.3 v8.6.3 2016-04-01 17:04:08 +02:00
Douwe MaanandRémy Coutable 4b4de7b7aa Merge branch 'fix/update-gitlab-shell' into 'master'
Update gitlab-shell version and doc to 2.6.12



See merge request !280
2016-04-01 16:29:26 +02:00
Rémy Coutable 80910076eb Remove "(unreleased)" for 8.6.3
[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-01 16:16:19 +02:00
Rémy Coutable ec3c66b986 Merge branch 'error-when-ldap-doesn-t-supply-an-email-address-14559' into 'master'
Allow temp-oauth-email as notification email

Closes #14559

/cc @dblessing @rymai

See merge request !3477

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-01 16:14:38 +02:00
Robert SpeicherandRémy Coutable 6f45a89bab Merge branch 'fix_wip_in_mr_api' into 'master'
Ensuring Merge Request API returns boolean values for work_in_progress

Fixes #14692.

See merge request !3432

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-01 16:07:22 +02:00
Rémy Coutable eceaa30bf2 Merge branch 'filter-dropdown-bug' into 'master'
Fixes issue with dropdowns not selecting values

Fixes issue with dropdowns not selecting when navigating between tabs

Closes #14813

See merge request !3478

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-01 11:21:08 +02:00
Douwe MaanandRémy Coutable 5f54c04cca Merge branch 'snippets-with-comments-cause-a-500-when-they-show-up-in-search-results-14764' into 'master'
Fix Error 500 when searching for a comment in a project snippet

Closes #14764. /cc @stanhu, and thank you for the spec! ;)

See merge request !3468

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-01 10:52:31 +02:00
Douwe MaanandRémy Coutable 61027f40ec Merge branch 'fix-mentions-on-confidential-issues-for-non-members' into 'master'
Mentions on confidential issues doesn't create todos for non-members

Closes #14569

See merge request !3374

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-01 10:51:18 +02:00
Douwe MaanandRémy Coutable 36c8506b9b Merge branch 'fix/issue-move-rewrite-uploads' into 'master'
Rewrite uploads when moving issue to another project

Closes #14531

See merge request !3382

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-01 10:01:22 +02:00
Rémy Coutable 2a5bfc461e Merge branch 'fix-commit-comment' into 'master'
Fix commit comment alignment

Closes #14780

See merge request !3466

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-03-31 18:53:57 +02:00
Robert SpeicherandRémy Coutable 0a3f5adf92 Merge branch 'patch/fix-mergerequest-diff' into 'master'
Fix Raw / Rendered diff producing different results on merge requests

The raw diff endpoint (`merge_requests/####.diff`) produces a diff based on `target_branch` instead of the original branching point. Same is valid for `merge_requests/####.patch`.

Fixes #14680, #3017

See merge request !3450

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-03-31 18:51:02 +02:00
Rémy Coutable e5d0af5657 Merge branch 'fix-todos' into 'master'
Destroy related todos when an Issue/MR is deleted

Closes #14550 

Closes #14598

See merge request !3376
2016-03-31 18:49:08 +02:00
Rémy Coutable 8b68b6f2d2 Version 8.6.2 v8.6.2 2016-03-30 15:15:15 +02:00
Rémy Coutable 99e7c91775 When looking for a filter hidden input field, look for it by name only
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-03-30 12:28:29 +02:00
Rémy Coutable 908700e121 Merge branch 'notification-settings-save' into 'master'
Fixed issue with notification settings not saving

Closes #14736

See merge request !3452

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-03-30 10:43:25 +02:00
Rémy Coutable 1755b1643c Merge branch '8-6-stable' of github.com:gitlabhq/gitlabhq into 8-6-stable 2016-03-30 09:39:26 +02:00
Robert SpeicherandRémy Coutable a2d06cbff3 Merge branch 'fix-mr-comment-commit-pruned' into 'master'
Gracefully handle notes on deleted commits in merge requests

Closes #3250

See merge request !3402

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-03-30 09:35:36 +02:00
Rémy Coutable 5e645889b1 Merge branch 'rs-banzai-requires' into 'master'
Remove redundant `require`s from Banzai files

We're trying to avoid circular dependency errors.

Related: https://gitlab.com/gitlab-org/gitlab-ce/issues/13521

Sentry: https://sentry.gitlap.com/gitlab/gitlabcom/issues/8/

See merge request !3391

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-03-30 09:28:02 +02:00
Rémy Coutable 07a4aacafc Merge branch 'added-milestone-upcoming' into 'master'
Dropdown bug fixes

- Added back upcoming to milestone filter

![Screen_Shot_2016-03-23_at_16.45.22](/uploads/8c31eff7e0984aad17881f6397ff17cd/Screen_Shot_2016-03-23_at_16.45.22.png)

- Fixed bug that would cause the currently selected value to disappear on filters
- Fixed bug that throw an error when filtering by upcoming when there is only a milestone in the past

Closes #14536

See merge request !3368

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-03-30 09:26:54 +02:00
Stan HuandRémy Coutable 966ade1d75 Merge branch 'issue_14671' into 'master'
Fix cancel button on issuables

Fixes #14671

See merge request !3417

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-03-30 07:39:14 +02:00
Rémy Coutable bc80f7faff Merge branch 'doc-update-8.5-to-8.6-fix-steps-order' into 'master'
Fix order of steps to prevent PostgreSQL errors when running migration

Supersedes https://github.com/gitlabhq/gitlabhq/pull/10100.

/cc @stanhu @rodrigomanhaes

See merge request !3355
2016-03-29 12:37:44 +02:00
Rémy Coutable 17c12be62f Merge branch 'fix/nomethod-error-on-ci' into 'master'
Fix error when visiting CI root path

Closes #14528, closes #14687

See merge request !3377
2016-03-29 12:35:06 +02:00
Douwe MaanandRémy Coutable 8d5a55ef39 Merge branch 'fix-14607' into 'master'
Ensure private project snippets are not viewable by unauthorized people

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

See merge request !1946
2016-03-29 12:31:22 +02:00
Douwe MaanandRémy Coutable 7b1fa197a4 Merge branch 'rs-remove-wip-tabindex' into 'master'
Remove tabstop from the WIP toggle links

[ci skip]

See merge request !3426
2016-03-29 12:29:54 +02:00
Robert SpeicherandRémy Coutable e7f93e2b25 Merge branch 'issue_14643' into 'master'
Fix background when editing a highlighted note

Fixes #14643

See merge request !3423
2016-03-29 12:29:41 +02:00