Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
bc4efd18
Commit
bc4efd18
authored
Jul 19, 2019
by
Etienne Baqué
Committed by
Stan Hu
Aug 26, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed rubocop disable flags, updated changelog
parent
64e24d64
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
changelogs/unreleased/63502-encrypt-deploy-token.yml
changelogs/unreleased/63502-encrypt-deploy-token.yml
+2
-2
lib/gitlab/auth.rb
lib/gitlab/auth.rb
+0
-2
No files found.
changelogs/unreleased/63502-encrypt-deploy-token.yml
View file @
bc4efd18
---
title
:
Encrypt existing
deploy tokens and new ones when storing them
title
:
Encrypt existing
and new deploy tokens
merge_request
:
30679
author
:
type
:
security
type
:
other
lib/gitlab/auth.rb
View file @
bc4efd18
...
...
@@ -198,7 +198,6 @@ module Gitlab
end
.
uniq
end
# rubocop: disable CodeReuse/ActiveRecord
def
deploy_token_check
(
login
,
password
)
return
unless
password
.
present?
...
...
@@ -213,7 +212,6 @@ module Gitlab
Gitlab
::
Auth
::
Result
.
new
(
token
,
token
.
project
,
:deploy_token
,
scopes
)
end
end
# rubocop: enable CodeReuse/ActiveRecord
def
lfs_token_check
(
login
,
encoded_token
,
project
)
deploy_key_matches
=
login
.
match
(
/\Alfs\+deploy-key-(\d+)\z/
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment