Skip to content
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

fix: To avoid converting null to "null", skip null passwords #5057

Merged
merged 3 commits into from
Dec 29, 2023
Merged

fix: To avoid converting null to "null", skip null passwords #5057

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bc76f3
Update RestfulApiHelper.java
chenmutime Dec 25, 2023
7b14ade
fix: add missing import
chenmutime Dec 26, 2023
844ff90
fix: format code using mvn
chenmutime Dec 28, 2023
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
10 changes: 6 additions & 4 deletions ...rver/src/main/java/org/apache/linkis/datasourcemanager/core/restful/RestfulApiHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,11 @@ public static void encryptPasswordKey(
keyDefinitionList.forEach(
keyDefinition -> {
if (keyDefinition.getValueType() == DataSourceParamKeyDefinition.ValueType.PASSWORD) {
String password = String.valueOf(connectParams.get(keyDefinition.getKey()));
Object password = connectParams.get(keyDefinition.getKey());
if (null != password) {
connectParams.put(
keyDefinition.getKey(), new String(new Base64().encode(password.getBytes())));
keyDefinition.getKey(),
new String(new Base64().encode(String.valueOf(password).getBytes())));
}
}
});
Expand All @@ -86,10 +87,11 @@ public static void decryptPasswordKey(
keyDefinitionList.forEach(
keyDefinition -> {
if (keyDefinition.getValueType() == DataSourceParamKeyDefinition.ValueType.PASSWORD) {
String password = String.valueOf(connectParams.get(keyDefinition.getKey()));
Object password = connectParams.get(keyDefinition.getKey());
if (null != password) {
connectParams.put(
keyDefinition.getKey(), new String(new Base64().decode(password.getBytes())));
keyDefinition.getKey(),
new String(new Base64().decode(String.valueOf(password).getBytes())));
}
}
});
Expand Down
Loading