mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-10 15:35:49 +01:00
added change password dialog
This commit is contained in:
Sebastian Sdorra
@@ -0,0 +1,95 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2010, Sebastian Sdorra
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer.
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer in the documentation
|
||||||
|
* and/or other materials provided with the distribution.
|
||||||
|
* 3. Neither the name of SCM-Manager; nor the names of its
|
||||||
|
* contributors may be used to endorse or promote products derived from this
|
||||||
|
* software without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||||
|
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*
|
||||||
|
* http://bitbucket.org/sdorra/scm-manager
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
package sonia.scm.api.rest;
|
||||||
|
|
||||||
|
//~--- JDK imports ------------------------------------------------------------
|
||||||
|
|
||||||
|
import javax.xml.bind.annotation.XmlRootElement;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @author Sebastian Sdorra
|
||||||
|
*/
|
||||||
|
@XmlRootElement(name = "result")
|
||||||
|
public class RestActionResult
|
||||||
|
{
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs ...
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public RestActionResult() {}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs ...
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* @param success
|
||||||
|
*/
|
||||||
|
public RestActionResult(boolean success)
|
||||||
|
{
|
||||||
|
this.success = success;
|
||||||
|
}
|
||||||
|
|
||||||
|
//~--- get methods ----------------------------------------------------------
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Method description
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public boolean isSuccess()
|
||||||
|
{
|
||||||
|
return success;
|
||||||
|
}
|
||||||
|
|
||||||
|
//~--- set methods ----------------------------------------------------------
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Method description
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* @param success
|
||||||
|
*/
|
||||||
|
public void setSuccess(boolean success)
|
||||||
|
{
|
||||||
|
this.success = success;
|
||||||
|
}
|
||||||
|
|
||||||
|
//~--- fields ---------------------------------------------------------------
|
||||||
|
|
||||||
|
/** Field description */
|
||||||
|
private boolean success = false;
|
||||||
|
}
|
||||||
@@ -0,0 +1,170 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2010, Sebastian Sdorra
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer.
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer in the documentation
|
||||||
|
* and/or other materials provided with the distribution.
|
||||||
|
* 3. Neither the name of SCM-Manager; nor the names of its
|
||||||
|
* contributors may be used to endorse or promote products derived from this
|
||||||
|
* software without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||||
|
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*
|
||||||
|
* http://bitbucket.org/sdorra/scm-manager
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
package sonia.scm.api.rest.resources;
|
||||||
|
|
||||||
|
//~--- non-JDK imports --------------------------------------------------------
|
||||||
|
|
||||||
|
import com.google.inject.Inject;
|
||||||
|
import com.google.inject.Provider;
|
||||||
|
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import sonia.scm.api.rest.RestActionResult;
|
||||||
|
import sonia.scm.security.EncryptionHandler;
|
||||||
|
import sonia.scm.user.User;
|
||||||
|
import sonia.scm.user.UserException;
|
||||||
|
import sonia.scm.user.UserManager;
|
||||||
|
import sonia.scm.user.xml.XmlUserManager;
|
||||||
|
import sonia.scm.util.AssertUtil;
|
||||||
|
import sonia.scm.web.security.WebSecurityContext;
|
||||||
|
|
||||||
|
//~--- JDK imports ------------------------------------------------------------
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
import javax.ws.rs.FormParam;
|
||||||
|
import javax.ws.rs.POST;
|
||||||
|
import javax.ws.rs.Path;
|
||||||
|
import javax.ws.rs.Produces;
|
||||||
|
import javax.ws.rs.WebApplicationException;
|
||||||
|
import javax.ws.rs.core.MediaType;
|
||||||
|
import javax.ws.rs.core.Response;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @author Sebastian Sdorra
|
||||||
|
*/
|
||||||
|
@Path("action/change-password")
|
||||||
|
public class ChangePasswordResource
|
||||||
|
{
|
||||||
|
|
||||||
|
/** the logger for ChangePasswordResource */
|
||||||
|
private static final Logger logger =
|
||||||
|
LoggerFactory.getLogger(ChangePasswordResource.class);
|
||||||
|
|
||||||
|
//~--- constructors ---------------------------------------------------------
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs ...
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* @param userManager
|
||||||
|
* @param encryptionHandler
|
||||||
|
* @param securityContextProvider
|
||||||
|
*/
|
||||||
|
@Inject
|
||||||
|
public ChangePasswordResource(
|
||||||
|
UserManager userManager, EncryptionHandler encryptionHandler,
|
||||||
|
Provider<WebSecurityContext> securityContextProvider)
|
||||||
|
{
|
||||||
|
this.userManager = userManager;
|
||||||
|
this.encryptionHandler = encryptionHandler;
|
||||||
|
this.securityContextProvider = securityContextProvider;
|
||||||
|
}
|
||||||
|
|
||||||
|
//~--- methods --------------------------------------------------------------
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Method description
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* @param oldPassword
|
||||||
|
* @param newPassword
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*
|
||||||
|
* @throws IOException
|
||||||
|
* @throws UserException
|
||||||
|
*/
|
||||||
|
@POST
|
||||||
|
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
|
||||||
|
public Response changePassword(@FormParam("old-password") String oldPassword,
|
||||||
|
@FormParam("new-password") String newPassword)
|
||||||
|
throws UserException, IOException
|
||||||
|
{
|
||||||
|
AssertUtil.assertIsNotEmpty(oldPassword);
|
||||||
|
AssertUtil.assertIsNotEmpty(newPassword);
|
||||||
|
|
||||||
|
int length = newPassword.length();
|
||||||
|
|
||||||
|
if ((length < 6) || (length > 32))
|
||||||
|
{
|
||||||
|
throw new WebApplicationException(Response.Status.BAD_REQUEST);
|
||||||
|
}
|
||||||
|
|
||||||
|
Response response = null;
|
||||||
|
WebSecurityContext securityContext = securityContextProvider.get();
|
||||||
|
User currentUser = securityContext.getUser();
|
||||||
|
|
||||||
|
if (logger.isInfoEnabled())
|
||||||
|
{
|
||||||
|
logger.info("password change for user {}", currentUser.getName());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (currentUser.getType().equals(XmlUserManager.TYPE))
|
||||||
|
{
|
||||||
|
User dbUser = userManager.get(currentUser.getName());
|
||||||
|
|
||||||
|
if (encryptionHandler.encrypt(oldPassword).equals(dbUser.getPassword()))
|
||||||
|
{
|
||||||
|
dbUser.setPassword(encryptionHandler.encrypt(newPassword));
|
||||||
|
userManager.modify(dbUser);
|
||||||
|
response = Response.ok(new RestActionResult(true)).build();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
response = Response.status(Response.Status.BAD_REQUEST).build();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logger.error("only xml user can change their passwor");
|
||||||
|
response = Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
|
||||||
|
}
|
||||||
|
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
//~--- fields ---------------------------------------------------------------
|
||||||
|
|
||||||
|
/** Field description */
|
||||||
|
private EncryptionHandler encryptionHandler;
|
||||||
|
|
||||||
|
/** Field description */
|
||||||
|
private Provider<WebSecurityContext> securityContextProvider;
|
||||||
|
|
||||||
|
/** Field description */
|
||||||
|
private UserManager userManager;
|
||||||
|
}
|
||||||
@@ -58,6 +58,7 @@
|
|||||||
<script type="text/javascript" src="resources/js/sonia.config.js"></script>
|
<script type="text/javascript" src="resources/js/sonia.config.js"></script>
|
||||||
<script type="text/javascript" src="resources/js/sonia.user.js"></script>
|
<script type="text/javascript" src="resources/js/sonia.user.js"></script>
|
||||||
<script type="text/javascript" src="resources/js/sonia.group.js"></script>
|
<script type="text/javascript" src="resources/js/sonia.group.js"></script>
|
||||||
|
<script type="text/javascript" src="resources/js/sonia.action.js"></script>
|
||||||
<script type="text/javascript" src="resources/js/sonia.plugin.js"></script>
|
<script type="text/javascript" src="resources/js/sonia.plugin.js"></script>
|
||||||
<script type="text/javascript" src="resources/js/sonia.scm.js"></script>
|
<script type="text/javascript" src="resources/js/sonia.scm.js"></script>
|
||||||
<script type="text/javascript" src="plugins/sonia.plugin.js"></script>
|
<script type="text/javascript" src="plugins/sonia.plugin.js"></script>
|
||||||
|
|||||||
125
scm-webapp/src/main/webapp/resources/js/sonia.action.js
Normal file
125
scm-webapp/src/main/webapp/resources/js/sonia.action.js
Normal file
@@ -0,0 +1,125 @@
|
|||||||
|
/* *
|
||||||
|
* Copyright (c) 2010, Sebastian Sdorra
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer.
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer in the documentation
|
||||||
|
* and/or other materials provided with the distribution.
|
||||||
|
* 3. Neither the name of SCM-Manager; nor the names of its
|
||||||
|
* contributors may be used to endorse or promote products derived from this
|
||||||
|
* software without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||||
|
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*
|
||||||
|
* http://bitbucket.org/sdorra/scm-manager
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
Ext.ns('Sonia.action');
|
||||||
|
|
||||||
|
Sonia.action.ChangePasswordWindow = Ext.extend(Ext.Window,{
|
||||||
|
|
||||||
|
initComponent: function(){
|
||||||
|
|
||||||
|
var config = {
|
||||||
|
layout:'fit',
|
||||||
|
width:300,
|
||||||
|
height:170,
|
||||||
|
closable: false,
|
||||||
|
resizable: false,
|
||||||
|
plain: true,
|
||||||
|
border: false,
|
||||||
|
modal: true,
|
||||||
|
items: [{
|
||||||
|
id: 'changePasswordForm',
|
||||||
|
url: restUrl + 'action/change-password.json',
|
||||||
|
title: 'Change Password',
|
||||||
|
frame: true,
|
||||||
|
xtype: 'form',
|
||||||
|
monitorValid: true,
|
||||||
|
defaultType: 'textfield',
|
||||||
|
items: [{
|
||||||
|
name: 'old-password',
|
||||||
|
fieldLabel: 'Old Password',
|
||||||
|
inputType: 'password',
|
||||||
|
allowBlank: false,
|
||||||
|
minLength: 6,
|
||||||
|
maxLength: 32
|
||||||
|
},{
|
||||||
|
id: 'new-password',
|
||||||
|
name: 'new-password',
|
||||||
|
fieldLabel: 'New Password',
|
||||||
|
inputType: 'password',
|
||||||
|
allowBlank: false,
|
||||||
|
minLength: 6,
|
||||||
|
maxLength: 32
|
||||||
|
},{
|
||||||
|
name: 'confirm-password',
|
||||||
|
fieldLabel: 'Confirm Password',
|
||||||
|
inputType: 'password',
|
||||||
|
allowBlank: false,
|
||||||
|
minLength: 6,
|
||||||
|
maxLength: 32,
|
||||||
|
vtype: 'password',
|
||||||
|
initialPassField: 'new-password'
|
||||||
|
}],
|
||||||
|
buttons: [{
|
||||||
|
text: 'Ok',
|
||||||
|
formBind: true,
|
||||||
|
scope: this,
|
||||||
|
handler: this.changePassword
|
||||||
|
},{
|
||||||
|
text: 'Cancel',
|
||||||
|
scope: this,
|
||||||
|
handler: this.cancel
|
||||||
|
}]
|
||||||
|
}]
|
||||||
|
}
|
||||||
|
|
||||||
|
Ext.apply(this, Ext.apply(this.initialConfig, config));
|
||||||
|
Sonia.action.ChangePasswordWindow.superclass.initComponent.apply(this, arguments);
|
||||||
|
},
|
||||||
|
|
||||||
|
changePassword: function(){
|
||||||
|
var win = this;
|
||||||
|
var form = Ext.getCmp('changePasswordForm').getForm();
|
||||||
|
form.submit({
|
||||||
|
method:'POST',
|
||||||
|
waitTitle:'Connecting',
|
||||||
|
waitMsg:'Sending data...',
|
||||||
|
|
||||||
|
success: function(form, action){
|
||||||
|
if ( debug ){
|
||||||
|
console.debug( 'change password success' );
|
||||||
|
}
|
||||||
|
win.close();
|
||||||
|
},
|
||||||
|
|
||||||
|
failure: function(form, action){
|
||||||
|
if ( debug ){
|
||||||
|
console.debug( 'change password failed' );
|
||||||
|
}
|
||||||
|
Ext.Msg.alert('change password failed!');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
cancel: function(){
|
||||||
|
this.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
@@ -120,7 +120,22 @@ Ext.onReady(function(){
|
|||||||
}]
|
}]
|
||||||
});
|
});
|
||||||
|
|
||||||
|
var securitySection = null;
|
||||||
|
|
||||||
|
if ( state.user.type == 'xml' && state.user.name != 'anonymous' ){
|
||||||
|
securitySection = {
|
||||||
|
title: 'Security',
|
||||||
|
items: [{
|
||||||
|
label: 'Change Password',
|
||||||
|
fn: function(){
|
||||||
|
new Sonia.action.ChangePasswordWindow().show();
|
||||||
|
}
|
||||||
|
}]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if ( admin ){
|
if ( admin ){
|
||||||
|
|
||||||
panel.addSections([{
|
panel.addSections([{
|
||||||
id: 'navConfig',
|
id: 'navConfig',
|
||||||
title: 'Config',
|
title: 'Config',
|
||||||
@@ -140,20 +155,31 @@ Ext.onReady(function(){
|
|||||||
addTabPanel('plugins', 'pluginGrid', 'Plugins');
|
addTabPanel('plugins', 'pluginGrid', 'Plugins');
|
||||||
}
|
}
|
||||||
}]
|
}]
|
||||||
},{
|
|
||||||
title: 'Security',
|
|
||||||
items: [{
|
|
||||||
label: 'Users',
|
|
||||||
fn: function(){
|
|
||||||
addTabPanel('users', 'userPanel', 'Users');
|
|
||||||
}
|
|
||||||
},{
|
|
||||||
label: 'Groups',
|
|
||||||
fn: function(){
|
|
||||||
addTabPanel('groups', 'groupPanel', 'Groups');
|
|
||||||
}
|
|
||||||
}]
|
|
||||||
}]);
|
}]);
|
||||||
|
|
||||||
|
if ( securitySection == null ){
|
||||||
|
securitySection = {
|
||||||
|
title: 'Security',
|
||||||
|
items: []
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
securitySection.items.push({
|
||||||
|
label: 'Users',
|
||||||
|
fn: function(){
|
||||||
|
addTabPanel('users', 'userPanel', 'Users');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
securitySection.items.push({
|
||||||
|
label: 'Groups',
|
||||||
|
fn: function(){
|
||||||
|
addTabPanel('groups', 'groupPanel', 'Groups');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( securitySection != null ){
|
||||||
|
panel.addSection( securitySection );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( state.user.name == 'anonymous' ){
|
if ( state.user.name == 'anonymous' ){
|
||||||
|
|||||||
Reference in New Issue
Block a user