Fix for list-zones and change-password commands

Author: fabiorauber

.gitignore

@@ -1,2 +1,3 @@
 *.log
 build
+dnsshim-dist

ChangeLog

@@ -1,5 +1,8 @@
 DNSSHIM: NIC.br's DNS Secure Hidden Master
 
+version 2.2.1
+	* Fix for list-zones and change-password
+
 version 2.2
 	* TLS certificate import fix
 	* overwrite_mname is now an option on xfrd config file

src/br/registro/dnsshim/xfrd/service/UserServiceImpl.java

@@ -82,7 +82,10 @@ public Response addUser(AddUserRequest request)
 	public Response changePassword(ChangePasswordRequest request)
 		throws DnsshimProtocolException {
 		DnsshimSession dnsshimSession = sessionCache.get(request.getSessionId());
-		String username = (String) dnsshimSession.getAttribute("username");
+		
+		User sessionUser = (User) dnsshimSession.getAttribute("user");
+		String username = sessionUser.getUsername();
+		
 		if (!username.equalsIgnoreCase(request.getUsername())) {
 			throw new DnsshimProtocolException(ProtocolStatusCode.INVALID_USER, "Invalid user");
 		}
@@ -102,6 +105,7 @@ public Response changePassword(ChangePasswordRequest request)
 		if (logger.isInfoEnabled()) {
 			logger.info("Password changed for user " + username);
 		}
+		
 		Response response = new Response();
 		response.setMsg("Password has been changed");
 		return response;

src/br/registro/dnsshim/xfrd/service/ZoneServiceImpl.java

@@ -286,7 +286,10 @@ public ListZonesResponse listZones(ListZonesRequest request) throws IOException,
 		ListZonesResponse response = new ListZonesResponse();
 		DnsshimSessionCache dnsshimSessionCache = DnsshimSessionCache.getInstance();
 		DnsshimSession session = dnsshimSessionCache.get(request.getSessionId());
-		String username = (String) session.getAttribute("username");
+		
+		User user = (User) session.getAttribute("user");
+		String username = user.getUsername();
+		
 		List<ZoneInfo> zones = zoneInfoDao.findByUser(username);
 		for (ZoneInfo zone : zones) {
 			response.addZonename(zone.getZonename());