apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Temp fix to encode username, account name, and email before they are returned from the API"

Browse Source 
This reverts commit e07221761a57b2c3df715bd939734f6661ebd976.
This commit is contained in:
alena 2011-06-10 10:45:34 -07:00
parent 1e9efb2f86
commit f4ad575270
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -17,7 +17,6 @@
*/ */
package com.cloud.api; package com.cloud.api;
import java.net.URLEncoder;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
@ -220,7 +219,7 @@ public class ApiResponseHelper implements ResponseGenerator {
boolean accountIsAdmin = (account.getType() == Account.ACCOUNT_TYPE_ADMIN); boolean accountIsAdmin = (account.getType() == Account.ACCOUNT_TYPE_ADMIN);
AccountResponse accountResponse = new AccountResponse(); AccountResponse accountResponse = new AccountResponse();
accountResponse.setId(account.getId()); accountResponse.setId(account.getId());
accountResponse.setName(encodeParam(account.getAccountName())); accountResponse.setName(account.getAccountName());
accountResponse.setAccountType(account.getType()); accountResponse.setAccountType(account.getType());
accountResponse.setDomainId(account.getDomainId()); accountResponse.setDomainId(account.getDomainId());
accountResponse.setDomainName(ApiDBUtils.findDomainById(account.getDomainId()).getName()); accountResponse.setDomainName(ApiDBUtils.findDomainById(account.getDomainId()).getName());
@ -317,20 +316,20 @@ public class ApiResponseHelper implements ResponseGenerator {
List<UserResponse> userResponseList = new ArrayList<UserResponse>(); List<UserResponse> userResponseList = new ArrayList<UserResponse>();
for (UserVO user : usersForAccount) { for (UserVO user : usersForAccount) {
UserResponse userResponse = new UserResponse(); UserResponse userResponse = new UserResponse();
userResponse.setAccountName(encodeParam(account.getAccountName())); userResponse.setAccountName(account.getAccountName());
userResponse.setAccountType(account.getType()); userResponse.setAccountType(account.getType());
userResponse.setApiKey(user.getApiKey()); userResponse.setApiKey(user.getApiKey());
userResponse.setCreated(user.getCreated()); userResponse.setCreated(user.getCreated());
userResponse.setDomainId(account.getDomainId()); userResponse.setDomainId(account.getDomainId());
userResponse.setDomainName(ApiDBUtils.findDomainById(account.getDomainId()).getName()); userResponse.setDomainName(ApiDBUtils.findDomainById(account.getDomainId()).getName());
userResponse.setEmail(encodeParam(user.getEmail())); userResponse.setEmail(user.getEmail());
userResponse.setFirstname(user.getFirstname()); userResponse.setFirstname(user.getFirstname());
userResponse.setId(user.getId()); userResponse.setId(user.getId());
userResponse.setSecretKey(user.getSecretKey()); userResponse.setSecretKey(user.getSecretKey());
userResponse.setLastname(user.getLastname()); userResponse.setLastname(user.getLastname());
userResponse.setState(user.getState().toString()); userResponse.setState(user.getState().toString());
userResponse.setTimezone(user.getTimezone()); userResponse.setTimezone(user.getTimezone());
userResponse.setUsername(encodeParam(user.getUsername())); userResponse.setUsername(user.getUsername());
userResponseList.add(userResponse); userResponseList.add(userResponse);
} }
@ -2540,13 +2539,4 @@ public class ApiResponseHelper implements ResponseGenerator {
return sg.getId(); return sg.getId();
} }
} }
private String encodeParam(String value) {
try {
return URLEncoder.encode(value, "UTF-8").replaceAll("\\+", "%20");
} catch (Exception e) {
s_logger.warn("Unable to encode: " + value);
}
return value;
}
} }