diff options
Diffstat (limited to 'src')
2 files changed, 25 insertions, 7 deletions
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/security/UserAuthDao.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/security/UserAuthDao.java index 5b920d47..c930c295 100644 --- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/security/UserAuthDao.java +++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/security/UserAuthDao.java @@ -20,13 +20,23 @@ */ package com.gluster.storage.management.gateway.security; +import java.sql.Connection; +import java.sql.SQLException; + +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.EntityTransaction; +import javax.persistence.PersistenceUnit; + import org.springframework.security.core.userdetails.jdbc.JdbcDaoImpl; +import com.gluster.storage.management.core.exceptions.GlusterRuntimeException; + /** * */ public class UserAuthDao extends JdbcDaoImpl implements GlusterUserDetailsService { - + /* * (non-Javadoc) * @@ -35,7 +45,19 @@ public class UserAuthDao extends JdbcDaoImpl implements GlusterUserDetailsServic */ @Override public void changePassword(String username, String password) { - getJdbcTemplate().update("UPDATE USERS SET PASSWORD = ? WHERE USERNAME = ?", password, username); + try { + getJdbcTemplate().update("UPDATE USERS SET PASSWORD = ? WHERE USERNAME = ?", password, username); + Connection connection = getDataSource().getConnection(); + connection.commit(); + connection.close(); + } catch(Exception e) { + String errMsg = "Exception while changing password of user [" + username + "]. Error: " + e.getMessage(); + try { + getDataSource().getConnection().rollback(); + } catch (SQLException e1) { + throw new GlusterRuntimeException(errMsg + ", " + e1.getMessage()); + } + throw new GlusterRuntimeException(errMsg); + } } - } diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/PasswordManager.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/PasswordManager.java index 7d2e17ad..2554ccb3 100644 --- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/PasswordManager.java +++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/PasswordManager.java @@ -46,10 +46,6 @@ public class PasswordManager { userAuthDao.changePassword(username, encodedPassword); System.out.println("Password for user [" + username + "] reset successsfully to default value of [" + CoreConstants.DEFAULT_PASSWORD + "].\n"); - - Connection connection = userAuthDao.getDataSource().getConnection(); - connection.commit(); - connection.close(); } catch (Exception e) { System.err .println("\n\nPassword reset for user [" |