[parancoe] 2 new revisions pushed by enricogi...@gmail.com on 2012-09-21 03:59 GMT

[para...@googlecode.com]

2 new revisions:

Revision: 3069fc145d2e
Branch: default
Author: enricogiurin <enrico...@gmail.com>
Date: Thu Sep 20 20:43:08 2012
Log: issue-14 - removed opendId support
http://code.google.com/p/parancoe/source/detail?r=3069fc145d2e

Revision: 25a22e63be42
Branch: default
Author: enricogiurin <enrico...@gmail.com>
Date: Thu Sep 20 20:44:40 2012
Log: merged
http://code.google.com/p/parancoe/source/detail?r=25a22e63be42

==============================================================================
Revision: 3069fc145d2e
Branch: default
Author: enricogiurin <enrico...@gmail.com>
Date: Thu Sep 20 20:43:08 2012
Log: issue-14 - removed opendId support
http://code.google.com/p/parancoe/source/detail?r=3069fc145d2e

Deleted:

/plugins/parancoe-plugin-springsecurity-evolution/src/main/java/org/parancoe/plugins/securityevolution/ParancoeOpenIDUserDetailsService.java

/plugins/parancoe-plugin-springsecurity-evolution/src/test/java/org/parancoe/plugins/securityevolution/ParancoeUserDetailsServiceTest.java
Modified:
/plugins/parancoe-plugin-springsecurity-evolution/pom.xml

/plugins/parancoe-plugin-springsecurity-evolution/src/main/java/org/parancoe/plugins/securityevolution/User.java

/plugins/parancoe-plugin-springsecurity-evolution/src/main/java/org/parancoe/plugins/securityevolution/UserDao.java

/plugins/parancoe-plugin-springsecurity-evolution/src/test/resources/fixtures/User.yml

