Guest and LDAP progress

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2127 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/importer/ExportSource.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * 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.alfresco.repo.importer;
+
+import org.dom4j.io.XMLWriter;
+
+public interface ExportSource
+{
+    /**
+     * Generate XML suitable for use with the importer.
+     * 
+     * @param writer
+     */
+    public void generateExport(XMLWriter writer);
+}

source/java/org/alfresco/repo/importer/ExportSourceImporter.java

@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * 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.alfresco.repo.importer;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
+
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.view.ImporterBinding;
+import org.alfresco.service.cmr.view.ImporterService;
+import org.alfresco.service.cmr.view.Location;
+import org.alfresco.util.TempFileProvider;
+import org.dom4j.io.OutputFormat;
+import org.dom4j.io.XMLWriter;
+
+public class ExportSourceImporter implements ImporterJobSPI
+{
+    private ImporterService importerService;
+
+    private ExportSource exportSource;
+
+    private StoreRef storeRef;
+
+    private String path;
+
+    public ExportSourceImporter()
+    {
+        super();
+    }
+
+    public void setImporterService(ImporterService importerService)
+    {
+        this.importerService = importerService;
+    }
+
+    public void setExportSource(ExportSource exportSource)
+    {
+        this.exportSource = exportSource;
+    }
+
+    public void doImport()
+    {
+        try
+        {
+            File tempFile = TempFileProvider.createTempFile("ExportSourceImporter-", ".xml");
+            Writer writer = new BufferedWriter(new FileWriter(tempFile));
+            XMLWriter xmlWriter = createXMLExporter(writer);
+            exportSource.generateExport(xmlWriter);
+            xmlWriter.close();
+
+            Reader reader = new BufferedReader(new FileReader(tempFile));
+
+            Location location = new Location(storeRef);
+            location.setPath(path);
+
+            importerService.importView(reader, location, REPLACE_BINDING, null);
+            reader.close();
+        }
+        catch (IOException io)
+        {
+            throw new ExportSourceImporterException("Failed to import", io);
+        }
+    }
+
+    private XMLWriter createXMLExporter(Writer writer)
+    {
+        // Define output format
+        OutputFormat format = OutputFormat.createPrettyPrint();
+        format.setNewLineAfterDeclaration(false);
+        format.setIndentSize(3);
+        format.setEncoding("UTF-8");
+
+        // Construct an XML Exporter
+
+        XMLWriter xmlWriter = new XMLWriter(writer, format);
+        return xmlWriter;
+    }
+
+    private static ImporterBinding REPLACE_BINDING = new ImporterBinding()
+    {
+
+        public UUID_BINDING getUUIDBinding()
+        {
+            return UUID_BINDING.REPLACE_EXISTING;
+        }
+
+        public String getValue(String key)
+        {
+            return null;
+        }
+
+    };
+
+}

source/java/org/alfresco/repo/importer/ExportSourceImporterException.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * 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.alfresco.repo.importer;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+
+public class ExportSourceImporterException extends AlfrescoRuntimeException
+{
+
+    /**
+     * Comment for <code>serialVersionUID</code>
+     */
+    private static final long serialVersionUID = -2366069362776024153L;
+
+    public ExportSourceImporterException(String msgId)
+    {
+        super(msgId);
+    }
+
+    public ExportSourceImporterException(String msgId, Object[] msgParams)
+    {
+        super(msgId, msgParams);
+    }
+
+    public ExportSourceImporterException(String msgId, Throwable cause)
+    {
+        super(msgId, cause);
+    }
+
+    public ExportSourceImporterException(String msgId, Object[] msgParams, Throwable cause)
+    {
+        super(msgId, msgParams, cause);
+    }
+
+}

source/java/org/alfresco/repo/importer/ImporterComponent.java

@@ -569,7 +569,7 @@ public class ImporterComponent
                     searchParameters.addStore(importedRef.context.getNodeRef().getStoreRef());
                     searchParameters.setLanguage(SearchService.LANGUAGE_LUCENE);
                     searchParameters.setQuery("PATH:\"" + importedRef.value + "\"");
