+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.argeo.security.mvc;
import java.io.Reader;
-import java.util.List;
+import java.util.Set;
import org.argeo.security.ArgeoSecurityService;
import org.argeo.security.ArgeoUser;
+import org.argeo.security.SimpleArgeoUser;
import org.argeo.server.BooleanAnswer;
+import org.argeo.server.Deserializer;
import org.argeo.server.ServerAnswer;
-import org.argeo.server.ServerDeserializer;
import org.argeo.server.mvc.MvcConstants;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.ModelAttribute;
@Controller
public class UsersRolesController implements MvcConstants {
-// private final static Log log = LogFactory
-// .getLog(UsersRolesController.class);
+ // private final static Log log = LogFactory
+ // .getLog(UsersRolesController.class);
+
+ // private String digestType = "SHA";
private ArgeoSecurityService securityService;
- private ServerDeserializer userDeserializer = null;
+ private Deserializer userDeserializer = null;
/* USER */
- @RequestMapping("/getCredentials.security")
- @ModelAttribute(ANSWER_MODEL_KEY)
+ @RequestMapping("/getCredentials.*")
+ @ModelAttribute("user")
public ArgeoUser getCredentials() {
- return securityService.getSecurityDao().getCurrentUser();
+ ArgeoUser argeoUser = securityService.getCurrentUser();
+ if (argeoUser == null)
+ return new SimpleArgeoUser();
+ else
+ return argeoUser;
}
- @RequestMapping("/getUsersList.security")
- @ModelAttribute(ANSWER_MODEL_KEY)
- public
List<ArgeoUser> getUsersList() {
- return securityService.getSecurityDao().listUsers();
+ @RequestMapping("/getUsersList.*")
+ @ModelAttribute("users")
+ public
Set<ArgeoUser> getUsersList() {
+ return securityService.listUsers();
}
- @RequestMapping("/userExists.security")
- @ModelAttribute(ANSWER_MODEL_KEY)
+ @RequestMapping("/userExists.*")
public BooleanAnswer userExists(@RequestParam("username") String username) {
- return new BooleanAnswer(securityService.getSecurityDao().userExists(
- username));
+ return new BooleanAnswer(securityService.userExists(username));
}
- @RequestMapping("/createUser.security")
- @ModelAttribute(ANSWER_MODEL_KEY)
+ @RequestMapping("/createUser.*")
+ @ModelAttribute("user")
public ArgeoUser createUser(Reader reader) {
- ArgeoUser user = (ArgeoUser) userDeserializer.deserialize(reader);
- //cleanUserBeforeCreate(user);
+ ArgeoUser user = userDeserializer.deserialize(reader,
+ SimpleArgeoUser.class);
+ // cleanUserBeforeCreate(user);
securityService.newUser(user);
- return securityService.getSecurityDao().getUser(user.getUsername());
+ return securityService.getUser(user.getUsername());
}
- @RequestMapping("/updateUser.security")
- @ModelAttribute(ANSWER_MODEL_KEY)
+ @RequestMapping("/updateUser.*")
+ @ModelAttribute("user")
public ArgeoUser updateUser(Reader reader) {
- ArgeoUser user = (ArgeoUser) userDeserializer.deserialize(reader);
+ ArgeoUser user = userDeserializer.deserialize(reader,
+ SimpleArgeoUser.class);
securityService.updateUser(user);
- return securityService.getSecurityDao().getUser(user.getUsername());
+ return securityService.getUser(user.getUsername());
}
-/*
- @RequestMapping("/createUser2.security")
- @ModelAttribute(ANSWER_MODEL_KEY)
- public ArgeoUser createUser(@RequestParam("body") String body) {
- if (log.isDebugEnabled())
- log.debug("body:\n" + body);
- StringReader reader = new StringReader(body);
- ArgeoUser user = null;
- try {
- user = (ArgeoUser) userDeserializer.deserialize(reader);
- } finally {
- IOUtils.closeQuietly(reader);
- }
- cleanUserBeforeCreate(user);
- securityService.newUser(user);
- return securityService.getSecurityDao().getUser(user.getUsername());
- }*/
- @RequestMapping("/deleteUser.security")
- @ModelAttribute(ANSWER_MODEL_KEY)
+ @RequestMapping("/updateUserSelf.*")
+ @ModelAttribute("user")
+ /** Will only update the user natures.*/
+ public ArgeoUser updateUserSelf(Reader reader) {
+ ArgeoUser user = securityService.getCurrentUser();
+ ArgeoUser userForNatures = userDeserializer.deserialize(reader,
+ SimpleArgeoUser.class);
+ user.updateUserNatures(userForNatures.getUserNatures());
+ securityService.updateUser(user);
+ return securityService.getUser(user.getUsername());
+ }
+
+ @RequestMapping("/deleteUser.*")
public ServerAnswer deleteUser(@RequestParam("username") String username) {
- securityService.getSecurityDao().delete(username);
+ securityService.deleteUser(username);
return ServerAnswer.ok("User " + username + " deleted");
}
- @RequestMapping("/getUserDetails.security")
- @ModelAttribute(ANSWER_MODEL_KEY)
+ @RequestMapping("/getUserDetails.*")
+ @ModelAttribute("user")
public ArgeoUser getUserDetails(@RequestParam("username") String username) {
- return securityService.getSecurityDao().getUser(username);
+ return securityService.getUser(username);
}
/* ROLE */
- @RequestMapping("/getRolesList.security")
- @ModelAttribute(ANSWER_MODEL_KEY)
- public List<String> getEditableRolesList() {
- return securityService.getSecurityDao().listEditableRoles();
+ @RequestMapping("/getRolesList.*")
+ @ModelAttribute("roles")
+ public Set<String> getEditableRolesList() {
+ return securityService.listEditableRoles();
}
- @RequestMapping("/createRole.security")
- @ModelAttribute(ANSWER_MODEL_KEY)
+ @RequestMapping("/createRole.*")
public ServerAnswer createRole(@RequestParam("role") String role) {
securityService.newRole(role);
return ServerAnswer.ok("Role " + role + " created");
}
- @RequestMapping("/deleteRole.security")
- @ModelAttribute(ANSWER_MODEL_KEY)
+ @RequestMapping("/deleteRole.*")
public ServerAnswer deleteRole(@RequestParam("role") String role) {
- securityService.getSecurityDao().deleteRole(role);
+ securityService.deleteRole(role);
return ServerAnswer.ok("Role " + role + " deleted");
}
- @RequestMapping("/updateUserPassword.security")
- @ModelAttribute(ANSWER_MODEL_KEY)
+ @RequestMapping("/updateUserPassword.*")
public ServerAnswer updateUserPassword(
@RequestParam("username") String username,
@RequestParam("password") String password) {
return ServerAnswer.ok("Password updated for user " + username);
}
- @RequestMapping("/updatePassword.security")
- @ModelAttribute(ANSWER_MODEL_KEY)
+ @RequestMapping("/updatePassword.*")
public ServerAnswer updatePassword(
- @RequestParam("password") String password,
- @RequestParam("oldPassword") String oldPassword) {
- securityService.getSecurityDao().updatePassword(oldPassword, password);
+ @RequestParam("oldPassword") String oldPassword,
+ @RequestParam("password") String password) {
+ securityService.updateCurrentUserPassword(oldPassword, password);
return ServerAnswer.ok("Password updated");
}
-// protected void cleanUserBeforeCreate(ArgeoUser user) {
-// user.getUserNatures().clear();
-// }
-
- public void setUserDeserializer(ServerDeserializer userDeserializer) {
+ // protected String digestIfNecessary(String str) {
+ //
+ // if (!str.startsWith("{" + digestType + "}"))
+ // return digest(str);
+ // else
+ // return str;
+ // }
+
+ // protected String digest(String nonEncrypted) {
+ // try {
+ // MessageDigest md = MessageDigest.getInstance(digestType);
+ // byte[] dig = md.digest(nonEncrypted.getBytes());
+ // return "{" + digestType + "}"
+ // + new String(Base64.encodeBase64(dig));
+ // } catch (NoSuchAlgorithmException e) {
+ // throw new RuntimeException(
+ // "Unexpected exception while digesting password");
+ // }
+ // }
+
+ public void setUserDeserializer(Deserializer userDeserializer) {
this.userDeserializer = userDeserializer;
}
projects / lgpl / argeo-commons.git / blobdiff