Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
devops-workshop
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Henning Sara Strandå
devops-workshop
Merge requests
!1
Feat/password hashing
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Feat/password hashing
feat/password_hashing
into
master
Overview
0
Commits
2
Pipelines
0
Changes
1
Merged
Ole Fredrik Høivang Heggum
requested to merge
feat/password_hashing
into
master
2 years ago
Overview
0
Commits
2
Pipelines
0
Changes
1
Expand
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
342a4373
2 commits,
2 years ago
1 file
+
20
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
src/main/java/dao/UserDAO.java
+
20
−
1
Options
@@ -2,7 +2,9 @@ package dao;
import
data.User
;
import
java.io.UnsupportedEncodingException
;
import
java.nio.charset.StandardCharsets
;
import
java.security.DigestException
;
import
java.security.MessageDigest
;
import
java.security.NoSuchAlgorithmException
;
import
java.security.SecureRandom
;
@@ -194,7 +196,24 @@ public class UserDAO {
* @return hashedPassword, null if unsuccessful
*/
public
String
hashPassword
(
String
password
,
byte
[]
salt
)
{
return
null
;
MessageDigest
md
;
byte
[]
encodedHash
;
try
{
byte
[]
bytesOfPassword
=
password
.
getBytes
(
StandardCharsets
.
UTF_8
);
md
=
MessageDigest
.
getInstance
(
"SHA-512"
);
md
.
update
(
salt
);
encodedHash
=
md
.
digest
(
bytesOfPassword
);
}
catch
(
NoSuchAlgorithmException
e
)
{
throw
new
RuntimeException
(
e
);
}
StringBuilder
stringBuilder
=
new
StringBuilder
();
for
(
byte
b
:
encodedHash
)
{
stringBuilder
.
append
(
Integer
.
toString
((
b
&
0xff
)
+
0x100
,
16
).
substring
(
1
));
}
return
stringBuilder
.
toString
();
}
/**
Loading