Return-Path: X-Original-To: apmail-incubator-cloudstack-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 67BBAC802 for ; Mon, 11 Jun 2012 07:41:52 +0000 (UTC) Received: (qmail 91229 invoked by uid 500); 11 Jun 2012 07:41:52 -0000 Delivered-To: apmail-incubator-cloudstack-dev-archive@incubator.apache.org Received: (qmail 91084 invoked by uid 500); 11 Jun 2012 07:41:51 -0000 Mailing-List: contact cloudstack-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-dev@incubator.apache.org Received: (qmail 91063 invoked by uid 99); 11 Jun 2012 07:41:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Jun 2012 07:41:50 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of saksham.srivastava@citrix.com designates 66.165.176.63 as permitted sender) Received: from [66.165.176.63] (HELO SMTP02.CITRIX.COM) (66.165.176.63) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Jun 2012 07:41:43 +0000 X-IronPort-AV: E=Sophos;i="4.75,748,1330923600"; d="scan'208,217";a="198230430" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 11 Jun 2012 03:41:22 -0400 Received: from [10.144.7.40] (10.144.7.40) by FTLPMAILMX01.citrite.net (10.13.107.65) with Microsoft SMTP Server id 8.3.213.0; Mon, 11 Jun 2012 03:41:21 -0400 Message-ID: <4FD5A11F.1000007@citrix.com> Date: Mon, 11 Jun 2012 13:11:19 +0530 From: Saksham Srivastava User-Agent: Mozilla/5.0 (X11; Linux i686; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 MIME-Version: 1.0 To: "cloudstack-dev@incubator.apache.org" , Saksham Srivastava Subject: Can someone kindly review and apply the patch. [CS-15018] References: <1338823435-21258-1-git-send-email-saksham.srivastava@citrix.com> In-Reply-To: <1338823435-21258-1-git-send-email-saksham.srivastava@citrix.com> X-Forwarded-Message-Id: <1338823435-21258-1-git-send-email-saksham.srivastava@citrix.com> Content-Type: multipart/alternative; boundary="------------060109000206080702050103" --------------060109000206080702050103 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit -------- Original Message -------- Subject: [PATCH] CS-15018: Event USER.LOGIN should contain the client IP address. Changes made in accordance with the coding convention. Date: Mon, 4 Jun 2012 11:23:55 -0400 From: Saksham Srivastava To: cloudstack-dev@incubator.apache.org CC: Saksham Srivastava Signed-off-by: saksham --- server/src/com/cloud/api/ApiServer.java | 4 ++-- server/src/com/cloud/api/ApiServlet.java | 2 +- server/src/com/cloud/user/AccountManager.java | 2 +- server/src/com/cloud/user/AccountManagerImpl.java | 4 ++-- .../com/cloud/user/MockAccountManagerImpl.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java index 83133e4..fc52e06 100755 --- a/server/src/com/cloud/api/ApiServer.java +++ b/server/src/com/cloud/api/ApiServer.java @@ -773,7 +773,7 @@ public class ApiServer implements HttpRequestHandler { } } - public void loginUser(HttpSession session, String username, String password, Long domainId, String domainPath, Map requestParameters) throws CloudAuthenticationException { + public void loginUser(HttpSession session, String username, String password, Long domainId, String domainPath, String loginIpAddress ,Map requestParameters) throws CloudAuthenticationException { // We will always use domainId first. If that does not exist, we will use domain name. If THAT doesn't exist // we will default to ROOT if (domainId == null) { @@ -789,7 +789,7 @@ public class ApiServer implements HttpRequestHandler { } } - UserAccount userAcct = _accountMgr.authenticateUser(username, password, domainId, requestParameters); + UserAccount userAcct = _accountMgr.authenticateUser(username, password, domainId, loginIpAddress, requestParameters); if (userAcct != null) { String timezone = userAcct.getTimezone(); float offsetInHrs = 0f; diff --git a/server/src/com/cloud/api/ApiServlet.java b/server/src/com/cloud/api/ApiServlet.java index b7b7fff..a0da657 100755 --- a/server/src/com/cloud/api/ApiServlet.java +++ b/server/src/com/cloud/api/ApiServlet.java @@ -203,7 +203,7 @@ public class ApiServlet extends HttpServlet { if (username != null) { String pwd = ((password == null) ? null : password[0]); try { - _apiServer.loginUser(session, username[0], pwd, domainId, domain, params); + _apiServer.loginUser(session, username[0], pwd, domainId, domain, req.getRemoteAddr(), params); auditTrailSb.insert(0, "(userId=" + session.getAttribute("userid") + " accountId=" + ((Account) session.getAttribute("accountobj")).getId() + " sessionId=" + session.getId() + ")"); String loginResponse = getLoginSuccessResponse(session, responseType); diff --git a/server/src/com/cloud/user/AccountManager.java b/server/src/com/cloud/user/AccountManager.java index a7f5a68..4c18f63 100755 --- a/server/src/com/cloud/user/AccountManager.java +++ b/server/src/com/cloud/user/AccountManager.java @@ -71,7 +71,7 @@ public interface AccountManager extends AccountService { * made, and the signature itself in the single sign-on case * @return a user object, null if the user failed to authenticate */ - UserAccount authenticateUser(String username, String password, Long domainId, Map requestParameters); + UserAccount authenticateUser(String username, String password, Long domainId, String loginIpAddress, Map requestParameters); /** * Locate a user by their apiKey diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index 35fbfe0..3635e71 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -1618,7 +1618,7 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag } @Override - public UserAccount authenticateUser(String username, String password, Long domainId, Map requestParameters) { + public UserAccount authenticateUser(String username, String password, Long domainId, String loginIpAddress, Map requestParameters) { UserAccount user = null; if (password != null) { user = getUserAccount(username, password, domainId, requestParameters); @@ -1720,7 +1720,7 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag if (s_logger.isDebugEnabled()) { s_logger.debug("User: " + username + " in domain " + domainId + " has successfully logged in"); } - EventUtils.saveEvent(user.getId(), user.getAccountId(), user.getDomainId(), EventTypes.EVENT_USER_LOGIN, "user has logged in"); + EventUtils.saveEvent(user.getId(), user.getAccountId(), user.getDomainId(), EventTypes.EVENT_USER_LOGIN, "user has logged in from IP Address " + loginIpAddress); return user; } else { if (s_logger.isDebugEnabled()) { diff --git a/server/test/com/cloud/user/MockAccountManagerImpl.java b/server/test/com/cloud/user/MockAccountManagerImpl.java index e6ab4fe..e7ee1ed 100644 --- a/server/test/com/cloud/user/MockAccountManagerImpl.java +++ b/server/test/com/cloud/user/MockAccountManagerImpl.java @@ -254,7 +254,7 @@ public class MockAccountManagerImpl implements Manager, AccountManager { } @Override - public UserAccount authenticateUser(String username, String password, Long domainId, Map requestParameters) { + public UserAccount authenticateUser(String username, String password, Long domainId, String loginIpAddress, Map requestParameters) { return null; } -- 1.7.5.4 --------------060109000206080702050103--