May 2014 - Pollen-commits - mailman.cloud.codelutin.com

01/03: delete token in url in list poll
by Chorem.org scm 21 May '14

21 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 5cd7b6570745c7e23075dbb9a064076fac043fde Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 21 17:45:55 2014 +0200 delete token in url in list poll --- pollen-ui-angular/src/main/webapp/partials/poll-list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-list.html b/pollen-ui-angular/src/main/webapp/partials/poll-list.html index e81774c..1648b0b 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-list.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-list.html @@ -2,7 +2,7 @@ <alert type="danger" ng-if="restError.forbidden">Accès interdit</alert> <div ng-repeat="poll in data.polls"> - <h2><a href="#/poll/vote/{{poll.id}}">{{poll.title}}</a> <a href="#/poll/edit/{{poll.id}}?token={{poll.permission}}"><i class="glyphicon glyphicon-pencil"></i></a></h2> + <h2><a href="#/poll/vote/{{poll.id}}">{{poll.title}}</a> <a href="#/poll/edit/{{poll.id}}"><i class="glyphicon glyphicon-pencil"></i></a></h2> <p ng-bind-html="toHTML(poll.description)"></p> <hr/> </div> \ No newline at end of file -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/03: add list poll created
by Chorem.org scm 21 May '14

21 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 5a6259b49f696e5488c03725e5ad6793e9b95ffc Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 21 16:22:33 2014 +0200 add list poll created --- pollen-ui-angular/src/main/webapp/index.html | 6 +++--- pollen-ui-angular/src/main/webapp/js/app.js | 1 + .../src/main/webapp/js/controllers/pollCtrl.js | 17 +++++++++++++++-- .../src/main/webapp/partials/poll-list.html | 2 ++ 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 15e254a..4142580 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -43,7 +43,7 @@ </head> <body> -<nav class="navbar navbar-inverse navbar-static-top"> +<nav class="navbar navbar-inverse navbar-static-top" ng-controller="UserLoginCtrl"> <div class="container-fluid"> <div class="navbar-header"> <a class="navbar-brand" href="#">Pollen</a> @@ -51,9 +51,9 @@ <div class="collapse navbar-collapse"> <ul class="nav navbar-nav"> <li><a href="#/poll/create">Creer</a></li> - <li><a href="#/poll/list">Liste</a></li> + <li ng-show="currentUser.login"><a href="#/poll/list/created">Liste</a></li> </ul> - <ul class="nav navbar-nav pull-right" ng-controller="UserLoginCtrl"> + <ul class="nav navbar-nav pull-right"> <li ng-show="!currentUser.login"> <a href="#/user/register/">S'enregistrer</a> </li> diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 210685e..f6eaca4 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -53,6 +53,7 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC .when('/poll/edit/:pollId', {templateUrl: './partials/poll.html', controller:"PollEditCtrl"}) .when('/poll/vote/:pollId', {templateUrl: './partials/poll.html', controller :"PollVoteCtrl"}) .when('/poll/list', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) + .when('/poll/list/:cmd', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) .when('/user/register', {templateUrl: './partials/user-register.html', controller:"UserRegisterCtrl"}) .otherwise({redirectTo: '/'}); diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index a607ec8..74b03ec 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -333,10 +333,23 @@ angular.module('pollControllers', []) } }]) -.controller('PollListCtrl', ['$scope', '$controller', 'Poll', function ($scope, $controller, Poll) { +.controller('PollListCtrl', ['$scope', '$controller', '$routeParams', 'Poll', function ($scope, $controller, $routeParams, Poll) { $controller('PollCtrl', {$scope:$scope}); - $scope.data.polls = Poll.query(); + if (angular.isDefined($routeParams.cmd)) { + Poll.query({cmd:$routeParams.cmd}, function (data) { + $scope.data.polls = data; + }, function (error) { + $scope.restError = {forbidden:true}; + }); + } + else { + Poll.query(function (data) { + $scope.data.polls = data; + }, function (error) { + $scope.restError = {forbidden:true}; + }); + } }]) diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-list.html b/pollen-ui-angular/src/main/webapp/partials/poll-list.html index c6b266e..e81774c 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-list.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-list.html @@ -1,4 +1,6 @@ +<alert type="danger" ng-if="restError.forbidden">Accès interdit</alert> + <div ng-repeat="poll in data.polls"> <h2><a href="#/poll/vote/{{poll.id}}">{{poll.title}}</a> <a href="#/poll/edit/{{poll.id}}?token={{poll.permission}}"><i class="glyphicon glyphicon-pencil"></i></a></h2> <p ng-bind-html="toHTML(poll.description)"></p> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/03: admin menu
by Chorem.org scm 21 May '14

