summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 11.11.8v11.11.811-11-stableGitLab Release Tools Bot2019-08-091-1/+1
|
* Update CHANGELOG.md for 11.11.8GitLab Release Tools Bot2019-08-093-10/+8
| | | [ci skip]
* Merge branch 'pokstad1-11-11-stable-patch-47366' into '11-11-stable'John Skarbek2019-08-092-1/+6
|\ | | | | | | | | Update Gitaly to v1.42.7 for security fix See merge request gitlab/gitlabhq!3299
| * Update Gitaly to v1.42.7 for security fixPaul Okstad2019-08-092-1/+6
|/
* Merge branch 'security-11-11-fix-gitlab-api-token-recovery' into '11-11-stable'John Skarbek2019-08-092-1/+6
|\ | | | | | | | | Fix gitlab api token recovery See merge request gitlab/gitlabhq!3294
| * Upgrade pages version to 1.5.1Vladimir Shushlin2019-08-092-1/+6
|/
* Merge branch '11-11-stable-fix-migration-paths' into '11-11-stable'Robert Speicher2019-08-061-1/+2
|\ | | | | | | | | Fix migration-paths job for 11-11 See merge request gitlab-org/gitlab-ce!31475
| * Fix migration-path ci jobVladimir Shushlin2019-08-061-1/+2
|/ | | | | v9.3.0 were using gemnasium-gitlab-service which was yanked on rubygems
* Update browserslist to 4.5.4Robert Speicher2019-08-021-18/+18
| | | | Resolves static-analysis warnings about caniuse-lite being outdated.
* Update VERSION to 11.11.7v11.11.7GitLab Release Tools Bot2019-07-291-1/+1
|
* Update CHANGELOG.md for 11.11.7GitLab Release Tools Bot2019-07-2910-45/+15
| | | [ci skip]
* Add empty changelog for 11.11.6Robert Speicher2019-07-291-1/+4
| | | | [ci skip]
* Revert "Update CHANGELOG.md for 11.11.6"Robert Speicher2019-07-2910-15/+45
| | | | This reverts commit 9afc6928d2c898dea6fbb4845e037e9ecd57ad24.
* Update VERSION to 11.11.6v11.11.6GitLab Release Tools Bot2019-07-251-1/+1
|
* Update CHANGELOG.md for 11.11.6GitLab Release Tools Bot2019-07-2510-45/+15
| | | [ci skip]
* Remove invalid Namespace GraphQL type specRobert Speicher2019-07-241-2/+0
|
* Merge branch 'security-fix-badges-leaked-to-unauthorized-users-11-11' into ↵GitLab Release Tools Bot2019-07-243-31/+101
|\ | | | | | | | | | | | | '11-11-stable' Don't display badges when builds are restricted See merge request gitlab/gitlabhq!3186
| * Don't display badges when builds are restrictedFabio Pitino2019-06-273-31/+101
| | | | | | | | | | | | | | | | Badges were leaked to unauthorized users even when Public Builds project setting is disabled. Added guard clause to the controller to check if user can read build.
* | Merge branch 'security-60143-patch-additional-xss-issue-11.11' into ↵GitLab Release Tools Bot2019-07-249-93/+233
|\ \ | | | | | | | | | | | | | | | | | | '11-11-stable' Extract SanitizeNodeLink and apply to WikiLinkFilter See merge request gitlab/gitlabhq!3202
| * | Extract SanitizeNodeLink and apply to WikiLinkFilterKerri Miller2019-07-089-93/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SanitizationFilter was running before the WikiFilter. Since WikiFilter can modify links, we could see links that _should_ be stopped by SanatizationFilter being rendered on the page. I (kerrizor) had previously addressed the bug in: https://gitlab.com/gitlab-org/gitlab-ee/commit/7bc971915bbeadb950bb0e1f13510bf3038229a4 However, an additional exploit was discovered after that was merged. Working through the issue, we couldn't simply shuffle the order of filters, due to some implicit assumptions about the order of filters, so instead we've extracted the logic that sanitizes a Nokogiri-generated Node object, and applied it to the WikiLinkFilter as well. On moving filters around: Once we start moving around filters, we get cascading failures; fix one, another one crops up. Many of the existing filters in the WikiPipeline chain seem to assume that other filters have already done their work, and thus operate on a "transform anything that's left" basis; WikiFilter, for instance, assumes any link it finds in the markdown should be prepended with the wiki_base_path.. but if it does that, it also turns `href="@user"` into `href="/path/to/wiki/@user"`, which the UserReferenceFilter doesn't see as a user reference it needs to transform into a user profile link. This is true for all the reference filters in the WikiPipeline.
* | | Merge branch 'security-github-ssrf-redirect-11-11' into '11-11-stable'GitLab Release Tools Bot2019-07-246-3/+100
|\ \ \ | | | | | | | | | | | | | | | | Do not allow localhost url redirection in GitHub Integration See merge request gitlab/gitlabhq!3207
| * | | Do not allow localhost url redirection in GitHub Integrationmanojmj2019-07-096-3/+100
| |/ /
* | | Merge branch 'security-dns-ssrf-bypass-11-11' into '11-11-stable'GitLab Release Tools Bot2019-07-244-15/+51
|\ \ \ | | | | | | | | | | | | | | | | Server Side Request Forgery mitigation bypass See merge request gitlab/gitlabhq!3214
| * | | Fix Server Side Request Forgery mitigation bypassFrancisco Javier López2019-07-044-15/+51
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we can't resolve the hostname or it is invalid, we shouldn't even perform the request. This fix also fixes the problem the SSRF rebinding attack. We can't stub feature flags outside example blocks. Nevertheless, there are some actions that calls the UrlBlocker, that are performed outside example blocks, ie: `set` instruction. That's why we have to use some signalign mechanism outside the scope of the specs.
* | | Merge branch 'security-mr-pipeline-permissions-11-11' into '11-11-stable'GitLab Release Tools Bot2019-07-244-6/+102
|\ \ \ | | | | | | | | | | | | | | | | MR pipeline permissions See merge request gitlab/gitlabhq!3217
| * | | Use MergeRequest#source_project as permissions reference for ↵drew cimino2019-07-054-6/+102
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | MergeRequest#all_pipelines MergeRequest#all_pipelines fetches Ci::Pipeline records from the source project, so we should specifically check that project for permissions. This was already happening for intra-project merge requests, but in the event that the target and source projects both have private builds, we should ensure that the project permissions are respected.
* | | Merge branch 'security-remove-take-trigger-ownership-feature-11-11' into ↵GitLab Release Tools Bot2019-07-2411-141/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | '11-11-stable' Drop feature to take ownership of a trigger token See merge request gitlab/gitlabhq!3228
| * | | Drop feature to take ownership of a trigger tokenFabio Pitino2019-07-1011-141/+9
| |/ / | | | | | | | | | | | | | | | | | | Removing API and frontend interactions that allowed users to take ownership of a trigger token. Removed mentions from the documentation.
* | | Merge branch ↵GitLab Release Tools Bot2019-07-245-0/+51
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'security-2873-restrict-slash-commands-to-users-who-can-log-in-11-11' into '11-11-stable' Restrict slash commands to users who can log in See merge request gitlab/gitlabhq!3239
| * | | Restrict slash commands to users who can log inHordur Freyr Yngvason2019-07-125-0/+51
| |/ /
* | | Merge branch 'security-bvl-filter-mr-params-11-11' into '11-11-stable'GitLab Release Tools Bot2019-07-244-8/+83
|\ \ \ | | | | | | | | | | | | | | | | Filter params in MR build service See merge request gitlab/gitlabhq!3255
| * | | Filter params in MR build serviceBob Van Landuyt2019-07-174-8/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reusing the existing `IssuableBaseService#filter_params` which uses the policies to determine what params a user can set, and which values it can be set to. This also removed the need for the seperate call to `IssuableBaseService#ensure_milestone_available`. The `Issues::BuildService` does not suffer from this because it limits the params that are assignable to the `title`, `description` and `milestone_id`.
* | | | Merge branch 'security-hide_moved_issue_id-11-11' into '11-11-stable'GitLab Release Tools Bot2019-07-243-1/+44
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Do not show moved issue ids for user not authorized See merge request gitlab/gitlabhq!3264
| * | | Do not show moved issue ids for user not authorizedFelipe Artur2019-07-153-1/+44
| |/ / | | | | | | | | | Do not show moved issue id for users that cannot read issue
* | | Merge branch 'sh-fix-appearance-spec-failure' into 'master'Douglas Barbosa Alexandre2019-07-161-2/+1
|/ / | | | | | | | | | | | | Fix order-dependent spec failure in appearance_spec.rb Closes #64083 See merge request gitlab-org/gitlab-ce!30323
* | Update CHANGELOG.md for 11.11.5v11.11.5GitLab Release Tools Bot2019-07-011-0/+1
| | | | | | [ci skip]
* | Merge branch 'security-support-object-storage-at-file-mover-11-11' into ↵Marin Jankovski2019-07-012-54/+126
|\ \ | | | | | | | | | | | | | | | | | | '11-11-stable' Support object storage at FileMover class See merge request gitlab/gitlabhq!3196
| * | Support object storage at FileMover classOswaldo Ferreira2019-06-302-54/+126
|/ /
* | Update VERSION to 11.11.5GitLab Release Tools Bot2019-06-271-1/+1
| |
* | Update CHANGELOG.md for 11.11.5GitLab Release Tools Bot2019-06-2711-50/+16
|/ | | [ci skip]
* Merge branch 'security-notes-in-private-snippets-11-11' into '11-11-stable'GitLab Release Tools Bot2019-06-265-10/+132
|\ | | | | | | | | Ability to write a note in a private snippet See merge request gitlab/gitlabhq!3141
| * Correctly check permissions when creating snippet notesMarkus Koller2019-06-065-10/+132
| | | | | | | | | | | | | | | | | | | | In the Snippets::NotesController the noteable was resolved and authorized through the :snippet_id, so by passing a :target_id for a different snippet it was possible to create a note on a snippet where the user would be unauthorized to do so otherwise. This fixes the problem by ignoring the :target_id and :target_type from the request, and using the same noteable for creation and authorization.
* | Merge branch 'security-fp-prevent-billion-laughs-attack-11-11' into ↵GitLab Release Tools Bot2019-06-267-8/+249
|\ \ | | | | | | | | | | | | | | | | | | '11-11-stable' Prevent Billion Laughs attack See merge request gitlab/gitlabhq!3144
| * | Prevent Billion Laughs attackFabio Pitino2019-06-077-8/+249
| |/ | | | | | | | | | | It keeps track of the memory being used when loading the YAML file as well as the depth of nesting. Track exception when YAML is too big
* | Merge branch ↵GitLab Release Tools Bot2019-06-266-32/+130
|\ \ | | | | | | | | | | | | | | | | | | 'security-prevent-detection-of-merge-request-template-name-11-11' into '11-11-stable' Guests can know whether merge request template name exists or not See merge request gitlab/gitlabhq!3149
| * | Authorize access before serving project templateLuke Duncalfe2019-06-126-32/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if a user was a guest member of a private project, they could access the merge request template as we were not checking permission-levels of the user. When a issue template is asked for, the user must have :read_issue for the project; or :read_merge_request when a merge request template is asked for. We also now rescue_from FileNotFoundError and handle as 404. This is because RepoTemplateFinder can raise a FileNotFoundError exception, which Rails previously handled as a 500. Handling these in a way that is consistent with ActiveRecord::RecordNotFound exceptions, within controllers that inherit from Projects::ApplicationController at least, and returning a 404. https://gitlab.com/gitlab-org/gitlab-ce/issues/54943
* | | Merge branch 'security-11-11-mr-head-pipeline-leak' into '11-11-stable'GitLab Release Tools Bot2019-06-263-1/+33
|\ \ \ | | | | | | | | | | | | | | | | Fix MR head pipeline leak See merge request gitlab/gitlabhq!3155
| * | | Add CHANGELOG entryMatija Čupić2019-06-121-0/+5
| | | |
| * | | Gate MR head_pipeline behind read_pipeline abilityMatija Čupić2019-06-122-1/+28
| |/ /
* | | Merge branch 'security-DOS_issue_comments_banzai-11-11' into '11-11-stable'GitLab Release Tools Bot2019-06-263-1/+11
|\ \ \ | | | | | | | | | | | | | | | | Fix DOS when rendering issue/MR comments See merge request gitlab/gitlabhq!3158