=======================================
---
/plugins/parancoe-plugin-springsecurity-evolution/src/main/java/org/parancoe/plugins/securityevolution/ParancoeOpenIDUserDetailsService.java
Thu Apr 26 07:55:31 2012
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Copyright (C) 2006-2012 The Parancoe Team <in...@parancoe.org>
- *
- * This file is part of Parancoe Plugin Spring Security Evolution.
- *
- * 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.parancoe.plugins.securityevolution;
-
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import
org.springframework.security.core.userdetails.AuthenticationUserDetailsService;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import
org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.security.openid.OpenIDAttribute;
-import org.springframework.security.openid.OpenIDAuthenticationToken;
-
-/**
- * @author enrico
- *
- */
-public class ParancoeOpenIDUserDetailsService implements
- AuthenticationUserDetailsService<OpenIDAuthenticationToken> {
- @Resource
- private UserDetailsService userDetailsService;
- @Resource
- private UserDao userDao;
-
- public UserDetails loadUserDetails(OpenIDAuthenticationToken token) {
- String id = token.getIdentityUrl();
- String email = null;
-
- List<OpenIDAttribute> attributes = token.getAttributes();
- for (OpenIDAttribute attribute : attributes) {
- if (attribute.getName().equals("email")) {
- email = attribute.getValues().get(0);
- break;
- }
- }
- if(email == null)
- {
- throw new UsernameNotFoundException("There is no email
associated to this openID token: "+id);
- }
- List<User> users = userDao.findByContactEmail(email);
- //we have to make sure that email is bound to a single user
- if(users.size() != 1)
- {
- throw new UsernameNotFoundException("Found "+users.size()+"
users having contactEmail: "+email);
- }
- return
userDetailsService.loadUserByUsername(users.get(0).getUsername());
-
-}
- }
=======================================
---
/plugins/parancoe-plugin-springsecurity-evolution/src/test/java/org/parancoe/plugins/securityevolution/ParancoeUserDetailsServiceTest.java
Thu Apr 26 07:55:31 2012
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Copyright (C) 2006-2012 The Parancoe Team <in...@parancoe.org>
- *
- * This file is part of Parancoe Plugin Spring Security Evolution.
- *
- * 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.parancoe.plugins.securityevolution;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.annotation.Resource;
-
-
-import org.parancoe.web.test.PluginTest;
-import org.springframework.dao.DataAccessException;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-import
org.springframework.security.core.userdetails.UsernameNotFoundException;
-
-/**
- * @author enricogiurin
- *
- */
-public class ParancoeUserDetailsServiceTest extends PluginTest {
- public static final String USERNAME = "parancoe";
- public static final String INVALID_USERNAME = "invalid";
- public static final String PWD = "parancoe";
-
- @Resource
- private ParancoeUserDetailsService parancoeUserDetailsService;
-
-
- /**
- * Test method for {@link
org.parancoe.plugins.securityevolution.ParancoeUserDetailsService#loadUserByUsername(java.lang.String)}.
- * Trying using TDD approach
- */
-
- public void testLoadUserByUsername() {
- UserDetails parancoeUD =
parancoeUserDetailsService.loadUserByUsername(USERNAME);
- assertEquals(USERNAME, parancoeUD.getUsername());
- //assertEquals(PWD, enricoUD.getPassword());
- assertTrue(parancoeUD.isEnabled());
-
- List<GrantedAuthority> listGA = new
ArrayList<GrantedAuthority>(parancoeUD.getAuthorities());
- assertEquals(1, listGA.size());
- assertEquals("ROLE_USER", listGA.get(0).getAuthority());
- }
-
-
- public void testLoadUserByUsernameWithNoExisingUser() {
- try {
- parancoeUserDetailsService.loadUserByUsername(INVALID_USERNAME);
- fail();
- } catch (UsernameNotFoundException e) {
- assertEquals("username "+INVALID_USERNAME+" not found in the system",
e.getMessage());
- }
-
-
- }
-
- @Override
- public Class[] getFixtureClasses() {
- // TODO Auto-generated method stub
- return new Class[]{Authority.class, Group.class, User.class};
- }
-
-}
=======================================
--- /plugins/parancoe-plugin-springsecurity-evolution/pom.xml Sun Mar 18
17:44:31 2012
+++ /plugins/parancoe-plugin-springsecurity-evolution/pom.xml Thu Sep 20
20:43:08 2012
@@ -121,12 +121,7 @@
<artifactId>spring-security-config</artifactId>
<version>${parancoe.springsecurity.version}</version>
</dependency>
- <!-- openId support -->
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-openid</artifactId>
- <version>3.1.0.RELEASE</version>
- </dependency>
+

<dependency>
<groupId>commons-dbcp</groupId>
=======================================
---
/plugins/parancoe-plugin-springsecurity-evolution/src/main/java/org/parancoe/plugins/securityevolution/User.java
Mon Sep 17 15:43:53 2012
+++
/plugins/parancoe-plugin-springsecurity-evolution/src/main/java/org/parancoe/plugins/securityevolution/User.java
Thu Sep 20 20:43:08 2012
@@ -49,12 +49,11 @@
private static final long serialVersionUID = 832363948575562242L;
@NotBlank
private String username = null;
- @NotBlank
+ // @NotBlank
private String password = null;
private String oldPassword = null;

- @Email
- private String contactEmail;
+
private boolean enabled = true;
private boolean locked = Boolean.FALSE;
private List<Group> groups;
@@ -134,19 +133,8 @@
public List<Group> getGroups() {
return groups;
}
-

public void setGroups(List<Group> groups) {
this.groups = groups;
- }
-
-
- public String getContactEmail() {
- return contactEmail;
- }
-
-
- public void setContactEmail(String contactEmail) {
- this.contactEmail = contactEmail;
- }
+ }
}
=======================================
---
/plugins/parancoe-plugin-springsecurity-evolution/src/main/java/org/parancoe/plugins/securityevolution/UserDao.java
Thu Apr 26 07:55:31 2012
+++
/plugins/parancoe-plugin-springsecurity-evolution/src/main/java/org/parancoe/plugins/securityevolution/UserDao.java
Thu Sep 20 20:43:08 2012
@@ -53,7 +53,7 @@
*/
List<User> findByPartialUsername(String username);

- List<User> findByContactEmail(String contactEmail);
+


}
=======================================
---
/plugins/parancoe-plugin-springsecurity-evolution/src/test/resources/fixtures/User.yml
Thu Apr 26 07:55:31 2012
+++
/plugins/parancoe-plugin-springsecurity-evolution/src/test/resources/fixtures/User.yml
Thu Sep 20 20:43:08 2012
@@ -38,7 +38,6 @@
password: d928b1a8468c96804da6fcc70bff826f
enabled: true
locked: true
- contactEmail: enrico...@gmail.com
groups:
- *Group-administrator


==============================================================================
Revision: 25a22e63be42
Branch: default
Author: enricogiurin <enrico...@gmail.com>
Date: Thu Sep 20 20:44:40 2012
Log: merged
http://code.google.com/p/parancoe/source/detail?r=25a22e63be42