Skip to content
Snippets Groups Projects

Encrypt runners tokens

Merged Grzegorz Bizon requested to merge fix/gb/encrypt-runners-tokens into master

What does this MR do?

This merge request adds encryption support for some tokens related to CI/CD runners.

What are the relevant issue numbers?

Closes #52931
Closes #51232

Does this MR meet the acceptance criteria?

Edited by 🤖 GitLab Bot 🤖

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Moving this merge request from dev.gitlab.org, as per https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2639#note_141633 /cc @nick.thomas @godfat

  • Grzegorz Bizon added security + 1 deleted label

    added security + 1 deleted label

  • 3 Warnings
    :warning: This merge request is quite big (more than 1063 lines changed), please consider splitting it into multiple merge requests.
    :warning: This merge request adds files that do not enforce frozen string literal. See https://gitlab.com/gitlab-org/gitlab-ce/issues/47424 for more information.
    :warning: This merge request includes more than 10 commits. Please rebase these commits into a smaller number of commits.
    1 Message
    :book: This merge request adds or changes files that require a review from the Database team.

    Database Review

    The following files require a review from the Database team:

    • db/migrate/20181115140140_add_encrypted_runners_token_to_settings.rb
    • db/migrate/20181116141415_add_encrypted_runners_token_to_namespaces.rb
    • db/migrate/20181116141504_add_encrypted_runners_token_to_projects.rb
    • db/migrate/20181120151656_add_token_encrypted_to_ci_runners.rb
    • db/post_migrate/20181121111200_schedule_runners_token_encryption.rb
    • db/schema.rb
    • lib/gitlab/background_migration/encrypt_columns.rb
    • lib/gitlab/background_migration/encrypt_runners_tokens.rb
    • lib/gitlab/background_migration/models/encrypt_columns/namespace.rb
    • lib/gitlab/background_migration/models/encrypt_columns/project.rb
    • lib/gitlab/background_migration/models/encrypt_columns/runner.rb
    • lib/gitlab/background_migration/models/encrypt_columns/settings.rb
    • lib/gitlab/background_migration/models/encrypt_columns/web_hook.rb

    To make sure these changes are reviewed, take the following steps:

    1. Edit your merge request, and add gl-database to the list of Group approvers.
    2. Mention @gl-database in a separate comment, and explain what needs to be reviewed by the team. Please don't mention the team until your changes are ready for review.

    Enable Frozen String Literal

    The following files should have # frozen_string_literal: true on the first line:

    • spec/lib/gitlab/background_migration/encrypt_runners_tokens_spec.rb
    • spec/lib/gitlab/crypto_helper_spec.rb
    • spec/migrations/schedule_runners_token_encryption_spec.rb
    • spec/models/concerns/token_authenticatable_strategies/base_spec.rb
    • spec/models/concerns/token_authenticatable_strategies/encrypted_spec.rb

    Generated by :no_entry_sign: Danger

    Edited by 🤖 GitLab Bot 🤖
  • Grzegorz Bizon added 398 commits

    added 398 commits

    Compare with previous version

  • Grzegorz Bizon unmarked as a Work In Progress

    unmarked as a Work In Progress

  • Grzegorz Bizon changed the description

    changed the description

  • @abrandl Can you please review database changes here?

    @nick.thomas @godfat can you take a look at backend code for the last time?

    Thanks in advance!

  • assigned to @abrandl

  • Grzegorz Bizon added 1 commit

    added 1 commit

    • 439d22b9 - Add changelog for runners token encryption fix

    Compare with previous version

  • added database label

  • Nick Thomas
  • Nick Thomas
  • Nick Thomas
  • mentioned in issue #53659 (closed)

  • Thanks @grzesiek , just minor things from my point of view now. I think this is about ready!

  • Grzegorz Bizon resolved all discussions

    resolved all discussions

  • Grzegorz Bizon added 93 commits

    added 93 commits

    Compare with previous version

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading