migrate pages.xml restrict and require-login to jsf backed bean

zanata · Jul 21, 2015 · e29c41a · e29c41a
1 parent 039807e
commit e29c41a
Show file tree

Hide file tree

Showing 27 changed files with 650 additions and 137 deletions.
diff --git a/zanata-model/src/main/java/org/zanata/model/HAccount.java b/zanata-model/src/main/java/org/zanata/model/HAccount.java
@@ -50,11 +50,6 @@
 import org.hibernate.annotations.NaturalId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Indexed;
-import org.jboss.seam.annotations.security.management.UserEnabled;
-import org.jboss.seam.annotations.security.management.UserPassword;
-import org.jboss.seam.annotations.security.management.UserPrincipal;
-import org.jboss.seam.annotations.security.management.UserRoles;
-import org.jboss.seam.security.management.PasswordHash;
 import org.zanata.model.security.HCredentials;
 import org.zanata.model.type.UserApiKey;
 import org.zanata.rest.dto.Account;
@@ -108,7 +103,7 @@ public HPerson getPerson() {
     }
 
     @NaturalId
-    @UserPrincipal
+//    @UserPrincipal
     @Field()
     public String getUsername() {
         return username;
@@ -119,12 +114,12 @@ public boolean isPersonAccount() {
         return person != null;
     }
 
-    @UserPassword(hash = PasswordHash.ALGORITHM_MD5)
+//    @UserPassword(hash = PasswordHash.ALGORITHM_MD5)
     public String getPasswordHash() {
         return passwordHash;
     }
 
-    @UserEnabled
+//    @UserEnabled
     public boolean isEnabled() {
         return enabled;
     }
@@ -136,7 +131,7 @@ public String getApiKey() {
     }
 
     @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
-    @UserRoles
+//    @UserRoles
     @ManyToMany(targetEntity = HAccountRole.class)
     @JoinTable(name = "HAccountMembership", joinColumns = @JoinColumn(
             name = "accountId"), inverseJoinColumns = @JoinColumn(

diff --git a/zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java b/zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
@@ -28,6 +28,7 @@
 import lombok.Setter;
 
 import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Create;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Out;
@@ -37,6 +38,7 @@
 import org.zanata.dao.AccountDAO;
 import org.zanata.model.HAccount;
 import org.zanata.security.AuthenticationManager;
+import org.zanata.security.ZanataIdentity;
 import org.zanata.security.openid.OpenIdAuthCallback;
 import org.zanata.security.openid.OpenIdAuthenticationResult;
 import org.zanata.security.openid.OpenIdProviderType;
@@ -76,6 +78,11 @@ public class AccountMergeAction implements Serializable {
 
     private boolean accountsValid;
 
+    @Create
+    public void onCreate() {
+        ZanataIdentity.instance().checkLoggedIn();
+    }
+
     public boolean getAccountsValid() {
         return accountsValid;
     }

diff --git a/zanata-war/src/main/java/org/zanata/action/GlossaryAction.java b/zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
@@ -22,6 +22,8 @@
 import org.zanata.i18n.Messages;
 import org.zanata.model.HLocale;
 import org.zanata.rest.dto.Glossary;
+import org.zanata.security.annotations.CheckLoggedIn;
+import org.zanata.security.annotations.ZanataSecured;
 import org.zanata.service.GlossaryFileService;
 import org.zanata.ui.AbstractListFilter;
 import org.zanata.ui.InMemoryListFilter;
@@ -38,6 +40,8 @@
 
 @Name("glossaryAction")
 @Scope(ScopeType.PAGE)
+@ZanataSecured
+@CheckLoggedIn
 @Slf4j
 public class GlossaryAction implements Serializable {
     private static final long serialVersionUID = 1L;

diff --git a/zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java b/zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
@@ -8,10 +8,12 @@
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.validator.constraints.Email;
 import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Create;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
 import org.jboss.seam.annotations.Transactional;
+import org.jboss.seam.security.AuthorizationException;
 import org.zanata.action.validator.NotDuplicateEmail;
 import org.zanata.dao.AccountActivationKeyDAO;
 import org.zanata.dao.AccountDAO;
@@ -20,6 +22,7 @@
 import org.zanata.model.HAccount;
 import org.zanata.model.HAccountActivationKey;
 import org.zanata.model.HPerson;
+import org.zanata.security.AuthenticationManager;
 import org.zanata.security.AuthenticationType;
 import org.zanata.security.ZanataCredentials;
 import org.zanata.security.ZanataOpenId;
@@ -53,6 +56,9 @@ public class InactiveAccountAction implements Serializable {
     @In
     private AccountActivationKeyDAO accountActivationKeyDAO;
 
+    @In
+    private AuthenticationManager authenticationManager;
+
     @Getter
     @Setter
     @Email
@@ -63,6 +69,14 @@ public class InactiveAccountAction implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+
+    @Create
+    public void onCreate() {
+        if (!authenticationManager.isAuthenticatedAccountWaitingForActivation()) {
+            throw new AuthorizationException("Account is not waiting for activation");
+        }
+    }
+
     private HAccount getAccount() {
         if(account == null) {
             if (credentials.getAuthType() == AuthenticationType.OPENID) {

diff --git a/zanata-war/src/main/java/org/zanata/action/NewProfileAction.java b/zanata-war/src/main/java/org/zanata/action/NewProfileAction.java
@@ -29,6 +29,7 @@
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
 import org.jboss.seam.annotations.Transactional;
+import org.jboss.seam.security.AuthorizationException;
 import org.zanata.ApplicationConfiguration;
 import org.zanata.i18n.Messages;
 import org.zanata.security.AuthenticationType;
@@ -67,6 +68,9 @@ public class NewProfileAction extends AbstractProfileAction implements Serializa
 
     @Create
     public void onCreate() {
+        if (!identity.isPreAuthenticated()) {
+            throw new AuthorizationException("Need to be in pre authenticated state");
+        }
         if (identity.getCredentials().getAuthType() != AuthenticationType.OPENID) {
             // Open id user names are url's so they don't make good defaults
             username = identity.getCredentials().getUsername();

diff --git a/zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java b/zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
@@ -18,6 +18,8 @@
 import org.jboss.seam.security.NotLoggedInException;
 import org.jboss.seam.security.RunAsOperation;
 import org.jboss.seam.security.management.IdentityManager;
+import org.jboss.seam.ui.UnauthorizedCommandException;
+import org.zanata.ApplicationConfiguration;
 import org.zanata.exception.KeyNotFoundException;
 import org.zanata.i18n.Messages;
 import org.zanata.model.HAccountResetPasswordKey;
@@ -42,6 +44,9 @@ public class PasswordResetAction implements Serializable {
     @In
     private Messages msgs;
 
+    @In
+    private ApplicationConfiguration applicationConfiguration;
+
     @Getter
     private String activationKey;
 
@@ -81,6 +86,10 @@ public void setActivationKey(String activationKey) {
 
     @Begin(join = true)
     public void validateActivationKey() {
+        if (!applicationConfiguration.isInternalAuth()) {
+            throw new AuthorizationException(
+                    "Password reset is only available for server using internal authentication");
+        }
 
         if (getActivationKey() == null)
             throw new KeyNotFoundException();

diff --git a/zanata-war/src/main/java/org/zanata/action/ProjectHome.java b/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
@@ -259,6 +259,7 @@ protected boolean include(HPerson elem, String filter) {
             };
 
     public void createNew() {
+        identity.checkPermission(getInstance(), "insert");
         getInstance().setDefaultProjectType(ProjectType.File);
         selectedProjectType = getInstance().getDefaultProjectType().name();
         enteredLocaleAliases.putAll(getLocaleAliases());

diff --git a/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java b/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
@@ -66,6 +66,7 @@
 @Scope(ScopeType.PAGE)
 @Slf4j
 public class TranslationMemoryAction implements Serializable {
+    private static final long serialVersionUID = -6791743907133760028L;
     @In("jsfMessages")
     private FacesMessages facesMessages;
 

diff --git a/zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.java b/zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.java
@@ -47,6 +47,7 @@
 @CheckRole("admin")
 @Slf4j
 public class TranslationMemoryHome extends EntityHome<TransMemory> {
+    private static final long serialVersionUID = -8557363011909155662L;
     @In
     private SlugEntityService slugEntityServiceImpl;