etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 5871: removing the NDC since there is no nested context involved in the audit trail and since its leaking into the management server logs.

This commit is contained in:
nit 2010-10-05 19:51:12 +05:30
parent 426767f9f1
commit f7f2b5666a
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/api/ApiServer.java
View File

@ -74,7 +74,6 @@ import org.apache.http.protocol.ResponseContent;
import org.apache.http.protocol.ResponseDate;
import org.apache.http.protocol.ResponseServer;
import org.apache.log4j.Logger;
import org.apache.log4j.NDC;
import com.cloud.configuration.ConfigurationVO;
import com.cloud.configuration.dao.ConfigurationDao;
@ -237,7 +236,7 @@ public class ApiServer implements HttpRequestHandler {
try {
// always trust commands from API port, user context will always be UID_SYSTEM/ACCOUNT_ID_SYSTEM
UserContext.registerContext(User.UID_SYSTEM, Account.ACCOUNT_ID_SYSTEM, null, true);
NDC.push("userId="+User.UID_SYSTEM+ " accountId="+Account.ACCOUNT_ID_SYSTEM+ " sessionId="+null );
sb.insert(0,"(userId="+User.UID_SYSTEM+ " accountId="+Account.ACCOUNT_ID_SYSTEM+ " sessionId="+null+ ") " );
String responseText = handleRequest(parameterMap, true, responseType, sb);
writeResponse(response, responseText, false, responseType);
} catch (ServerApiException se) {
@ -261,7 +260,6 @@ public class ApiServer implements HttpRequestHandler {
}
} finally {
s_accessLogger.info(sb.toString());
NDC.remove();
UserContext.unregisterContext();
}
}

16
server/src/com/cloud/api/ApiServlet.java
View File

@ -31,7 +31,6 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.log4j.Logger;
import org.apache.log4j.NDC;
import com.cloud.maid.StackMaid;
import com.cloud.user.Account;
@ -73,7 +72,7 @@ public class ApiServlet extends HttpServlet {
@SuppressWarnings("unchecked")
private void processRequest(HttpServletRequest req, HttpServletResponse resp) {
StringBuffer auditTrailSb = new StringBuffer();
auditTrailSb.append(req.getRemoteAddr());
auditTrailSb.append(" " +req.getRemoteAddr());
auditTrailSb.append(" -- " + req.getMethod() + " " );
try {
Map<String, Object[]> params = new HashMap<String, Object[]>();
@ -95,9 +94,9 @@ public class ApiServlet extends HttpServlet {
if (session != null) {
String userIdStr = (String)session.getAttribute(BaseCmd.Properties.USER_ID.getName());
Account account = (Account)session.getAttribute(BaseCmd.Properties.ACCOUNT_OBJ.getName());
NDC.push("userId="+userIdStr+
auditTrailSb.insert(0, "(userId="+userIdStr+
" accountId="+ account==null ? null:account.getId()+
" sessionId="+session.getId() );
" sessionId="+session.getId() +")" );
if (userIdStr != null) {
_apiServer.logoutUser(Long.parseLong(userIdStr));
}
@ -156,9 +155,9 @@ public class ApiServlet extends HttpServlet {
for (Pair<String, Object> sessionParam : sessionParams) {
session.setAttribute(sessionParam.first(), sessionParam.second());
}
NDC.push("userId="+session.getAttribute(BaseCmd.Properties.USER_ID.getName())+
auditTrailSb.insert(0,"(userId="+session.getAttribute(BaseCmd.Properties.USER_ID.getName())+
" accountId="+ ((Account)session.getAttribute(BaseCmd.Properties.ACCOUNT_OBJ.getName())).getId()+
" sessionId="+session.getId() );
" sessionId="+session.getId()+ ")" );
String loginResponse = getLoginSuccessResponse(session, responseType);
auditTrailSb.append(" " +HttpServletResponse.SC_OK);
writeResponse(resp, loginResponse, false, responseType);
@ -239,6 +238,7 @@ public class ApiServlet extends HttpServlet {
// update user context info here so that we can take information if the request is authenticated
// via api key mechanism
updateUserContext(params, session != null ? session.getId() : null);
auditTrailSb.insert(0, "(userId="+UserContext.current().getUserId()+ " accountId="+UserContext.current().getAccountId()+ " sessionId="+(session != null ? session.getId() : null)+ ")" );
try {
String response = _apiServer.handleRequest(params, false, responseType, auditTrailSb);
writeResponse(resp, response != null ? response : "", false, responseType);
@ -265,7 +265,6 @@ public class ApiServlet extends HttpServlet {
s_accessLogger.info(auditTrailSb.toString());
// cleanup user context to prevent from being peeked in other request context
UserContext.unregisterContext();
NDC.remove();
}
}
@ -279,8 +278,7 @@ public class ApiServlet extends HttpServlet {
userId = Long.parseLong(userIdStr);
if(accountObj != null)
accountId = accountObj.getId();
NDC.push("userId="+userId+ " accountId="+accountId+ " sessionId="+sessionId );
accountId = accountObj.getId();
UserContext.updateContext(userId, accountId, sessionId);
}