From 13076511c60f62ce0f8baba22ca9b94755a7d3cb Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 6 Jan 2020 06:08:07 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../application_settings/_signup.html.haml | 2 ++ ...ation-setting-more-prominent-to-admins.yml | 5 +++ doc/api/group_milestones.md | 2 +- doc/api/milestones.md | 4 +-- .../contributing/issue_workflow.md | 2 +- doc/development/documentation/workflow.md | 2 +- doc/development/policies.md | 4 +-- .../testing_guide/end_to_end/index.md | 6 ++-- doc/install/README.md | 4 +++ doc/security/README.md | 6 ++++ .../settings/img/disable_signup_v12_7.png | Bin 0 -> 20061 bytes .../settings/img/email_confirmation.png | Bin 5239 -> 0 bytes .../settings/img/email_confirmation_v12_7.png | Bin 0 -> 24681 bytes .../settings/sign_up_restrictions.md | 30 +++++++++++++++--- doc/user/markdown.md | 2 +- .../project/new_ci_build_permissions_model.md | 4 +-- .../repository/repository_mirroring.md | 2 +- locale/gitlab.pot | 3 ++ .../discussion_notes_replies_wrapper_spec.js | 4 +-- 19 files changed, 62 insertions(+), 20 deletions(-) create mode 100644 changelogs/unreleased/30968-make-open-user-registration-setting-more-prominent-to-admins.yml create mode 100644 doc/user/admin_area/settings/img/disable_signup_v12_7.png delete mode 100644 doc/user/admin_area/settings/img/email_confirmation.png create mode 100644 doc/user/admin_area/settings/img/email_confirmation_v12_7.png diff --git a/app/views/admin/application_settings/_signup.html.haml b/app/views/admin/application_settings/_signup.html.haml index b9d9d86ca30..c29e52abaf6 100644 --- a/app/views/admin/application_settings/_signup.html.haml +++ b/app/views/admin/application_settings/_signup.html.haml @@ -7,6 +7,8 @@ = f.check_box :signup_enabled, class: 'form-check-input' = f.label :signup_enabled, class: 'form-check-label' do Sign-up enabled + .form-text.text-muted + = _("When enabled, any user visiting %{host} will be able to create an account.") % { host: "#{new_user_session_url(host: Gitlab.config.gitlab.host)}" } .form-group .form-check = f.check_box :send_user_confirmation_email, class: 'form-check-input' diff --git a/changelogs/unreleased/30968-make-open-user-registration-setting-more-prominent-to-admins.yml b/changelogs/unreleased/30968-make-open-user-registration-setting-more-prominent-to-admins.yml new file mode 100644 index 00000000000..dd7909c8756 --- /dev/null +++ b/changelogs/unreleased/30968-make-open-user-registration-setting-more-prominent-to-admins.yml @@ -0,0 +1,5 @@ +--- +title: Add documentation & helper text information regarding securing a GitLab instance +merge_request: 18987 +author: +type: changed diff --git a/doc/api/group_milestones.md b/doc/api/group_milestones.md index 61edd2522be..a77f12de5a1 100644 --- a/doc/api/group_milestones.md +++ b/doc/api/group_milestones.md @@ -98,7 +98,7 @@ Parameters: ## Delete group milestone -Only for user with developer access to the group. +Only for users with Developer access to the group. ``` DELETE /groups/:id/milestones/:milestone_id diff --git a/doc/api/milestones.md b/doc/api/milestones.md index 44844470430..f3a1b7323ec 100644 --- a/doc/api/milestones.md +++ b/doc/api/milestones.md @@ -96,7 +96,7 @@ Parameters: ## Delete project milestone -Only for user with developer access to the project. +Only for users with Developer access to the project. ``` DELETE /projects/:id/milestones/:milestone_id @@ -137,7 +137,7 @@ Parameters: > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/53861) in GitLab 11.9 -Only for users with developer access to the group. +Only for users with Developer access to the group. ``` POST /projects/:id/milestones/:milestone_id/promote diff --git a/doc/development/contributing/issue_workflow.md b/doc/development/contributing/issue_workflow.md index a385a7dc83a..1439c56983b 100644 --- a/doc/development/contributing/issue_workflow.md +++ b/doc/development/contributing/issue_workflow.md @@ -29,7 +29,7 @@ the affected files to find someone. We also use [GitLab Triage](https://gitlab.com/gitlab-org/gitlab-triage) to automate some triaging policies. This is currently set up as a scheduled pipeline (`https://gitlab.com/gitlab-org/quality/triage-ops/pipeline_schedules/10512/editpipeline_schedules/10512/edit`, -must have at least developer access to the project) running on [quality/triage-ops](https://gitlab.com/gitlab-org/quality/triage-ops) +must have at least Developer access to the project) running on [quality/triage-ops](https://gitlab.com/gitlab-org/quality/triage-ops) project. ## Labels diff --git a/doc/development/documentation/workflow.md b/doc/development/documentation/workflow.md index ae13bc63583..0e5da29df94 100644 --- a/doc/development/documentation/workflow.md +++ b/doc/development/documentation/workflow.md @@ -284,7 +284,7 @@ To update GitLab documentation: 1. Follow GitLab's [Merge Request Guidelines](../contributing/merge_request_workflow.md#merge-request-guidelines). TIP: **Tip:** -Work in a fork if you do not have developer access to the GitLab project. +Work in a fork if you do not have Developer access to the GitLab project. Request help from the Technical Writing team if you: diff --git a/doc/development/policies.md b/doc/development/policies.md index 8e5ef6e57c0..4d045411156 100644 --- a/doc/development/policies.md +++ b/doc/development/policies.md @@ -95,8 +95,8 @@ Each line represents a rule that was evaluated. There are a few things to note: Here you can see that the first four rules were evaluated `false` for which user and subject. For example, you can see in the last line that -the rule was activated because the user `root` had at reporter access to -the `Project/4`. +the rule was activated because the user `root` had Reporter access to +`Project/4`. When a policy is asked whether a particular ability is allowed (`policy.allowed?(:some_ability)`), it does not necessarily have to diff --git a/doc/development/testing_guide/end_to_end/index.md b/doc/development/testing_guide/end_to_end/index.md index 19885f5756f..20b594119ab 100644 --- a/doc/development/testing_guide/end_to_end/index.md +++ b/doc/development/testing_guide/end_to_end/index.md @@ -15,15 +15,15 @@ a black-box testing framework for the API and the UI. ### Testing nightly builds -We run scheduled pipeline each night to test nightly builds created by Omnibus. +We run scheduled pipelines each night to test nightly builds created by Omnibus. You can find these nightly pipelines at `https://gitlab.com/gitlab-org/quality/nightly/pipelines` (need Developer access permissions). Results are reported in the `#qa-nightly` Slack channel. ### Testing staging -We run scheduled pipeline each night to test staging. +We run scheduled pipelines each night to test staging. You can find these nightly pipelines at `https://gitlab.com/gitlab-org/quality/staging/pipelines` -(need developer access permissions). Results are reported in the `#qa-staging` Slack channel. +(need Developer access permissions). Results are reported in the `#qa-staging` Slack channel. ### Testing code in merge requests diff --git a/doc/install/README.md b/doc/install/README.md index 441826687aa..6b497763d93 100644 --- a/doc/install/README.md +++ b/doc/install/README.md @@ -87,3 +87,7 @@ the above methods, provided the cloud provider supports it. - [Install GitLab on DigitalOcean](https://about.gitlab.com/blog/2016/04/27/getting-started-with-gitlab-and-digitalocean/): Install Omnibus GitLab on DigitalOcean. - _Testing only!_ [DigitalOcean and Docker Machine](digitaloceandocker.md): Quickly test any version of GitLab on DigitalOcean using Docker Machine. + +## Securing your GitLab installation + +After completing your installation, check out our [recommended practices to secure your GitLab instance](../security/README.md#securing-your-gitlab-installation). diff --git a/doc/security/README.md b/doc/security/README.md index fe96f7f2846..20da1a2c77c 100644 --- a/doc/security/README.md +++ b/doc/security/README.md @@ -19,3 +19,9 @@ type: index - [Send email confirmation on sign-up](user_email_confirmation.md) - [Security of running jobs](https://docs.gitlab.com/runner/security/) - [Proxying images](asset_proxy.md) + +## Securing your GitLab installation + +To make sure your GitLab instance is safe and secure, please consider implementing +[Sign up restrictions](../user/admin_area/settings/sign_up_restrictions.md) to avoid +malicious users creating accounts. diff --git a/doc/user/admin_area/settings/img/disable_signup_v12_7.png b/doc/user/admin_area/settings/img/disable_signup_v12_7.png new file mode 100644 index 0000000000000000000000000000000000000000..278d6e84e2690df83406e193664b1dbe0c7a832f GIT binary patch literal 20061 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
  • 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 XzTBXk{-N;am!P4piB5&q-I)IZ!bBEw diff --git a/doc/user/admin_area/settings/img/email_confirmation_v12_7.png b/doc/user/admin_area/settings/img/email_confirmation_v12_7.png new file mode 100644 index 0000000000000000000000000000000000000000..22004fb98efc005083dcecc5ed7b08713918f61d GIT binary patch literal 24681 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

    0Ht^ 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: These restrictions are only applied during sign-up. An admin is +- Disable new signups. +- Require user email confirmation. +- Blacklist or whitelist email addresses belonging to specific domains. + +NOTE: **Note:** +These restrictions are only applied during sign-up from an external user. An admin is able to add a user through the admin panel with a disallowed domain. Also note that the users can change their email addresses after signup to disallowed domains. +## Disable new signups + +When this setting is enabled, any user visiting your GitLab domain will be able to sign up for an account. + +![Disable signups](img/disable_signup_v12_7.png) + +You can restrict new users from signing up by themselves for an account in your instance by disabling this setting. + +### Recommendations + +For customers running public facing GitLab instances, we highly recommend that you +consider disabling new signups if you do not expect public users to sign up for an +account. + +Alternatively, you could also consider setting up a +[whitelist](#whitelist-email-domains) or [blacklist](#blacklist-email-domains) on +email domains to prevent malicious users from creating accounts. + ## Require email confirmation You can send confirmation emails during sign-up and require that users confirm their email address before they are allowed to sign in. -![Email confirmation](img/email_confirmation.png) +![Email confirmation](img/email_confirmation_v12_7.png) ## Minimum password length limit diff --git a/doc/user/markdown.md b/doc/user/markdown.md index fdf6cb3c7be..82d37c54fd4 100644 --- a/doc/user/markdown.md +++ b/doc/user/markdown.md @@ -160,7 +160,7 @@ It is possible to generate diagrams and flowcharts from text in GitLab using [Me > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/15107) in GitLab 10.3. -Visit the [official page](https://mermaidjs.github.io/) for more details. +Visit the [official page](https://mermaidjs.github.io/) for more details. If you are new to using Mermaid or need help identifying issues in your Mermaid code, the [Mermaid Live Editor](https://mermaid-js.github.io/mermaid-live-editor/) is a helpful tool for creating and resolving issues within Mermaid diagrams. In order to generate a diagram or flowchart, you should write your text inside the `mermaid` block: diff --git a/doc/user/project/new_ci_build_permissions_model.md b/doc/user/project/new_ci_build_permissions_model.md index 5f3bb83df70..d1bb23396e4 100644 --- a/doc/user/project/new_ci_build_permissions_model.md +++ b/doc/user/project/new_ci_build_permissions_model.md @@ -48,7 +48,7 @@ It is important to note that we have a few types of users: via another project's job. - **External users**: CI jobs created by [external users](../permissions.md#external-users-core-only) will have - access only to projects to which user has at least reporter access. This + access only to projects to which the user has at least Reporter access. This rules out accessing all internal projects by default. This allows us to make the CI and permission system more trustworthy. @@ -114,7 +114,7 @@ docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com Using single token had multiple security implications: -- The token would be readable to anyone who had developer access to a project +- The token would be readable to anyone who had Developer access to a project that could run CI jobs, allowing the developer to register any specific Runner for that project. - The token would allow to access only the project's sources, forbidding from diff --git a/doc/user/project/repository/repository_mirroring.md b/doc/user/project/repository/repository_mirroring.md index 993c96d2ae4..6da745a8772 100644 --- a/doc/user/project/repository/repository_mirroring.md +++ b/doc/user/project/repository/repository_mirroring.md @@ -22,7 +22,7 @@ There are two kinds of repository mirroring supported by GitLab: When the mirror repository is updated, all new branches, tags, and commits will be visible in the project's activity feed. -Users with at least [developer access](../../permissions.md) to the project can also force an +Users with at least [Developer access](../../permissions.md) to the project can also force an immediate update, unless: - The mirror is already being updated. diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 7dff8495b06..c2cbc312d7e 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -20423,6 +20423,9 @@ msgstr "" msgid "When a runner is locked, it cannot be assigned to other projects" msgstr "" +msgid "When enabled, any user visiting %{host} will be able to create an account." +msgstr "" + msgid "When enabled, users cannot use GitLab until the terms have been accepted." msgstr "" diff --git a/spec/frontend/notes/components/discussion_notes_replies_wrapper_spec.js b/spec/frontend/notes/components/discussion_notes_replies_wrapper_spec.js index 279ca017b44..0d6720e26e1 100644 --- a/spec/frontend/notes/components/discussion_notes_replies_wrapper_spec.js +++ b/spec/frontend/notes/components/discussion_notes_replies_wrapper_spec.js @@ -30,7 +30,7 @@ describe('DiscussionNotesRepliesWrapper', () => { }); it('renders children directly', () => { - expect(wrapper.html()).toEqual(`

      ${TEST_CHILDREN}
    `); + expect(wrapper.element.outerHTML).toEqual(`
      ${TEST_CHILDREN}
    `); }); }); @@ -45,7 +45,7 @@ describe('DiscussionNotesRepliesWrapper', () => { const notes = wrapper.find('li.discussion-collapsible ul.notes'); expect(notes.exists()).toBe(true); - expect(notes.html()).toEqual(`
      ${TEST_CHILDREN}
    `); + expect(notes.element.outerHTML).toEqual(`
      ${TEST_CHILDREN}
    `); }); }); });