[jboss-svn-commits] JBL Code SVN: r34867 - in labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src: main/java/org/jboss/labs/sbs/plugin/nukesauth and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Aug 24 09:34:34 EDT 2010
Author: lkrzyzanek
Date: 2010-08-24 09:34:34 -0400 (Tue, 24 Aug 2010)
New Revision: 34867
Modified:
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/changes/changes.xml
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManager.java
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManagerImpl.java
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/filter/NukesSyncFilter.java
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/plugin.xml
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/spring.xml
Log:
Implemented ORG-700
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/changes/changes.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/changes/changes.xml 2010-08-24 12:51:23 UTC (rev 34866)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/changes/changes.xml 2010-08-24 13:34:34 UTC (rev 34867)
@@ -10,11 +10,14 @@
<body>
- <release version="1.1.0" date="2010-08-18"
- description="Upgraded to work with Nukes in Mysql5">
+ <release version="1.1.0" date="2010-08-24"
+ description="Upgraded to work with Nukes in Mysql5 and SBS 4.5">
<action type="update" dev="lkrzyzan" date="2010-08-18">
<fixes issue="ORG-658" />
</action>
+ <action type="add" dev="lkrzyzan" date="2010-08-24" >
+ <fixes issue="ORG-700"/>
+ </action>
</release>
<release version="1.0.0" date="2010-08-03" description="Initial version" />
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManager.java 2010-08-24 12:51:23 UTC (rev 34866)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManager.java 2010-08-24 13:34:34 UTC (rev 34867)
@@ -26,6 +26,7 @@
import java.util.Locale;
import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.DisabledException;
import org.acegisecurity.userdetails.UsernameNotFoundException;
import org.jboss.labs.sbs.plugin.nukesauth.dao.NukesUser;
import org.jboss.labs.sbs.plugin.nukesauth.dao.NukesUserMapper;
@@ -46,9 +47,10 @@
* @param password
* @throws UsernameNotFoundException user not in Nukes DB
* @throws BadCredentialsException password doesn't match username
+ * @throws DisabledException account is globally disabled
*/
public void authenticateNukesUser(String username, String password) throws UsernameNotFoundException,
- BadCredentialsException;
+ BadCredentialsException, DisabledException;
/**
* Get Nukes Accounts by e-mail. Match is case insensitive.
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManagerImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManagerImpl.java 2010-08-24 12:51:23 UTC (rev 34866)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManagerImpl.java 2010-08-24 13:34:34 UTC (rev 34867)
@@ -29,6 +29,7 @@
import java.util.Map;
import org.acegisecurity.BadCredentialsException;
+import org.acegisecurity.DisabledException;
import org.acegisecurity.providers.encoding.PasswordEncoder;
import org.acegisecurity.userdetails.UsernameNotFoundException;
import org.apache.log4j.LogManager;
@@ -67,12 +68,16 @@
@Override
public void authenticateNukesUser(String username, String password) throws UsernameNotFoundException,
- BadCredentialsException {
+ BadCredentialsException, DisabledException {
NukesUser nukesUser = getAccountByUsername(username);
if (nukesUser == null) {
throw new UsernameNotFoundException("User '" + username + "' not found.");
}
+ if (nukesUser.isGloballyDisabled()) {
+ throw new DisabledException("Nukes Account is globally disabled");
+ }
+
String hash = passwordEncoder.encodePassword(password, null);
if (!hash.equals(nukesUser.getPasswordHash())) {
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/filter/NukesSyncFilter.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/filter/NukesSyncFilter.java 2010-08-24 12:51:23 UTC (rev 34866)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/filter/NukesSyncFilter.java 2010-08-24 13:34:34 UTC (rev 34867)
@@ -32,6 +32,7 @@
import javax.servlet.http.HttpServletResponse;
import org.acegisecurity.AuthenticationException;
+import org.acegisecurity.DisabledException;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.jboss.labs.sbs.plugin.nukesauth.NukesAccountManager;
@@ -120,6 +121,11 @@
try {
nukesAccountManager.authenticateNukesUser(username, password);
log.info("Nukes account successfuly authenticated");
+ } catch (DisabledException failed) {
+ log.info("Account is disabled.");
+ String failureUrl = determineFailureUrl(httpRequest, failed);
+ sendRedirect(httpRequest, httpResponse, failureUrl);
+ return;
} catch (AuthenticationException failed) {
log.info("Cannot authenticate nukes user. " + failed.getMessage());
// Authentication failed - let following filters to handle 'not
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/plugin.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/plugin.xml 2010-08-24 12:51:23 UTC (rev 34866)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/plugin.xml 2010-08-24 13:34:34 UTC (rev 34867)
@@ -4,6 +4,6 @@
<description>Provides integration with Nukes accounts</description>
<author>JBoss Community</author>
<version>1.1.0</version>
- <minServerVersion>4.0.0</minServerVersion>
+ <minServerVersion>4.5.3</minServerVersion>
</plugin>
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/spring.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/spring.xml 2010-08-24 12:51:23 UTC (rev 34866)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/spring.xml 2010-08-24 13:34:34 UTC (rev 34867)
@@ -18,6 +18,7 @@
<property name="filterProcessesUrl">
<value>/cs_login</value> <!-- Must be exactly same like in formAuthenticationFilter -->
</property>
+ <property name="exceptionMappings" ref="exceptionMappings" />
</bean>
<bean id="nukesPasswordEncoder"
@@ -61,7 +62,7 @@
<property name="nukesAccountManager" ref="nukesAccountManager" />
</bean>
- <!-- Must be exactly same lik in spring-managerContext.xml !!! -->
+ <!-- Must be exactly same like in spring-managerContext.xml !!! -->
<bean id="registrationManagerImpl"
class="org.jboss.labs.sbs.plugin.nukesauth.proxy.RegistrationManagerNukesProxy"
parent="jiveManager">
@@ -72,6 +73,7 @@
<property name="entitlementManager" ref="entitlementManagerImpl" />
<property name="jiveObjectModerator" ref="jiveObjectModerator" />
<property name="communityManager" ref="communityManagerImpl" />
+ <property name="termsAndConditionsDAO" ref="termsAndConditionsDAO" />
<property name="nukesAccountManager" ref="nukesAccountManager" />
</bean>
More information about the jboss-svn-commits
mailing list