cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prachida...@apache.org
Subject [2/2] git commit: updated refs/heads/4.4 to 5d0f507
Date Thu, 17 Apr 2014 00:05:23 GMT
CLOUDSTACK-6348 IAM - Regular User is not able to change password.

Changes:
- Adding entityType to *User APIs since they operate on the Account entity.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5d0f507e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5d0f507e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5d0f507e

Branch: refs/heads/4.4
Commit: 5d0f507ea6513fb699c6c687402e9aa95579c53d
Parents: 48c9b46
Author: Prachi Damle <prachi@cloud.com>
Authored: Wed Apr 16 11:24:15 2014 -0700
Committer: Prachi Damle <prachi@cloud.com>
Committed: Wed Apr 16 11:27:00 2014 -0700

----------------------------------------------------------------------
 .../apache/cloudstack/api/command/admin/user/CreateUserCmd.java  | 2 +-
 .../apache/cloudstack/api/command/admin/user/DeleteUserCmd.java  | 2 +-
 .../apache/cloudstack/api/command/admin/user/DisableUserCmd.java | 2 +-
 .../apache/cloudstack/api/command/admin/user/EnableUserCmd.java  | 2 +-
 .../org/apache/cloudstack/api/command/admin/user/GetUserCmd.java | 3 ++-
 .../apache/cloudstack/api/command/admin/user/ListUsersCmd.java   | 4 +++-
 .../apache/cloudstack/api/command/admin/user/UpdateUserCmd.java  | 2 +-
 7 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d0f507e/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java
index 8f223ac..bd67436 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java
@@ -31,7 +31,7 @@ import com.cloud.user.Account;
 import com.cloud.user.User;
 
 @APICommand(name = "createUser", description = "Creates a user for an account that already
exists", responseObject = UserResponse.class,
-        requestHasSensitiveInfo = true, responseHasSensitiveInfo = true)
+ requestHasSensitiveInfo = true, responseHasSensitiveInfo = true, entityType = { Account.class
})
 public class CreateUserCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(CreateUserCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d0f507e/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java
index 08ba521..f90a480 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java
@@ -35,7 +35,7 @@ import com.cloud.user.Account;
 import com.cloud.user.User;
 
 @APICommand(name = "deleteUser", description = "Deletes a user for an account", responseObject
= SuccessResponse.class,
-        requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, entityType = { Account.class
})
 public class DeleteUserCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteUserCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d0f507e/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java
index c6e09ef..3a9676e 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java
@@ -37,7 +37,7 @@ import com.cloud.user.User;
 import com.cloud.user.UserAccount;
 
 @APICommand(name = "disableUser", description = "Disables a user account", responseObject
= UserResponse.class,
-        requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true, entityType = { Account.class
})
 public class DisableUserCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DisableUserCmd.class.getName());
     private static final String s_name = "disableuserresponse";

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d0f507e/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java
index d69eccf..e4f4477 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java
@@ -35,7 +35,7 @@ import com.cloud.user.User;
 import com.cloud.user.UserAccount;
 
 @APICommand(name = "enableUser", description = "Enables a user account", responseObject =
UserResponse.class,
-        requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true, entityType = { Account.class
})
 public class EnableUserCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(EnableUserCmd.class.getName());
     private static final String s_name = "enableuserresponse";

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d0f507e/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java
index b2c6734..f8c7589 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java
@@ -25,10 +25,11 @@ import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.UserResponse;
 
 import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.user.Account;
 import com.cloud.user.UserAccount;
 
 @APICommand(name = "getUser", description = "Find user account by API key", responseObject
= UserResponse.class,
-        requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true, entityType = { Account.class
})
 public class GetUserCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(GetUserCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d0f507e/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java
index c0c2b24..14cbb26 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java
@@ -25,8 +25,10 @@ import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.UserResponse;
 
+import com.cloud.user.Account;
+
 @APICommand(name = "listUsers", description = "Lists user accounts", responseObject = UserResponse.class,
-        requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true, entityType = { Account.class
})
 public class ListUsersCmd extends BaseListAccountResourcesCmd {
     public static final Logger s_logger = Logger.getLogger(ListUsersCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d0f507e/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
index cf5d355..46b01aa 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
@@ -35,7 +35,7 @@ import com.cloud.user.User;
 import com.cloud.user.UserAccount;
 
 @APICommand(name = "updateUser", description = "Updates a user account", responseObject =
UserResponse.class,
-        requestHasSensitiveInfo = true, responseHasSensitiveInfo = true)
+ requestHasSensitiveInfo = true, responseHasSensitiveInfo = true, entityType = { Account.class
})
 public class UpdateUserCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateUserCmd.class.getName());
 


Mime
View raw message