Skip to content

dbeaver/pro#4569 fix tests #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HocKu7 wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

dbeaver/pro#4569 fix tests #157

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions modules/org.jkiss.utils/src/org/jkiss/utils/SecurityUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2024 DBeaver Corp and others
* Copyright (C) 2010-2025 DBeaver Corp and others
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -29,7 +29,8 @@
*/
public class SecurityUtils {

public static String ECRYPTION_ALGORYTHM = "MD5";
public static String HASH_ALGORYTHM_MD5 = "MD5";
public static String HASH_ALGORYTHM_SHA = "SHA-256";

private static java.util.Random random;
private static java.util.Random secureRand;
Expand Down Expand Up @@ -80,7 +81,7 @@

byte[] array;
try {
MessageDigest md5 = MessageDigest.getInstance(ECRYPTION_ALGORYTHM);
MessageDigest md5 = MessageDigest.getInstance(HASH_ALGORYTHM_MD5);
md5.update(sb.toString().getBytes(StandardCharsets.UTF_8));
array = md5.digest();
} catch (NoSuchAlgorithmException e) {
Expand Down Expand Up @@ -132,7 +133,7 @@
userPassword = "";
}
MessageDigest md5 =
MessageDigest.getInstance(ECRYPTION_ALGORYTHM);
MessageDigest.getInstance(HASH_ALGORYTHM_MD5);
md5.update(userAlias.getBytes(StandardCharsets.UTF_8));

return CommonUtils.toHexString(md5.digest(userPassword.getBytes(StandardCharsets.UTF_8)));
Expand All @@ -141,11 +142,23 @@
}
}

public static String makeDigestSha(
String userPassword) {
try {
MessageDigest sha =
MessageDigest.getInstance(HASH_ALGORYTHM_SHA);

return CommonUtils.toHexString(sha.digest(userPassword.getBytes(StandardCharsets.UTF_8)));
} catch (NoSuchAlgorithmException toCatch) {
return "*";
}
}

public static String makeDigest(

Check warning on line 157 in modules/org.jkiss.utils/src/org/jkiss/utils/SecurityUtils.java

View workflow job for this annotation

GitHub Actions / Check / Lint 

[checkstyle] reported by reviewdog 🐶
All overloaded methods should be placed next to each other. Previous overloaded method located at line '128'.

Raw Output:
/github/workspace/./modules/org.jkiss.utils/src/org/jkiss/utils/SecurityUtils.java:157:5: warning: All overloaded methods should be placed next to each other. Previous overloaded method located at line '128'. (com.puppycrawl.tools.checkstyle.checks.coding.OverloadMethodsDeclarationOrderCheck)
String userPassword) {
try {
MessageDigest md5 =
MessageDigest.getInstance(ECRYPTION_ALGORYTHM);
MessageDigest.getInstance(HASH_ALGORYTHM_MD5);

return CommonUtils.toHexString(md5.digest(userPassword.getBytes(StandardCharsets.UTF_8)));
} catch (NoSuchAlgorithmException toCatch) {
Expand Down
Loading