-                    searchParameters.excludeDataInTheCurrentTransaction(true);
+                    searchParameters.excludeDataInTheCurrentTransaction(false);
                     ResultSet resultSet = searchService.query(searchParameters);
                     try
                     {

source/java/org/alfresco/repo/importer/ImporterJob.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * 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.alfresco.repo.importer;
+
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+public class ImporterJob implements Job
+{
+    public ImporterJob()
+    {
+        super();
+    }
+
+    public void execute(JobExecutionContext executionContext) throws JobExecutionException
+    {
+        ImporterJobSPI importerJob = (ImporterJobSPI) executionContext.getJobDetail().getJobDataMap()
+                .get("bean");
+        if (importerJob != null)
+        {
+            importerJob.doImport();
+        }
+
+    }
+}

source/java/org/alfresco/repo/importer/ImporterJobSPI.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * 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.alfresco.repo.importer;
+
+public interface ImporterJobSPI
+{
+    public void doImport();
+}

source/java/org/alfresco/repo/search/impl/lucene/LuceneIndexerImpl.java

@@ -81,7 +81,7 @@ import org.apache.lucene.search.TermQuery;
  * behaviour if used on its own.
  * 
  * @author andyh
- * 
+ *  
  */
 public class LuceneIndexerImpl extends LuceneBase implements LuceneIndexer
 {

source/java/org/alfresco/repo/search/impl/lucene/LuceneTest.java

@@ -3128,6 +3128,7 @@ public class LuceneTest extends TestCase
         ResultSet results = test.serviceRegistry.getSearchService().query(sp);
 
         results.close();
-
+        
+        //test.dictionaryService.getType(test.nodeService.getType(test.rootNodeRef)).getDefaultAspects();
     }
 }

source/java/org/alfresco/repo/security/authentication/AbstractAuthenticationComponent.java

@@ -17,6 +17,7 @@
 package org.alfresco.repo.security.authentication;
 
 import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.service.cmr.security.PermissionService;
 
 import net.sf.acegisecurity.Authentication;
 import net.sf.acegisecurity.GrantedAuthority;
@@ -30,11 +31,9 @@ import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 import net.sf.acegisecurity.providers.dao.User;
 
 /**
- * This class abstract the support required to set up and query the Acegi
- * context for security enforcement.
+ * This class abstract the support required to set up and query the Acegi context for security enforcement.
  * 
- * There are some simple default method implementations to support simple
- * authentication.
+ * There are some simple default method implementations to support simple authentication.
  * 
  * @author Andy Hind
  */
@@ -45,11 +44,18 @@ public abstract class AbstractAuthenticationComponent implements AuthenticationC
 
     private static final String SYSTEM_USER_NAME = "System";
 
+    private Boolean allowGuestLogin = null;
+
     public AbstractAuthenticationComponent()
     {
         super();
     }
 
