X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.mvc%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fmvc%2FUsersRolesController.java;h=f2da2be6ae4c3c6cbbca749856a3dc8e75165dbe;hb=136dab5338b5f731b285d17c804861bd5e5a9b5c;hp=4f9c723fb150474b827dafff097e4d233aa2a5bc;hpb=092b922842a99f6e6330305d579c119e20ceb03b;p=lgpl%2Fargeo-commons.git diff --git a/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java b/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java index 4f9c723fb..f2da2be6a 100644 --- a/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java +++ b/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java @@ -1,7 +1,23 @@ +/* + * Copyright (C) 2010 Mathieu Baudier + * + * 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; @@ -20,115 +36,98 @@ public class UsersRolesController implements MvcConstants { // private final static Log log = LogFactory // .getLog(UsersRolesController.class); + // private String digestType = "SHA"; + private ArgeoSecurityService securityService; private Deserializer userDeserializer = null; /* USER */ - @RequestMapping("/getCredentials.ria") - @ModelAttribute(ANSWER_MODEL_KEY) + @RequestMapping("/getCredentials.*") + @ModelAttribute("user") public ArgeoUser getCredentials() { - ArgeoUser argeoUser = securityService.getSecurityDao().getCurrentUser(); + ArgeoUser argeoUser = securityService.getCurrentUser(); if (argeoUser == null) return new SimpleArgeoUser(); else return argeoUser; } - // @RequestMapping("/login.security") - // @ModelAttribute(ANSWER_MODEL_KEY) - // public ArgeoUser login(@RequestParam("username") String username, - // @RequestParam("password") String password) { - // //SecurityContextHolder.getContext().getAuthentication(). - // return securityService.getSecurityDao().getCurrentUser(); - // } - // - // @RequestMapping("/logout.security") - // @ModelAttribute(ANSWER_MODEL_KEY) - // public ServerAnswer logout() { - // return ServerAnswer.ok("Logged out"); - // } - - @RequestMapping("/getUsersList.security") - @ModelAttribute(ANSWER_MODEL_KEY) - public List getUsersList() { - return securityService.getSecurityDao().listUsers(); + @RequestMapping("/getUsersList.*") + @ModelAttribute("users") + public Set 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 = userDeserializer.deserialize(reader, ArgeoUser.class); + 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 = userDeserializer.deserialize(reader, ArgeoUser.class); + ArgeoUser user = userDeserializer.deserialize(reader, + SimpleArgeoUser.class); + securityService.updateUser(user); + return securityService.getUser(user.getUsername()); + } + + @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.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("/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 getEditableRolesList() { - return securityService.getSecurityDao().listEditableRoles(); + @RequestMapping("/getRolesList.*") + @ModelAttribute("roles") + public Set 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) { @@ -136,17 +135,32 @@ public class UsersRolesController implements MvcConstants { 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(); + // 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) {