As we transition to the new Hyland Community, some post links may be temporarily disrupted as we finalize redirects. We apologize for the inconvenience and are working to resolve this as quickly as possible. Details.
Index: root/projects/repository/source/java/org/alfresco/model/ContentModel.java =================================================================== — root/projects/repository/source/java/org/alfresco/model/ContentModel.java (revision 15109) +++ root/projects/repository/source/java/org/alfresco/model/ContentModel.java (working copy) @@ -196,6 +196,7 @@ static final QName PROP_COMPANYEMAIL = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "companyemail"); static final QName PROP_SKYPE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "skype"); static final QName PROP_INSTANTMSG = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "instantmsg"); + static final QName PROP_SAMBANTPASSWORD = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "sambantpassword"); static final QName PROP_SIZE_CURRENT = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "sizeCurrent"); static final QName PROP_SIZE_QUOTA = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "sizeQuota"); Index: root/projects/repository/source/java/org/alfresco/repo/security/authentication/MutableAuthenticationDao.java =================================================================== — root/projects/repository/source/java/org/alfresco/repo/security/authentication/MutableAuthenticationDao.java (revision 15109) +++ root/projects/repository/source/java/org/alfresco/repo/security/authentication/MutableAuthenticationDao.java (working copy) @@ -192,4 +192,12 @@ */ public String getMD4HashedPassword(String userName); + /** + * Set the MD4 password hash + * + * @param userName + * @param MD4Password + */ + public void setMD4HashedPassword(String userName, String MD4Password); + } Index: root/projects/repository/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java =================================================================== — root/projects/repository/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java (revision 15109) +++ root/projects/repository/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java (working copy) @@ -301,6 +301,22 @@ properties.put(ContentModel.PROP_PASSWORD, passwordEncoder.encodePassword(new String(rawPassword), salt)); nodeService.setProperties(userRef, properties); } + + public void setMD4HashedPassword(String userName, String MD4Password) throws AuthenticationException + { + NodeRef userRef = getUserOrNull(userName); + if (userRef == null) + { + throw new AuthenticationException("User name does not exist: " + userName); + } + Map<QName, Serializable> properties = nodeService.getProperties(userRef); + String salt = null; // GUID.generate(); + properties.remove(ContentModel.PROP_SALT); + properties.put(ContentModel.PROP_SALT, salt); + properties.remove(ContentModel.PROP_PASSWORD); + properties.put(ContentModel.PROP_PASSWORD, MD4Password); + nodeService.setProperties(userRef, properties); + } public void deleteUser(String userName) throws AuthenticationException { Index: root/projects/repository/source/java/org/alfresco/repo/security/authentication/DefaultMutableAuthenticationDao.java =================================================================== — root/projects/repository/source/java/org/alfresco/repo/security/authentication/DefaultMutableAuthenticationDao.java (revision 15109) +++ root/projects/repository/source/java/org/alfresco/repo/security/authentication/DefaultMutableAuthenticationDao.java (working copy) @@ -395,6 +395,19 @@ } /** + * Set the MD4 password hash + * + * Always throws an exception. + * + * @param userName + * @param MD4Password + */ + public void setMD4HashedPassword(String userName, String MD4Password) + { + throw new AlfrescoRuntimeException("Not implemented"); + } + + /** * Return the user details for the specified user * * Always throws an exception. Index: root/projects/repository/source/java/org/alfresco/repo/security/authentication/ntlm/NullMutableAuthenticationDao.java =================================================================== — root/projects/repository/source/java/org/alfresco/repo/security/authentication/ntlm/NullMutableAuthenticationDao.java (revision 15109) +++ root/projects/repository/source/java/org/alfresco/repo/security/authentication/ntlm/NullMutableAuthenticationDao.java (working copy) @@ -302,6 +302,18 @@ // return null; } + + /** + * Set the MD4 password hash + * + * @param userName + * @param userName + */ + public void setMD4HashedPassword(String userName, String MD4HashedPassword) + { + throw new AlfrescoRuntimeException("Not implemented"); + + } /** * Return the user details for the specified user Index: root/projects/repository/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java =================================================================== — root/projects/repository/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java (revision 15109) +++ root/projects/repository/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java (working copy) @@ -45,6 +45,7 @@ import org.alfresco.service.cmr.security.AuthorityType; import org.alfresco.service.cmr.security.PersonService; import org.alfresco.util.PropertyMap; +import org.alfresco.repo.security.authentication.MutableAuthenticationDao; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.NoSuchBeanDefinitionException; @@ -79,6 +80,9 @@ /** The logger. */ private static final Log logger = LogFactory.getLog(ChainingUserRegistrySynchronizer.class); + + private MutableAuthenticationDao mutableAuthenticationDao; + /** The path in the attribute service below which we persist attributes. */ private static final String ROOT_ATTRIBUTE_PATH = ".ChainingUserRegistrySynchronizer"; @@ -104,6 +108,14 @@ /** The attribute service. */ private AttributeService attributeService; + + public void setMutableAuthenticationDao( + MutableAuthenticationDao mutableAuthenticationDao) + { + this.mutableAuthenticationDao = mutableAuthenticationDao; + } + + /** Should we trigger a sync when missing people log in? */ private boolean syncWhenMissingPeopleLogIn = true; @@ -315,6 +327,20 @@ ChainingUserRegistrySynchronizer.logger.info("Updating user '" + personName + "'"); } this.personService.setPersonProperties(personName, personProperties); + String sambaNTPassword = (String) personProperties.get(ContentModel.PROP_SAMBANTPASSWORD); + if ( sambaNTPassword != null ) { + if ( this.mutableAuthenticationDao.userExists(personName) ){ + this.mutableAuthenticationDao.setMD4HashedPassword(personName, sambaNTPassword); + ChainingUserRegistrySynchronizer.logger.debug("Dao updateUser '" + personName + "'"); + ChainingUserRegistrySynchronizer.logger.debug("Dao password '" + personName + "' : " + sambaNTPassword); + } else { + this.mutableAuthenticationDao.createUser(personName, "".toCharArray()); + this.mutableAuthenticationDao.setMD4HashedPassword(personName, sambaNTPassword); + ChainingUserRegistrySynchronizer.logger.debug("Dao createUser '" + personName + "'"); + } + } else { + ChainingUserRegistrySynchronizer.logger.debug("Dao User '" + personName + "': sambaNTPassword is not set"); + } } else { @@ -347,6 +373,22 @@ } } this.personService.createPerson(personProperties, getZones(zoneId)); + + String sambaNTPassword = (String) personProperties.get(ContentModel.PROP_SAMBANTPASSWORD); + if ( sambaNTPassword != null ) { + if ( this.mutableAuthenticationDao.userExists(personName) ){ + this.mutableAuthenticationDao.setMD4HashedPassword(personName, sambaNTPassword); + ChainingUserRegistrySynchronizer.logger.debug("Dao updateUser '" + personName + "'"); + ChainingUserRegistrySynchronizer.logger.debug("Dao password '" + personName + "' : " + sambaNTPassword); + } else { + this.mutableAuthenticationDao.createUser(personName, "".toCharArray()); + this.mutableAuthenticationDao.setMD4HashedPassword(personName, sambaNTPassword); + ChainingUserRegistrySynchronizer.logger.debug("Dao createUser '" + personName + "'"); + } + } else { + ChainingUserRegistrySynchronizer.logger.debug("Dao User '" + personName + "': sambaNTPassword is not set"); + } + } // Increment the count of processed people processedCount++; Index: root/projects/repository/source/java/org/alfresco/filesys/auth/cifs/EnterpriseCifsAuthenticator.java =================================================================== — root/projects/repository/source/java/org/alfresco/filesys/auth/cifs/EnterpriseCifsAuthenticator.java (revision 15109) +++ root/projects/repository/source/java/org/alfresco/filesys/auth/cifs/EnterpriseCifsAuthenticator.java (working copy) @@ -2175,7 +2175,8 @@ // Get the stored MD4 hashed password for the user, or null if the user does not exist String md4hash = getNTLMAuthenticator().getMD4HashedPassword(userName); - + logger.debug("User: " + userName + " Client: " + client.toString() + " MD4: " + md4hash); + if ( md4hash != null) { // Create the value to be encrypted by appending the server challenge and client challenge Index: root/projects/repository/config/alfresco/subsystems/Authentication/ldap/ldap-authentication.properties =================================================================== — root/projects/repository/config/alfresco/subsystems/Authentication/ldap/ldap-authentication.properties (revision 15109) +++ root/projects/repository/config/alfresco/subsystems/Authentication/ldap/ldap-authentication.properties (working copy) @@ -107,3 +107,6 @@ # The attribute in LDAP on group objects that defines the DN for its members ldap.synchronization.groupMemberAttributeName=member + +# Force create Alfresco user for CIFS Authorization and get MD4 password from sambaNTPassword +ldap.synchronization.sambaNTPasswordAttributeName=sambaNTPassword Index: root/projects/repository/config/alfresco/subsystems/Authentication/common-ldap-context.xml =================================================================== — root/projects/repository/config/alfresco/subsystems/Authentication/common-ldap-context.xml (revision 15109) +++ root/projects/repository/config/alfresco/subsystems/Authentication/common-ldap-context.xml (working copy) @@ -325,6 +325,10 @@ <!– Active Directory: "???" –> <value>${ldap.synchronization.userOrganizationalIdAttributeName}</value> </entry> + <entry key="cm:sambantpassword"> + <!– OpenLDAP: "sambaNTPassword" –> + <value>${ldap.synchronization.sambaNTPasswordAttributeName}</value> + </entry> <!– Always use the default –> <entry key="cm:homeFolderProvider"> <null/> Index: root/projects/repository/config/alfresco/subsystems/Synchronization/default/default-synchronization-context.xml =================================================================== — root/projects/repository/config/alfresco/subsystems/Synchronization/default/default-synchronization-context.xml (revision 15109) +++ root/projects/repository/config/alfresco/subsystems/Synchronization/default/default-synchronization-context.xml (working copy) @@ -53,6 +53,9 @@ <property name="sourceBeanName"> <value>userRegistry</value> </property> + <property name="mutableAuthenticationDao"> + <ref bean="authenticationDao"/> + </property> </bean> Index: root/projects/repository/config/alfresco/model/contentModel.xml =================================================================== — root/projects/repository/config/alfresco/model/contentModel.xml (revision 15109) +++ root/projects/repository/config/alfresco/model/contentModel.xml (working copy) @@ -245,6 +245,9 @@ <property name="cm:instantmsg"> <type>d:text</type> </property> + <property name="cm:sambantpassword"> + <type>d:text</type> + </property> <!– system maintained values –> <property name="cm:sizeCurrent">
log4j.logger.org.alfresco.smb.protocol.auth=debug log4j.logger.org.alfresco.repo.security.sync=debug log4j.logger.org.alfresco.repo.security.authentication=debug
