[New] Allow to pass password encoding in REST API Request
This commit is contained in:
parent
d15d351b70
commit
edac05f9d8
|
@ -80,7 +80,13 @@ public class AuthenticationService {
|
||||||
String passwordEncoded = login.get("password").getAsString();
|
String passwordEncoded = login.get("password").getAsString();
|
||||||
|
|
||||||
byte[] decode = Base64.getDecoder().decode(passwordEncoded);
|
byte[] decode = Base64.getDecoder().decode(passwordEncoded);
|
||||||
String passwordString = new String(decode);
|
String passwordString;
|
||||||
|
if (login.has("encoding") && !login.get("encoding").getAsString().isEmpty()) {
|
||||||
|
passwordString = new String(decode, login.get("encoding").getAsString());
|
||||||
|
} else {
|
||||||
|
passwordString = new String(decode);
|
||||||
|
}
|
||||||
|
|
||||||
char[] password = passwordString.toCharArray();
|
char[] password = passwordString.toCharArray();
|
||||||
if (password.length < 3) {
|
if (password.length < 3) {
|
||||||
logger.error("Authentication failed: Password was not given or is too short!");
|
logger.error("Authentication failed: Password was not given or is too short!");
|
||||||
|
|
|
@ -280,7 +280,12 @@ public class PrivilegeUsersService {
|
||||||
|
|
||||||
String passwordEncoded = jsonObject.get("password").getAsString();
|
String passwordEncoded = jsonObject.get("password").getAsString();
|
||||||
byte[] decode = Base64.getDecoder().decode(passwordEncoded);
|
byte[] decode = Base64.getDecoder().decode(passwordEncoded);
|
||||||
String passwordString = new String(decode);
|
String passwordString;
|
||||||
|
if (jsonObject.has("encoding") && !jsonObject.get("encoding").getAsString().isEmpty()) {
|
||||||
|
passwordString = new String(decode, jsonObject.get("encoding").getAsString());
|
||||||
|
} else {
|
||||||
|
passwordString = new String(decode);
|
||||||
|
}
|
||||||
|
|
||||||
ServiceHandler svcHandler = RestfulStrolchComponent.getInstance().getComponent(ServiceHandler.class);
|
ServiceHandler svcHandler = RestfulStrolchComponent.getInstance().getComponent(ServiceHandler.class);
|
||||||
PrivilegeSetUserPasswordService svc = new PrivilegeSetUserPasswordService();
|
PrivilegeSetUserPasswordService svc = new PrivilegeSetUserPasswordService();
|
||||||
|
|
Loading…
Reference in New Issue