+    public void setAllowGuestLogin(Boolean allowGuestLogin)
+    {
+        this.allowGuestLogin = allowGuestLogin;
+    }
+    
     /**
      * Explicitly set the current user to be authenticated.
      * 
@@ -59,11 +65,11 @@ public abstract class AbstractAuthenticationComponent implements AuthenticationC
      */
     public Authentication setCurrentUser(String userName) throws AuthenticationException
     {
-        if(userName == null)
+        if (userName == null)
         {
             throw new AuthenticationException("Null user name");
         }
-        
+
         try
         {
             UserDetails ud = null;
@@ -73,6 +79,11 @@ public abstract class AbstractAuthenticationComponent implements AuthenticationC
                 gas[0] = new GrantedAuthorityImpl("ROLE_SYSTEM");
                 ud = new User(SYSTEM_USER_NAME, "", true, true, true, true, gas);
             }
+            else if (userName.equals(PermissionService.GUEST))
+            {
+                GrantedAuthority[] gas = new GrantedAuthority[0];
+                ud = new User(PermissionService.GUEST, "", true, true, true, true, gas);
+            }
             else
             {
                 ud = getUserDetails(userName);
@@ -199,6 +210,46 @@ public abstract class AbstractAuthenticationComponent implements AuthenticationC
         return SYSTEM_USER_NAME;
     }
 
+    /**
+     * Get the name of the Guest User
+     */
+    public String getGuestUserName()
+    {
+        return PermissionService.GUEST;
+    }
+
+    /**
+     * Set the guest user as the current user.
+     */
+    public Authentication setGuestUserAsCurrentUser() throws AuthenticationException
+    {
+        if (allowGuestLogin == null)
+        {
+            if(implementationAllowsGuestLogin())
+            {
+                return setCurrentUser(PermissionService.GUEST);
+            }
+            else
+            {
+                throw new AuthenticationException("Guest authentication is not allowed");  
+            }
+        }
+        else
+        {
+            if(allowGuestLogin.booleanValue())
+            {
+                return setCurrentUser(PermissionService.GUEST);
+            }
+            else
+            {
+                throw new AuthenticationException("Guest authentication is not allowed"); 
+            }
+            
+        }
+    }
+
+    protected abstract boolean implementationAllowsGuestLogin();
+
     /**
      * Remove the current security information
      */
@@ -224,8 +275,7 @@ public abstract class AbstractAuthenticationComponent implements AuthenticationC
     }
 
     /**
-     * Get the NTML mode - none - supports MD4 hash to integrate - or it can
-     * asct as an NTLM authentication
+     * Get the NTML mode - none - supports MD4 hash to integrate - or it can asct as an NTLM authentication
      */
     public NTLMMode getNTLMMode()
     {

source/java/org/alfresco/repo/security/authentication/AuthenticationComponent.java

@@ -72,6 +72,14 @@ public interface AuthenticationComponent
     public Authentication setSystemUserAsCurrentUser();
     
     
+    /**
+     * Set the guest user as the current user.
+     * 
+     * @return
+     */
+    public Authentication setGuestUserAsCurrentUser();
+    
+    
     /**
      * Get the name of the system user
      * 
@@ -79,6 +87,14 @@ public interface AuthenticationComponent
      */
     public String getSystemUserName();
     
+    
+    /**
+     * Get the name of the guest user
+     * 
+     * @return
+     */
+    public String getGuestUserName();
+    
     /**
      * Get the current user name.
      * 

source/java/org/alfresco/repo/security/authentication/AuthenticationComponentImpl.java

@@ -96,5 +96,12 @@ public class AuthenticationComponentImpl extends AbstractAuthenticationComponent
     {
         return NTLMMode.MD4_PROVIDER;
     }
+
+    @Override
+    protected boolean implementationAllowsGuestLogin()
+    {
+        return true;
+    }
+   
     
 }

source/java/org/alfresco/repo/security/authentication/AuthenticationServiceImpl.java

@@ -147,4 +147,10 @@ public class AuthenticationServiceImpl implements AuthenticationService
         return false;
     }
 
+    public void authenticateAsGuest() throws AuthenticationException
+    {
+        authenticationComponent.setGuestUserAsCurrentUser();
+    }
+
+    
 }

source/java/org/alfresco/repo/security/authentication/AuthenticationTest.java

@@ -751,6 +751,12 @@ public class AuthenticationTest extends TestCase
         // assertNull(dao.getUserOrNull("Andy"));
     }
 
+    public void testAbstractAuthenticationComponentGuestUserSupport()
+    {
+        authenticationComponent.setGuestUserAsCurrentUser();
+        assertEquals(authenticationComponent.getCurrentUserName(), authenticationComponent.getGuestUserName());
+    }
+    
     
     public void testPassThroughLogin()
     {

source/java/org/alfresco/repo/security/authentication/SimpleAcceptOrRejectAllAuthenticationComponentImpl.java

@@ -16,6 +16,8 @@
  */
 package org.alfresco.repo.security.authentication;
 
+import net.sf.acegisecurity.Authentication;
+
 /**
  * This implementation of an AuthenticationComponent can be configured to accept or reject all attempts to login.
  * 
@@ -54,4 +56,12 @@ public class SimpleAcceptOrRejectAllAuthenticationComponentImpl extends Abstract
         }
 
     }
+
+    @Override
+    protected boolean implementationAllowsGuestLogin()
+    {
+       return accept;
+    }
+    
+    
 }

source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java

@@ -1003,8 +1003,8 @@ public class PermissionServiceImpl implements PermissionServiceSPI, Initializing
 
             // Default deny
             return false;
-
         }
+     
     }
 
     /**

source/java/org/alfresco/repo/security/person/PersonServiceImpl.java

@@ -186,7 +186,7 @@ public class PersonServiceImpl implements PersonService
     {
         HashMap<QName, Serializable> properties = new HashMap<QName, Serializable>();
         properties.put(ContentModel.PROP_USERNAME, userName);
-        properties.put(ContentModel.PROP_HOMEFOLDER, getCompanyHome());
+        properties.put(ContentModel.PROP_HOMEFOLDER, getHomeFolder());
         properties.put(ContentModel.PROP_FIRSTNAME, userName);
         properties.put(ContentModel.PROP_LASTNAME, "");
         properties.put(ContentModel.PROP_EMAIL, "");
@@ -194,6 +194,11 @@ public class PersonServiceImpl implements PersonService
         return properties;
     }
 
+    private NodeRef getHomeFolder()
+    {
+        return getCompanyHome();
+    }
+    
     public NodeRef createPerson(Map<QName, Serializable> properties)
     {
         String caseSensitiveUserName = DefaultTypeConverter.INSTANCE.convert(String.class, properties

source/java/org/alfresco/service/cmr/security/AuthenticationService.java

@@ -90,6 +90,13 @@ public interface AuthenticationService
      */
     public void authenticate(String userName, char[] password) throws AuthenticationException;
     
+    /**
+     * Authenticate as the guest user. This may not be allowed and throw an exception.
+     * 
+     * @throws AuthenticationException
+     */
+    public void authenticateAsGuest() throws AuthenticationException;
+    
     /**
      * Get the name of the currently authenticated user.
      *