summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@12-4-stable-eeGitLab Bot2019-11-0450-63/+406
|
* Merge remote-tracking branch 'dev/12-4-stable' into 12-4-stableGitLab Release Tools Bot2019-10-3075-146/+1196
|\
| * Update VERSION to 12.4.1v12.4.1GitLab Release Tools Bot2019-10-281-1/+1
| |
| * Update CHANGELOG.md for 12.4.1GitLab Release Tools Bot2019-10-2813-58/+18
| | | | | | [ci skip]
| * Merge branch 'security-mask-sentry-token-12-4-ce' into '12-4-stable'GitLab Release Tools Bot2019-10-256-4/+51
| |\ | | | | | | | | | | | | Mask Sentry auth token See merge request gitlab/gitlabhq!3504
| | * Mask Sentry auth tokenRyan Cobb2019-10-246-4/+51
| |/ |/| | | | | | | This makes it so we mask Sentry's auth token. This mask only occurs in the UI.
| * Merge branch 'security-remove-leaky-401-responses-12.4' into '12-4-stable'GitLab Release Tools Bot2019-10-2512-17/+41
| |\ | | | | | | | | | | | | Private/internal repository enumeration via bruteforce on a vulnerable URL See merge request gitlab/gitlabhq!3491
| | * Avoid #authenticate_user! in #route_not_foundKerri Miller2019-10-2212-17/+41
| |/ |/| | | | | | | | | | | | | | | | | | | This method, #route_not_found, is executed as the final fallback for unrecognized routes (as the name might imply.) We want to avoid `#authenticate_user!` when calling `#route_not_found`; `#authenticate_user!` can, depending on the request format, return a 401 instead of redirecting to a login page. This opens a subtle security exploit where anonymous users will receive a 401 response when attempting to access a private repo, while a recognized user will receive a 404, exposing the existence of the private, hidden repo.
| * Merge branch 'security-id-fix-disclosure-of-private-repo-names-12-4' into ↵GitLab Release Tools Bot2019-10-253-1/+48
| |\ | | | | | | | | | | | | | | | | | | '12-4-stable' Return 404 on LFS request if project doesn't exist See merge request gitlab/gitlabhq!3506
| | * Return 404 on LFS request if project doesn't existIgor Drozdov2019-10-253-1/+48
| |/
| * Merge branch 'security-bvl-validate-force-remove-branch-on-mrs-12-4-ce' into ↵GitLab Release Tools Bot2019-10-2414-15/+191
| |\ | | | | | | | | | | | | | | | | | | '12-4-stable' Only assign merge params when allowed See merge request gitlab/gitlabhq!3487
| | * Only assign merge params when allowedBob Van Landuyt2019-10-2314-15/+191
| |/ |/| | | | | | | | | | | | | | | When a user updates a merge request coming from a fork, they should not be able to set `force_remove_source_branch` if they cannot push code to the source project. Otherwise developers of the target project could remove the source branch of the source project by setting this flag through the API.
| * Merge branch 'security-wiki-rdoc-content-12-4-ce' into '12-4-stable'GitLab Release Tools Bot2019-10-246-44/+74
| |\ | | | | | | | | | | | | Pass all wiki markup formats through our Banzai pipeline filters See merge request gitlab/gitlabhq!3485
| | * Pass all wiki markup formats through pipelinesLuke Duncalfe2019-10-236-44/+74
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, when the wiki page format was anything other than `markdown` or `asciidoc` the formatted content would be returned though a Gitaly call. Gitaly in turn would delegate formatting to the gitlab-gollum-lib gem, which in turn would delegate that to various gems (like RDoc for `rdoc`) and then apply some very liberal sanitization. It was too liberal! This change brings our wiki content formatting in line with how we format other markdown at GitLab, so we have a SSOT for sanitization. https://gitlab.com/gitlab-org/gitlab/issues/30540
| * Merge branch 'security-developer-transfer-project-12-4' into '12-4-stable'GitLab Release Tools Bot2019-10-248-2/+128
| |\ | | | | | | | | | | | | Require Maintainer permission on group where project is transferred to See merge request gitlab/gitlabhq!3486
| | * Require maintainer permission to transfer projectsmanojmj2019-10-238-2/+128
| |/ |/|
| * Merge branch 'security-open-redirect-internalredirect-12-4' into '12-4-stable'GitLab Release Tools Bot2019-10-243-2/+8
| |\ | | | | | | | | | | | | Use the '\A' and '\z' regex anchors in `InternalRedirect` to mitigate an Open Redirect issue. See merge request gitlab/gitlabhq!3488
| | * Use the '\A' and '\z' regex anchors in `InternalRedirect` to mitigate an ↵Joern Schneeweisz2019-10-223-2/+8
| |/ |/| | | | | | | | | Open Redirect issue. Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2934 and https://gitlab.com/gitlab-org/gitlab/issues/33569
| * Merge branch ↵GitLab Release Tools Bot2019-10-246-8/+102
| |\ | | | | | | | | | | | | | | | | | | 'security-2914-labels-visible-despite-no-access-to-issues-repositories-12-4' into '12-4-stable' Labels visible despite no access to issues & repositories See merge request gitlab/gitlabhq!3489
| | * Fix labels finder to filter issuablesEugenia Grieff2019-10-226-8/+102
| |/ |/| | | | | Use project scopes to filter project labels that are visible for user
| * Merge branch 'security-2920-fix-notes-with-label-cross-reference-12-4' into ↵GitLab Release Tools Bot2019-10-244-1/+66
| |\ | | | | | | | | | | | | | | | | | | '12-4-stable' Project path reveals labels from Private project if the issue is moved to public project See merge request gitlab/gitlabhq!3490
| | * Add milestone and label note types to cross refsEugenia Grieff2019-10-244-1/+66
| |/ |/| | | | | | | | | - Include new types in SystemNoteMetadata - Add Label and Milestone reference_pattern to Mentionable::ReferenceRegexes to be checked for cross references
| * Merge branch 'security-64519-circular-graphql-queries-12-4' into '12-4-stable'GitLab Release Tools Bot2019-10-248-12/+254
| |\ | | | | | | | | | | | | Nested GraphQL query with circular relationship can cause Denial of Service See merge request gitlab/gitlabhq!3492
| | * Tweak test to insulate against magic number changescharlieablett2019-10-231-0/+1
| | |
| | * Allow tests to ignore recursioncharlieablett2019-10-232-1/+10
| | |
| | * Check for recursion and fail if too recursivecharlieablett2019-10-238-12/+244
| |/ |/| | | | | | | | | | | | | | | | | - List all overly-recursive fields - Reduce recursion threshold to 2 - Add test for not-recursive-enough query - Use reusable methods in tests - Add changelog - Set changeable acceptable recursion level - Add error check test helpers
| * Merge branch 'security-33689-post-filter-search-results-ce-12-4' into ↵GitLab Release Tools Bot2019-10-249-9/+44
| |\ | | | | | | | | | | | | | | | | | | '12-4-stable' Filter out search results based on permissions to avoid bugs leaking data See merge request gitlab/gitlabhq!3496
| | * Add #to_ability_name to Project & MilestoneDylan Griffith2019-10-234-0/+24
| | | | | | | | | | | | This will be used later for search filtering.
| | * Change Note#to_ability_name to 'note'Dylan Griffith2019-10-235-9/+20
| |/ |/| | | | | | | | | This is to be more consistent as there is already a :read_note policy in NotePolicy. To keep other behaviour the same we've introduced a Note#noteable_ability_name that is used anywhere this was expected.
| * Merge branch ↵GitLab Release Tools Bot2019-10-243-12/+42
| |\ | | | | | | | | | | | | | | | | | | 'security-65756-ex-admin-attacker-can-comment-in-internalsecurity-65756-ex-admin-attacker-can-comment-in-internal-12-4' into '12-4-stable' Improper access control allows the attacker to comment in internal commit after they are no longer admin See merge request gitlab/gitlabhq!3497
| | * Modify changelog to be more accuratecharlieablett2019-10-231-1/+1
| | |
| | * Users without commit access cannot create notescharlieablett2019-10-232-12/+37
| | |
| | * Add changelog filecharlieablett2019-10-231-0/+5
| |/ |/|
| * Merge branch ↵GitLab Release Tools Bot2019-10-246-18/+186
| |\ |/ / | | | | | | | | | | 'security-ag-hide-private-members-in-project-member-autocomplete-12-4' into '12-4-stable' Hide private members in project member autocomplete See merge request gitlab/gitlabhq!3503
| * Pick only those groups that the viewing user has access to,Aakriti Gupta2019-10-246-18/+186
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in a project members' list. Add tests for possible scenarios Re-factor and remove N + 1 queries Remove author from changelog Don't use memoisation when not needed Include users part of parents of project's group Re-factor tests Create and add users according to roles Re-use group created earlier Add incomplete test for ancestoral groups Rename method to clarify category of groups Skip pending test, remove comments not needed Remove extra line Include ancestors from invited groups as well Add specs for participants service Add more specs Add more specs use instead of Use public group owner instead of project maintainer to test owner acess Remove tests that have now been moved into participants_service_spec Use :context instead of :all Create nested group instead of creating an ancestor separately Add comment explaining doubt on the failing spec Imrpove test setup Optimize sql queries Refactor specs file Add rubocop disablement Add special case for project owners Add small refactor Add explanation to the docs Fix wording Refactor group check Add small changes in specs Add cr remarks Add cr remarks Add specs Add small refactor Add code review remarks Refactor for better database usage Fix failing spec Remove rubocop offences Add cr remarks
* Update VERSION to 12.4.0v12.4.0GitLab Release Tools Bot2019-10-221-1/+1
|
* Update CHANGELOG.md for 12.4.0GitLab Release Tools Bot2019-10-22296-1490/+319
| | | [ci skip]
* Add latest changes from gitlab-org/gitlab@12-4-stable-eeGitLab Bot2019-10-225562-49750/+261788
|
* Merge remote-tracking branch 'dev/12-3-stable' into 12-3-stableGitLab Release Tools Bot2019-10-072-1/+5
|\
| * Update VERSION to 12.3.5v12.3.5GitLab Release Tools Bot2019-10-071-1/+1
| |
| * Update CHANGELOG.md for 12.3.5GitLab Release Tools Bot2019-10-071-0/+4
|/ | | [ci skip]
* Merge branch '33216-quarantine-ECDSA' into 'master'Rémy Coutable2019-10-022-2/+2
| | | | | Quarantine some ECDSA related tests due to bumping openssl See merge request gitlab-org/gitlab!18016
* Update VERSION to 12.3.4v12.3.4GitLab Release Tools Bot2019-10-021-1/+1
|
* Update CHANGELOG.md for 12.3.4GitLab Release Tools Bot2019-10-021-0/+4
| | | [ci skip]
* Merge remote-tracking branch 'dev/12-3-stable' into 12-3-stableGitLab Release Tools Bot2019-10-028-3/+213
|\
| * Update VERSION to 12.3.3v12.3.3GitLab Release Tools Bot2019-10-011-1/+1
| |
| * Update CHANGELOG.md for 12.3.3GitLab Release Tools Bot2019-10-012-5/+7
| | | | | | [ci skip]
| * Merge branch 'security-29491-12-3-ce' into '12-3-stable'Marin Jankovski2019-10-017-2/+210
| |\ |/ / | | | | | | Fix private feature Elasticsearch leak See merge request gitlab/gitlabhq!3450
| * EE port: Fix private feature Elasticsearch leakMark Chao2019-10-017-2/+210
|/ | | | | | Add spec to test different combinations. Accept string for required_minimum_access_level Allow more flexible project membership query
* Merge branch 'fix_expired_gpg_key_specs' into 'master'Stan Hu2019-09-302-151/+270
| | | | | | | Fix broken specs : Generate new GPG key in place of expired one Closes #32956 See merge request gitlab-org/gitlab!17853
View Lorry Controller Status