Commit Graph
22969 Commits
Author SHA1 Message Date
Tomasz Maczukin e9bef8930d Update VERSION to 8.4.11 v8.4.11 2016-06-15 03:08:12 +02:00
Tomasz Maczukin fde446096a Update CHANGELOG for 8.4.11 2016-06-14 19:09:16 +02:00
Robert SpeicherandTomasz Maczukin 59d6f0476e 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:07:31 +02:00
Douwe MaanandTomasz Maczukin ae0988b9cf 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:04:46 +02:00
Robert Speicher f20462b83e Update VERSION to 8.4.10 v8.4.10 2016-04-27 13:26:45 -04:00
Robert Speicher a5606e1482 Update CHANGELOG for 8.4.10
[ci skip]
2016-04-26 17:56:52 -04:00
Robert SpeicherandRobert Speicher bbc92fff21 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:30:16 -04:00
Douwe Maan 3a01b3d112 Update changelog 2016-04-26 17:18:47 +02:00
Douwe Maan c87b1dec7f Revert "Merge branch '15579-filter-milestone-confidential-issues-api' into 'master'"
This reverts commit 550f9a740c.
2016-04-26 17:18:08 +02:00
Grzegorz BizonandRémy Coutable 16180ac219 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

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-26 11:45:20 +02:00
Rémy CoutableandRémy Coutable 079f8bc05b 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:41:12 +02:00
Robert SpeicherandRémy Coutable 3c6c4a1268 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:40:20 +02:00
Robert SpeicherandRobert Speicher 550f9a740c 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:44 -04:00
Robert SpeicherandRobert Speicher a1df123449 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:22 -04:00
Robert SpeicherandRobert Speicher 26e983d059 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:56:33 -04:00
Robert SpeicherandRobert Speicher e2198ea76b 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:45:59 -04:00
Jacob SchatzandRobert Speicher e580bd8cd6 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:24 -04:00
Robert SpeicherandRobert Speicher f02c5cc753 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:16 -04:00
Rémy Coutable 138dfd04c5 Update VERSION to 8.4.9 v8.4.9 2016-04-20 19:39:30 +02:00
Robert Speicher 3bfe98fb3e Fix failing user lookup feature test 2016-04-19 17:11:07 -04:00
Robert Speicher 6daf967719 Remove persistent XSS vulnerability in commit_person_link helper
See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1948
2016-04-19 11:25:38 -04:00
Robert Speicher ba0f3b6e91 Update VERSION to 8.4.8 v8.4.8 2016-04-07 16:20:48 -04:00
Rémy CoutableandRobert Speicher f53d976372 Merge branch 'fix/2fa-authentication-spoofing' into 'master'
Fix 2FA authentication spoofing

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-07 14:42:16 -04:00
Rémy Coutable 971babeafd Version 8.4.7 v8.4.7 2016-04-05 19:08:52 +02:00
Rémy Coutable 97e7bb6a8a Add 8.4.7 CHANGELOG item
[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-05 18:29:10 +02:00
Stan HuandRobert Speicher 5f5e833938 Don't fetch any tags from a forked repo
Closes #13957
2016-04-05 09:39:54 -04:00
Robert Speicher fc2cc084ea Version 8.4.6 v8.4.6 2016-03-17 18:28:39 -04:00
Robert Speicher f18132f011 Merge branch '8-4-git-2-7-4' into '8-4-stable'
Bump Git version requirement to 2.7.4 (for 8.4)

[ci skip]

See merge request !3283
2016-03-17 21:46:30 +00:00
Douwe Maan e0f0d50387 Bump Git version requirement to 2.7.4 (for 8.4) 2016-03-17 22:28:43 +01:00
Robert Speicher fed33aae75 Version 8.4.5 v8.4.5 2016-02-25 11:42:54 -05:00
Robert Speicher 9f65fe5d07 Update CHANGELOG
[ci skip]
2016-02-25 10:58:10 -05:00
Robert Speicher 6694a608ff Merge branch 'fix-gitlab_git-version' into '8-4-stable'
Fix missing gitlab_git version bump

Closes #13430 

See merge request !2811
2016-02-15 17:59:20 +00:00
Stan Hu f6f3ec9d68 Fix missing gitlab_git version bump
Closes #13430
2016-02-14 09:40:15 -08:00
Robert Speicher b3889b7f66 Merge branch 'bump-gitlab-git' into '8-4-stable'
Bump gitlab_git to ~> 7.2.24

bump gitlab_git to ~> 7.2.24 (closes: #13245)

See merge request !2772
2016-02-10 21:54:46 +00:00
Robert Speicher 9c31cc6ff6 Version 8.4.4 v8.4.4 2016-02-09 20:14:19 -05:00
Robert SpeicherandRobert Speicher 5a9b6c9869 Merge branch 'variables-build-log' into 'master'
Add notice about variables in build log

Related to: https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942

[ci skip]

See merge request !2761
2016-02-09 16:35:21 -05:00
Robert Speicher 7a835264bc Update CHANGELOG
[ci skip]
2016-02-09 14:20:16 -05:00
Robert SpeicherandRobert Speicher 1d92669cb0 Merge branch 'backup-database-timeout-fix' into 'master'
Fix timeout issue for rake task gitlab:backup:create

This is a fix for a database timeout which can occur when the backup
create task is taking very long (1-2 hours).
It seems that ActiveRecord is loosing the connection after a hour
idleness and need to be reconnected before use.

See merge request !2757
2016-02-09 12:25:37 -05:00
Pirate Praveen 4a07cc3c2e bump gitlab_git to ~> 7.2.24 (closes: #13245) 2016-02-09 11:34:58 -05:00
Robert Speicher edf972a53d Merge branch 'ci-permissions-stable' into '8-4-stable'
Limit guest access builds

This is https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 for ce-stable

See merge request !1943
2016-02-08 23:36:47 +00:00
Kamil Trzcinski 4b18162b31 Fix build/permissions.feature tests adding missing steps 2016-02-08 21:18:42 +01:00
Kamil Trzcinski 447f1e30db Limit guest access builds
This solves https://dev.gitlab.org/gitlab/gitlabhq/issues/2646

1. This MR simplifies CI permission model:
    - read_build: allows to read a list of builds, artifacts and trace
    - update_build: allows to cancel and retry builds
    - admin_build: allows to manage triggers, runners and variables
    - read_commit_status: allows to read a list of commit statuses (including the status of a build, but doesn't allow to see a build details)
    - create_commit_status: allows to create a new commit status using API

2. I do make sure that the proper permissions are used in all places where the CI can be shown.

3. Add the `read_build` ability if user is anonymous or guest and allow_guest_to_access_builds is enabled.

4. Add CI setting: public_builds.

5. The artifacts specific permission are removed, since they are covered by `*_build`.
2016-02-08 20:27:24 +01:00
Robert SpeicherandRobert Speicher 07556b561e Merge branch 'omniauth-saml-update' into 'master'
Updated omniuath-saml to the latest version.

See merge request !2684
2016-02-03 15:13:59 -05:00
Robert Speicher eb6f691760 Version 8.4.3 v8.4.3 2016-02-02 13:00:07 -05:00
Robert SpeicherandRobert Speicher 3033ec91aa Merge branch 'rs-relax-autosize' into 'master'
Allow manual resize of js-autosize textareas

First, the autosize library was being too controlling and removed the
`resize` property from any elements to which it was attached, removing
the drag handle. We've disabled this behavior in the vendored library
and added a spec to prevent a regression during an upgrade.

Second, we detect (as best we can) when the user manually resizes an
autosize textarea, and then remove the autosize behavior from it and
increase its max-height.

This should allow for the best of both worlds.

Closes #12832

See merge request !2653
2016-02-02 10:49:33 -05:00
Yorick Peterse 503ad19336 Merge branch 'expand-git-instrumentation' into 'master'
Expand Git instrumentation

This instruments some extra `Gitlab::Git` code as well as a collection of `Rugged` constants.

See merge request !2664
2016-02-02 11:19:51 +01:00
Drew BlessingandRobert Speicher 106722fa39 Merge branch 'increase_lfs_size_column' into 'master'
Increase LFS objects size column

Fixes #12745

Increases the `size` column integer limit to an 8-byte integer. This allows for a max value of `9223372036854775807` which is 9,223,372,036 GB. That should do it 😃

I tested this by first reproducing the error (push a file larger than 2.1 GB). The error was:

```
RangeError (3145728000 is out of range for ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Integer with limit 4):
  lib/gitlab/lfs/response.rb:232:in `store_file'
  lib/gitlab/lfs/response.rb:170:in `render_lfs_upload_ok'
  lib/gitlab/lfs/response.rb:51:in `block in render_storage_upload_store_response'
  lib/gitlab/lfs/response.rb:204:in `render_response_to_push'
  lib/gitlab/lfs/response.rb:50:in `render_storage_upload_store_response'
  lib/gitlab/lfs/router.rb:76:in `put_response'
  lib/gitlab/lfs/router.rb:20:in `try_call'
  lib/gitlab/backend/grack_auth.rb:41:in `call'
  lib/gitlab/backend/grack_auth.rb:18:in `call_with_kerberos_support'
  lib/gitlab/backend/grack_auth.rb:8:in `call'
```

Then I ran this migration and pushed the file again. It uploaded successfully.

See merge request !2644
2016-01-31 19:26:59 -05:00
Robert SpeicherandRobert Speicher f2faa0078f Merge branch 'rs-ldap-user' into 'master'
Backport LDAP user assignment changes from EE

See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146

See merge request !2641
2016-01-31 19:26:59 -05:00
Robert SpeicherandRobert Speicher fa69b067a7 Merge branch 'update_sentry_gem' into 'master'
Update sentry-raven gem.

Should resolve `fatal: Not a git repository (or any of the parent directories): .git` warnings.

Fixes #12657

See merge request !2636
2016-01-31 19:26:59 -05:00
Robert SpeicherandRobert Speicher ff1e0ecfc6 Merge branch 'mr-merge-base' into 'master'
Correctly determine MR diff base when MR has merge conflicts

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

See merge request !2632
2016-01-31 19:26:59 -05:00