21 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit d34ff74f3d591bf1bd85bdc1304aed9dc23e8799 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 21 16:22:11 2014 +0200 admin menu --- pollen-ui-angular/src/main/webapp/index.html | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 63a7910..15e254a 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -70,18 +70,30 @@ </div> </li> + <li class="dropdown" ng-show="currentUser.administrator"> + <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown"> + Administration <strong class="caret"></strong> + </a> + + <ul class="dropdown-menu" role="menu"> + <li><a href="#/poll/list">Liste Sondages</a></li> + <li><a href="#/user/list">List Users</a></li> + <li><a href="#/conf">Configuration</a></li> + </ul> + </li> + <li class="dropdown" ng-show="currentUser.login"> <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown"> {{ currentUser.name || currentUser.login }} <strong class="caret"></strong> </a> <ul class="dropdown-menu" role="menu"> - <li role="presentation"> + <li> <a href="#/user/edit/{{currentUser.id}}">Profile</a> </li> - <li class="divider" role="presentation"></li> - <li role="presentation"> + <li class="divider"></li> + <li> <a ng-click="logout()">Deconnexion</a> </li> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/03: reload page when connect and disconnect
by Chorem.org scm 21 May '14

21 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 837cb4883e893a1d99a57bcdc1a4160e115bddbf Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 21 16:20:43 2014 +0200 reload page when connect and disconnect --- .../src/main/webapp/js/controllers/userCtrl.js | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index 87a3a70..bf2517f 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -36,7 +36,7 @@ } }]) -.controller('UserLoginCtrl', ['$scope', 'UserLogin', 'UserLogout', 'User', 'SessionStorage', function ($scope, UserLogin, UserLogout, User, SessionStorage) { +.controller('UserLoginCtrl', ['$scope', 'UserLogin', 'UserLogout', 'User', 'SessionStorage', '$route', function ($scope, UserLogin, UserLogout, User, SessionStorage, $route) { if (angular.isUndefined($scope.data)) { $scope.data = {user:{}}; } @@ -44,22 +44,30 @@ $scope.login = function () { UserLogin.login({}, $scope.data.user, function (data) { + SessionStorage.save({'token':data.permission}); + User.get({userId: data.id}, function (user) { $scope.currentUser = user; SessionStorage.save({'user':user}); + + delete $scope.data.user; + // reload page for right user + $route.reload(); }) - SessionStorage.save({'token':data.permission}); }, function (error) { $scope.restError = {connexion : "Erreur sur le nom d'utilisateur ou le mot de passe"}; }); - delete $scope.data.user; } $scope.logout = function () { UserLogout.logout(function (data) { - SessionStorage.remove('token'); - SessionStorage.remove('user'); - delete $scope.currentUser; + // delete user information + SessionStorage.remove('token'); + SessionStorage.remove('user'); + delete $scope.currentUser; + + //reload page for right user + $route.reload(); }) } }]) \ No newline at end of file -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/02: add security for list all poll
by Chorem.org scm 21 May '14

21 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit ca431872fb0f6fdd5e541f8501083760dd6a9d30 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 21 15:43:13 2014 +0200 add security for list all poll --- .../main/java/org/chorem/pollen/services/service/PollService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java index 1530eb1..08c1ada 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java @@ -53,9 +53,8 @@ public class PollService extends PollenServiceSupport { public ImmutableSet<PollBean> getPolls() { - //TODO Push this back when security will be ok -// checkIsConnected(); -// checkIsAdmin(); + checkIsConnected(); + checkIsAdmin(); List<Poll> polls = getPollDao().findAll(); return copyAsSet(PollBean.class, polls); -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/02: implement list of poll created by user
by Chorem.org scm 21 May '14

21 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit f171433c392ff25771b4c421518ef99c172b25eb Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 21 15:42:31 2014 +0200 implement list of poll created by user --- .../main/java/org/chorem/pollen/persistence/entity/PollTopiaDao.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollTopiaDao.java index 0180b5c..f1f4089 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollTopiaDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollTopiaDao.java @@ -36,8 +36,8 @@ import java.util.Set; public class PollTopiaDao extends AbstractPollTopiaDao<Poll> { public Set<Poll> findAllCreated(PollenUser user) { - //TODO - return Sets.newHashSet(); + List<Poll> polls = forEquals(Poll.PROPERTY_CREATOR + "." + PollenPrincipal.PROPERTY_POLLEN_USER, user).findAll(); + return ImmutableSet.copyOf(polls); } public Set<Poll> findAllInvited(PollenUser user) { -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: Add sessionToken remove logic
by Chorem.org scm 21 May '14

21 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 81f36845f028bb9d71f8c1a82d62176b6c4fd2db Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed May 21 15:17:30 2014 +0200 Add sessionToken remove logic --- .../persistence/entity/SessionTokenTopiaDao.java | 17 +++ pollen-persistence/src/main/xmi/pollen.properties | 5 + .../org/chorem/pollen/rest/api/v1/AuthApi.java | 14 +-- .../services/config/PollenServiceConfig.java | 6 ++ .../services/config/PollenServiceConfigOption.java | 15 ++- .../pollen/services/service/AuthService.java | 93 ----------------- .../pollen/services/service/PollService.java | 2 +- .../services/service/PollenServiceSupport.java | 4 - .../services/service/security/SecurityService.java | 115 +++++++++++++++++++-- .../i18n/pollen-services_en_GB.properties | 2 +- .../i18n/pollen-services_fr_FR.properties | 2 +- 11 files changed, 157 insertions(+), 118 deletions(-) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/SessionTokenTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/SessionTokenTopiaDao.java index 0670108..b0b3168 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/SessionTokenTopiaDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/SessionTokenTopiaDao.java @@ -21,6 +21,13 @@ package org.chorem.pollen.persistence.entity; * #L% */ +import com.google.common.collect.ImmutableSet; +import org.nuiton.topia.persistence.HqlAndParametersBuilder; + +import java.util.Date; +import java.util.List; +import java.util.Set; + public class SessionTokenTopiaDao extends AbstractSessionTokenTopiaDao<SessionToken> { public SessionToken findUniqueOrNullByToken(String token) { @@ -29,4 +36,14 @@ public class SessionTokenTopiaDao extends AbstractSessionTokenTopiaDao<SessionTo return sessionToken; } + + public Set<SessionToken> findAllBeforeEndDate(Date now) { + + HqlAndParametersBuilder<SessionToken> builder = newHqlAndParametersBuilder(); + builder.addLowerThan(SessionToken.PROPERTY_POLLEN_TOKEN + "." + PollenToken.PROPERTY_END_DATE, now); + + List<SessionToken> sessionTokens = findAll(builder.getHql(), builder.getHqlParameters()); + return ImmutableSet.copyOf(sessionTokens); + + } } diff --git a/pollen-persistence/src/main/xmi/pollen.properties b/pollen-persistence/src/main/xmi/pollen.properties index d57e84a..306e907 100644 --- a/pollen-persistence/src/main/xmi/pollen.properties +++ b/pollen-persistence/src/main/xmi/pollen.properties @@ -35,6 +35,11 @@ org.chorem.pollen.persistence.entity.PollenUser.attribute.favoriteList.stereotyp org.chorem.pollen.persistence.entity.FavoriteList.attribute.member.stereotype=ordered, unique org.chorem.pollen.persistence.entity.VoterList.attribute.member.stereotype=unique +# clef naturelle non modifiable sur PollenToken.token +org.chorem.pollen.persistence.entity.PollenToken.class.tagValue.naturalIdMutable=true +org.chorem.pollen.persistence.entity.PollenToken.attribute.token.stereotype=unique +org.chorem.pollen.persistence.entity.PollenToken.attribute.token.tagValue.naturalId=true + # clef naturelle non modifiable sur Poll#pollId #org.chorem.pollen.persistence.entity.Poll.class.tagValue.naturalIdMutable=true #org.chorem.pollen.persistence.entity.Poll.attribute.pollId.stereotype=unique diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java index 02ed7fd..8b8be04 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java @@ -24,8 +24,8 @@ package org.chorem.pollen.rest.api.v1; */ import org.chorem.pollen.services.bean.CreateBeanRef; -import org.chorem.pollen.services.service.AuthService; import org.chorem.pollen.services.service.security.PollenAuthenticationException; +import org.chorem.pollen.services.service.security.SecurityService; import org.debux.webmotion.server.WebMotionController; /** @@ -36,22 +36,22 @@ import org.debux.webmotion.server.WebMotionController; */ public class AuthApi extends WebMotionController { - public CreateBeanRef login(AuthService authService, String login, String password, Boolean rememberMe) throws PollenAuthenticationException { + public CreateBeanRef login(SecurityService securityService, String login, String password, Boolean rememberMe) throws PollenAuthenticationException { - CreateBeanRef principalRef = authService.login(login, password, rememberMe); + CreateBeanRef principalRef = securityService.login(login, password, rememberMe); return principalRef; } - public void logout(AuthService authService) { + public void logout(SecurityService securityService) { - authService.logout(); + securityService.logout(); } - public void lostPassword(AuthService authService, String login) { + public void lostPassword(SecurityService securityService, String login) { - authService.lostPassword(login); + securityService.lostPassword(login); } } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java index 2c866ef..7fd20d9 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java @@ -164,6 +164,12 @@ public class PollenServiceConfig { return result; } + public int getSessionTimeoutDelay() { + int result = applicationConfig.getOptionAsInt( + PollenServiceConfigOption.SESSION_TIMEOUT_DELAY.key); + return result; + } + /** * @return Le nom d'hôte du serveur SMTP. */ diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java index f115595..89d79cd 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java @@ -119,6 +119,17 @@ public enum PollenServiceConfigOption implements ConfigOptionDef { ChoiceType.TEXT.name(), ChoiceType.class), + /** + * Default poll choice type to use at a new choice creation. + * + * @since 2.0 + */ + SESSION_TIMEOUT_DELAY( + "pollen.default.sessionTimeoutDelay", + n("pollen.configuration.sessionTimeoutDelay"), + "3600", // 1 hour = 3600s + int.class), + SMTP_HOST( "pollen.smtp.host", "Nom d'hôte du serveur SMTP", @@ -138,11 +149,13 @@ public enum PollenServiceConfigOption implements ConfigOptionDef { "pollen.devMode", "Mode développement, court-circuite l'envoi de mail", "true", Boolean.class), + LOG_CONFIGURATION_FILE( "logConfigurationFile", "Chemin vers le fichier de configuration des journaux", null, - String.class),; + String.class), + ; protected final String key; diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/AuthService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/AuthService.java deleted file mode 100644 index 7ede0de..0000000 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/AuthService.java +++ /dev/null @@ -1,93 +0,0 @@ -package org.chorem.pollen.services.service; - -/* - * #%L - * Pollen :: Service - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2013 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ - -import com.google.common.base.Preconditions; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.pollen.persistence.entity.PollenToken; -import org.chorem.pollen.persistence.entity.PollenUser; -import org.chorem.pollen.persistence.entity.SessionToken; -import org.chorem.pollen.services.bean.CreateBeanRef; -import org.chorem.pollen.services.service.security.PollenAuthenticationException; - -/** - * TODO - * - * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 - */ -public class AuthService extends PollenServiceSupport { - - /** Logger. */ - private static final Log log = LogFactory.getLog(AuthService.class); - - public CreateBeanRef login(String login, String password, Boolean rememberMe) throws PollenAuthenticationException { - - // Log-in user - PollenUser user = getSecurityService().login(login, password, rememberMe); - - // Generate a token - PollenToken pollenToken = getSecurityService().generateNewToken(); - - // Create session Token - SessionToken sessionToken = getSessionTokenDao().create( - SessionToken.PROPERTY_POLLEN_TOKEN, pollenToken, - SessionToken.PROPERTY_POLLEN_USER, user); - commit(); - - CreateBeanRef createBeanRef = new CreateBeanRef(); - createBeanRef.fromEntity(sessionToken); - return createBeanRef; - - } - - public void logout() { - - SessionToken sessionToken = getSecurityService().logout(); - if (sessionToken != null) { - - getSessionTokenDao().delete(sessionToken); - commit(); - - } - - } - - public void lostPassword(String login) { - - Preconditions.checkNotNull(login); - - PollenUser user = getPollenUserDao().forLoginEquals(login).findUnique(); - - String newPassword = serviceContext.generatePassword(); - - getSecurityService().setUserPassword(user, newPassword); - commit(); - - getNotificationService().onUserLostPasswordAsked(user, newPassword); - - } - -} diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java index 6adebc3..1530eb1 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java @@ -343,7 +343,7 @@ public class PollService extends PollenServiceSupport { ErrorMap errors = new ErrorMap(); checkNotNull(errors, Poll.PROPERTY_POLL_TYPE, poll.getPollType(), l(getLocale(), "pollen.error.poll.pollType.mandatory")); - checkNotNull(errors, Poll.PROPERTY_COMMENT_VISIBILITY, poll.getCommentVisibility(), l(getLocale(), "pollen.error.poll.pollType.mandatory commentVisibility")); + checkNotNull(errors, Poll.PROPERTY_COMMENT_VISIBILITY, poll.getCommentVisibility(), l(getLocale(), "pollen.error.poll.commentVisibility.mandatory")); checkNotNull(errors, Poll.PROPERTY_VOTE_VISIBILITY, poll.getVoteVisibility(), l(getLocale(), "pollen.error.poll.voteVisibility.mandatory")); checkNotNull(errors, Poll.PROPERTY_RESULT_VISIBILITY, poll.getResultVisibility(), l(getLocale(), "pollen.error.poll.resultVisibility.mandatory")); checkNotNull(errors, Poll.PROPERTY_VOTE_COUNTING_TYPE, poll.getVoteCountingType(), l(getLocale(), "pollen.error.poll.voteCountingType.mandatory")); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java index 219f7b3..6e1d273 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java @@ -106,10 +106,6 @@ public abstract class PollenServiceSupport implements PollenService { // -- Services -- // - protected AuthService getAuthService() { - return newService(AuthService.class); - } - public ChoiceService getChoiceService() { return newService(ChoiceService.class); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java index 46799f8..215eeab 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java @@ -44,9 +44,12 @@ import org.chorem.pollen.persistence.entity.PollenTokenTopiaDao; import org.chorem.pollen.persistence.entity.PollenUser; import org.chorem.pollen.persistence.entity.SessionToken; import org.chorem.pollen.persistence.entity.Vote; +import org.chorem.pollen.services.bean.CreateBeanRef; import org.chorem.pollen.services.service.PollenServiceSupport; import org.nuiton.topia.persistence.TopiaEntity; +import java.util.Calendar; +import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Objects; @@ -63,7 +66,7 @@ public class SecurityService extends PollenServiceSupport { /** Logger. */ private static final Log log = LogFactory.getLog(SecurityService.class); - public PollenUser login(String login, String password, Boolean rememberMe) throws PollenAuthenticationException { + public CreateBeanRef login(String login, String password, Boolean rememberMe) throws PollenAuthenticationException { Subject subject = getSubject(); UsernamePasswordToken token = new UsernamePasswordToken(login, password); @@ -78,34 +81,77 @@ public class SecurityService extends PollenServiceSupport { } PollenUser user = getPollenUserDao().forLoginEquals(login).findUnique(); - return user; + + // Generate a token + PollenToken pollenToken = generateNewToken(); + + // Set end date (createDate + sessionTimeoutDelay) + Calendar calendar = Calendar.getInstance(); + calendar.setTime(pollenToken.getCreationDate()); + calendar.add(Calendar.SECOND, getPollenServiceConfig().getSessionTimeoutDelay()); + + Date endDate = calendar.getTime(); + pollenToken.setEndDate(endDate); + + + // Create session Token + SessionToken sessionToken = getSessionTokenDao().create( + SessionToken.PROPERTY_POLLEN_TOKEN, pollenToken, + SessionToken.PROPERTY_POLLEN_USER, user); + commit(); + + CreateBeanRef createBeanRef = new CreateBeanRef(); + createBeanRef.fromEntity(sessionToken); + return createBeanRef; } - public SessionToken logout() { + public void logout() { SessionToken sessionToken = serviceContext.getSecurityContext().getSessionToken(); if (sessionToken != null) { Subject subject = getSecurityService().getSubject(); subject.logout(); + + getSessionTokenDao().delete(sessionToken); + commit(); } - return sessionToken; + } + + public void lostPassword(String login) { + + Preconditions.checkNotNull(login); + + PollenUser user = getPollenUserDao().forLoginEquals(login).findUnique(); + + String newPassword = serviceContext.generatePassword(); + + getSecurityService().setUserPassword(user, newPassword); + commit(); + + getNotificationService().onUserLostPasswordAsked(user, newPassword); } - public PollenToken generateNewToken() { + public void deleteObsoleteSessionTokens() { - PollenTokenTopiaDao dao = getPersistenceContext().getPollenTokenDao(); + Set<SessionToken> sessionTokens = getSessionTokenDao().findAllBeforeEndDate(serviceContext.getNow()); + getSessionTokenDao().deleteAll(sessionTokens); + commit(); - // Create instance - PollenToken pollenToken = dao.create(); - pollenToken.setCreationDate(serviceContext.getNow()); + } + + public PollenToken generateNewToken() { // Generate token String token = serviceContext.generateToken(); - pollenToken.setToken(token); + + // Create instance + PollenTokenTopiaDao dao = getPersistenceContext().getPollenTokenDao(); + PollenToken pollenToken = dao.createByNaturalId(token); + pollenToken.setCreationDate(serviceContext.getNow()); return pollenToken; @@ -130,11 +176,60 @@ public class SecurityService extends PollenServiceSupport { SessionToken sessionToken = null; if (token != null) { + sessionToken = getSessionTokenDao().findUniqueOrNullByToken(token); if (sessionToken == null) { throw new PollenInvalidSessionTokenException(); } + + // check that token is still valid + Date endDate = sessionToken.getPollenToken().getEndDate(); + Date now = serviceContext.getNow(); + + if (endDate.before(now)) { + + // expired token + if (log.isDebugEnabled()) { + log.debug(String.format("SessionToken %s delete expired : %s", sessionToken.getPollenToken().getToken(), endDate)); + } + getSessionTokenDao().delete(sessionToken); + commit(); + sessionToken = null; + + } else { + + int sessionTimeout = getPollenServiceConfig().getSessionTimeoutDelay(); + + Calendar calendar = Calendar.getInstance(); + // From now + calendar.setTimeInMillis(now.getTime()); + // add session timeout delay + calendar.add(Calendar.SECOND, sessionTimeout); + // retrieve 5 minutes + calendar.add(Calendar.MINUTE, -5); + + Date minEndDateToUpdate = calendar.getTime(); + + if (minEndDateToUpdate.after(endDate)) { + + // update end date (now + sessionTimeout) + calendar.setTime(now); + calendar.add(Calendar.SECOND, sessionTimeout); + Date newEndDate = calendar.getTime(); + + if (log.isDebugEnabled()) { + log.debug(String.format("SessionToken %s update endDate : %s", sessionToken.getPollenToken().getToken(), newEndDate)); + } + sessionToken.getPollenToken().setEndDate(newEndDate); + + commit(); + + } + + } + } + return sessionToken; } diff --git a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties index f91a7cf..15216c2 100644 --- a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties +++ b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties @@ -5,6 +5,7 @@ pollen.configuration.defaultPollResultVisibility=Default Result vsibility used w pollen.configuration.defaultPollType=Default Poll type used when creating a new poll pollen.configuration.defaultPollVoteVisibility=Default Poll vote visibility used when creating a new poll pollen.configuration.defaultVoteCountingType=Default vote counting type used when creating a new poll +pollen.configuration.sessionTimeoutDelay=Inactivity delay before invalidate the session of a user (in seconds) pollen.error.favoriteList.import.csv.already.used.email= pollen.error.favoriteList.import.csv.already.used.name= pollen.error.favoriteList.import.csv.invalid.email= @@ -15,7 +16,6 @@ pollen.error.poll.choice.mandatory=At least a choice is mandatory pollen.error.poll.commentVisibility.mandatory=comment visiblity is mandatory pollen.error.poll.mismatch.freePoll=cant' have a voter list for a free poll pollen.error.poll.pollType.mandatory=poll type is mandatory -pollen.error.poll.pollType.mandatory\ commentVisibility= pollen.error.poll.resultVisibility.mandatory=result visibility is mandatory pollen.error.poll.title.mandatory=title is mandatory pollen.error.poll.unique.voterList.mandatory.for.restrictedPoll=A voter list is mandatory for a restricted poll diff --git a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties index c28b780..1d2afbe 100644 --- a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties +++ b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties @@ -5,6 +5,7 @@ pollen.configuration.defaultPollResultVisibility=Visibilité des résultats par pollen.configuration.defaultPollType=Type de sondage par défaut lors de la création d'un nouveau sondage pollen.configuration.defaultPollVoteVisibility=Visibilité des votes par défaut lors de la création d'un nouveau sondage pollen.configuration.defaultVoteCountingType=Type de dépouillement par défaut lors de la création d'un nouveau sondage +pollen.configuration.sessionTimeoutDelay=Temps autorisé d'inactivité avant d'invalider une session utilisateur (en secondes) pollen.error.favoriteList.import.csv.already.used.email= pollen.error.favoriteList.import.csv.already.used.name= pollen.error.favoriteList.import.csv.invalid.email= @@ -14,7 +15,6 @@ pollen.error.favoriteList.import.ldap.invalid.email= pollen.error.poll.choice.mandatory=Au moins un choix est nécessaire pollen.error.poll.commentVisibility.mandatory=la visibilité des commentaires est obligatoire pollen.error.poll.pollType.mandatory=le type de sondage est obligatoire -pollen.error.poll.pollType.mandatory\ commentVisibility= pollen.error.poll.resultVisibility.mandatory=la visibilité des résultats est obligatoire pollen.error.poll.title.mandatory=le titre du sondage est obligatoire pollen.error.poll.unique.voterList.mandatory.for.restrictedPoll=une liste de votant est obligatoire pour un sondage restreint -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: fix print error in register and voter name, edit text for login error, Force charset utf-8
by Chorem.org scm 21 May '14

21 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 6e0b4142fa9ebdd0ec50ca61521aa0a00c2c6ca3 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 21 14:40:46 2014 +0200 fix print error in register and voter name, edit text for login error, Force charset utf-8 --- pollen-ui-angular/src/main/webapp/index.html | 1 + .../src/main/webapp/js/controllers/userCtrl.js | 2 +- .../src/main/webapp/partials/inline-poll.html | 2 +- .../src/main/webapp/partials/user-login.html | 2 +- .../src/main/webapp/partials/user-register.html | 36 +++++++++++++--------- 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 70f9b0f..63a7910 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -22,6 +22,7 @@ <html lang="en" ng-app="pollen"> <head> <title>Pollen</title> + <meta chaset="utf-8" /> <link href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet"/> <link rel="stylesheet" href="css/style.css"/> diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index 6857fa7..87a3a70 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -50,7 +50,7 @@ }) SessionStorage.save({'token':data.permission}); }, function (error) { - $scope.restError = {connexion : "Utilisateur ou Mot de passe faux"}; + $scope.restError = {connexion : "Erreur sur le nom d'utilisateur ou le mot de passe"}; }); delete $scope.data.user; } diff --git a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html index b3d0f9d..9decf83 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -52,7 +52,7 @@ <tr ng-show="!globalVariables.editMode"> <td class="pollChoice"> <input type="text" class="form-control" placeholder="votre nom" ng-model="data.vote.voterName" /> - <info-error error="data.vote.restError.voterName" data="data.vote.voteName"></info-error> + <info-error error="data.vote.restError.voterName[0]" data="data.vote.voteName"></info-error> </td> <td ng-repeat="choice in data.vote.choice" class="pollChoice"> <input type="checkbox" name="{{choice.choiceId}}" ng-model="choice.voteValue" /> diff --git a/pollen-ui-angular/src/main/webapp/partials/user-login.html b/pollen-ui-angular/src/main/webapp/partials/user-login.html index 01c7d11..a14be4c 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-login.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-login.html @@ -2,7 +2,7 @@ <div class="control-group"> <label class="control-label"> - Utilisateur + Nom d'Utilisateur <info-error error="restError.connexion" data="data.user"></info-error> </label> <input type="text" name='login' ng-model="data.user.login" class="form-control"/> diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html index 3557b89..5d0d583 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -18,49 +18,57 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> -<div> + <h2> Inscription sur Pollen</h2> + <br/><br/><br/> <form ng-submit="submit()" class="form-horizontal"> <div class="form-group"> - <label for="formName" class="col-sm-4 text-right"> - Nom d'utilisateur : - <info-error error="restError.login[0]" data="data.user.login"></info-error> + <label for="formName" class="col-sm-3 text-right"> + Nom d'utilisateur </label> <div class="col-sm-8"> <input type="text" id="formName" name="login" class="form-control" ng-model="data.user.login"/> </div> + <div class="col-sm-1"> + <info-error error="restError.login[0]" data="data.user.login"></info-error> + </div> </div> <div class="form-group"> - <label for="formEmail" class="col-sm-4 text-right"> - E-Mail : - <info-error error="restError.email[0]" data="data.user.email"></info-error> + + <label for="formEmail" class="col-sm-3 text-right"> + Adresse E-Mail </label> + <div class="col-sm-8"> <input type="email" id="formEmail" name="email" class="form-control" ng-model="data.user.email"/> </div> + <div class="col-sm-1"> + <info-error error="restError.email[0]" data="data.user.email"></info-error> + </div> </div> <div class="form-group"> - <label for="formPassword" class="col-sm-4 text-right"> - Mot de passe : + <label for="formPassword" class="col-sm-3 text-right"> + Mot de passe </label> <div class="col-sm-8"> <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/> </div> </div> <div class="form-group"> - <label for="formPassword2" class="col-sm-4 text-right"> - Confirmation : - <span class="glyphicon glyphicon-exclamation-sign danger" tooltip="Mot de passe différent" ng-if="data.user.password != data.user.password2"></span> + <label for="formPassword2" class="col-sm-3 text-right"> + Confirmation </label> <div class="col-sm-8"> <input type="password" id="formPassword2" name="password2" class="form-control" ng-model="data.user.password2"/> </div> + <div class="col-sm-1"> + <span class="glyphicon glyphicon-exclamation-sign danger" tooltip="Mot de passe différent" ng-if="data.user.password != data.user.password2"></span> + </div> </div> <div class="form-group"> <button class="btn btn-primary" type="submit">Envoyer</button> </div> - </form> -</div> \ No newline at end of file + </form> \ No newline at end of file -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/03: print error for log
by Chorem.org scm 21 May '14

21 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit a2058b63c54b1d0e9873fa3e10564d71c92b2c8c Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 21 12:42:46 2014 +0200 print error for log --- pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js | 5 ++++- pollen-ui-angular/src/main/webapp/partials/user-login.html | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index cbd2446..6857fa7 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -41,7 +41,7 @@ $scope.data = {user:{}}; } $scope.currentUser = SessionStorage.get().user; - + $scope.login = function () { UserLogin.login({}, $scope.data.user, function (data) { User.get({userId: data.id}, function (user) { @@ -49,7 +49,10 @@ SessionStorage.save({'user':user}); }) SessionStorage.save({'token':data.permission}); + }, function (error) { + $scope.restError = {connexion : "Utilisateur ou Mot de passe faux"}; }); + delete $scope.data.user; } $scope.logout = function () { diff --git a/pollen-ui-angular/src/main/webapp/partials/user-login.html b/pollen-ui-angular/src/main/webapp/partials/user-login.html index e03817f..01c7d11 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-login.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-login.html @@ -1,9 +1,11 @@ <form id='loginForm' ng-submit="login()"> <div class="control-group"> - <label class="control-label">Utilisateur</label> + <label class="control-label"> + Utilisateur + <info-error error="restError.connexion" data="data.user"></info-error> + </label> <input type="text" name='login' ng-model="data.user.login" class="form-control"/> - <span class="help-block hide"></span> </div> <div class="control-group"> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/03: save currentUser
by Chorem.org scm 21 May '14

21 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 3fd3cc45f125a1881cff8b3e78c32f81451edfe4 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 21 12:26:10 2014 +0200 save currentUser --- pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index c05cb4e..cbd2446 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -40,6 +40,8 @@ if (angular.isUndefined($scope.data)) { $scope.data = {user:{}}; } + $scope.currentUser = SessionStorage.get().user; + $scope.login = function () { UserLogin.login({}, $scope.data.user, function (data) { User.get({userId: data.id}, function (user) { @@ -53,6 +55,7 @@ $scope.logout = function () { UserLogout.logout(function (data) { SessionStorage.remove('token'); + SessionStorage.remove('user'); delete $scope.currentUser; }) } -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0