April 2007 - xwiki-devs@xwiki.org

Issue to investigate
by Vincent Massol 24 Apr '07

24 Apr '07

Hi, MadOtis on IRC told me that users he had created with a staged RC1 version cannot see the Main/WebHome page even though they have the correct rights set up. Only new users created with the new RC1 can. I haven't reviewed the last changes we did in the released RC1 but we need to verify if this is a problem with users created in past betas and if so add some instructions in the release notes for migrating old users so that they work. Sergiu, maybe you know what the issue is? Thanks -Vincent

4 5

Re: [xwiki-commits] r2957 - in xwiki/trunk/core/src/main/java/com/xpn/xwiki: objects/classes objects/meta plugin/packaging user/impl/xwiki
by Vincent Massol 24 Apr '07

24 Apr '07

Should any of these go in RC2 (I didn't see any merge and I'm asking to be sure we're not forgetting anything)? Same question for rev 2959 ("Forgot something...", which btw should have contained a jira reference... ;-)) Thanks -Vincent On Apr 23, 2007, at 10:23 PM, Sergiu Dumitriu wrote: > Author: sdumitriu > Date: 2007-04-23 22:23:53 +0200 (Mon, 23 Apr 2007) > New Revision: 2957 > > Modified: > xwiki/trunk/core/src/main/java/com/xpn/xwiki/objects/classes/ > PasswordClass.java > xwiki/trunk/core/src/main/java/com/xpn/xwiki/objects/meta/ > PasswordMetaClass.java > xwiki/trunk/core/src/main/java/com/xpn/xwiki/plugin/packaging/ > Package.java > xwiki/trunk/core/src/main/java/com/xpn/xwiki/user/impl/xwiki/ > XWikiAuthServiceImpl.java > Log: > XWIKI-70: password can be searched > XWIKI-580: Implement HASH password mechanism > > Added support for hashing passwords. There's some code related to > encrypting passwords, but the actual encrypt/decrypt mechanism is > not written yet. > > > > Modified: xwiki/trunk/core/src/main/java/com/xpn/xwiki/objects/ > classes/PasswordClass.java > =================================================================== > --- xwiki/trunk/core/src/main/java/com/xpn/xwiki/objects/classes/ > PasswordClass.java 2007-04-23 20:16:46 UTC (rev 2956) > +++ xwiki/trunk/core/src/main/java/com/xpn/xwiki/objects/classes/ > PasswordClass.java 2007-04-23 20:23:53 UTC (rev 2957) > @@ -1,70 +1,239 @@ > -/* > - * Copyright 2006, XpertNet SARL, and individual contributors as > indicated > - * by the contributors.txt. > - * > - * This is free software; you can redistribute it and/or modify it > - * under the terms of the GNU Lesser General Public License as > - * published by the Free Software Foundation; either version 2.1 of > - * the License, or (at your option) any later version. > - * > - * This software is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - * Lesser General Public License for more details. > - * > - * You should have received a copy of the GNU Lesser General Public > - * License along with this software; if not, write to the Free > - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. > - * > - * @author sdumitriu > - */ > - > -package com.xpn.xwiki.objects.classes; > - > -import com.xpn.xwiki.XWikiContext; > -import com.xpn.xwiki.objects.BaseCollection; > -import com.xpn.xwiki.objects.BaseProperty; > -import com.xpn.xwiki.objects.ElementInterface; > -import com.xpn.xwiki.objects.meta.PropertyMetaClass; > -import org.apache.ecs.xhtml.input; > - > -public class PasswordClass extends StringClass { > - public PasswordClass(PropertyMetaClass wclass) { > - super("password", "Password", wclass); > - setxWikiClass(wclass); > - } > - > - public PasswordClass() { > - this(null); > - } > - > - public BaseProperty fromString(String value) { > - if (value.equals("********")) > - return null; > - else > - return super.fromString(value); > - } > - > - public void displayHidden(StringBuffer buffer, String name, > String prefix, BaseCollection object, XWikiContext context) { > - // Passwords cannot go through the preview interface of we > don't do something here.. > - } > - > - public void displayView(StringBuffer buffer, String name, > String prefix, BaseCollection object, XWikiContext context) { > - ElementInterface prop = object.safeget(name); > - if (prop!=null) > - buffer.append("********"); > - } > - > - public void displayEdit(StringBuffer buffer, String name, > String prefix, BaseCollection object, XWikiContext context) { > - input input = new input(); > - ElementInterface prop = object.safeget(name); > - if (prop!=null) input.setValue("********"); > - > - input.setType("password"); > - input.setName(prefix + name); > - input.setID(prefix + name); > - input.setSize(getSize()); > - buffer.append(input.toString()); > - } > -} > \ No newline at end of file > +/* > + * Copyright 2006, XpertNet SARL, and individual contributors as > indicated > + * by the contributors.txt. > + * > + * This is free software; you can redistribute it and/or modify it > + * under the terms of the GNU Lesser General Public License as > + * published by the Free Software Foundation; either version 2.1 of > + * the License, or (at your option) any later version. > + * > + * This software is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this software; if not, write to the Free > + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. > + * > + * @author sdumitriu > + */ > + > +package com.xpn.xwiki.objects.classes; > + > +import java.security.MessageDigest; > +import java.security.NoSuchAlgorithmException; > + > +import org.apache.commons.logging.Log; > +import org.apache.commons.logging.LogFactory; > +import org.apache.ecs.xhtml.input; > + > +import com.xpn.xwiki.XWikiContext; > +import com.xpn.xwiki.objects.BaseCollection; > +import com.xpn.xwiki.objects.BaseProperty; > +import com.xpn.xwiki.objects.ElementInterface; > +import com.xpn.xwiki.objects.meta.PasswordMetaClass; > +import com.xpn.xwiki.objects.meta.PropertyMetaClass; > + > +public class PasswordClass extends StringClass > +{ > + protected static Log log = LogFactory.getFactory().getInstance > (PasswordClass.class); > + > + protected static final String DEFAULT_STORAGE = > PasswordMetaClass.HASH; > + > + protected static final String DEFAULT_HASH_ALGORITHM = "SHA-512"; > + > + protected static final String DEFAULT_CRYPT_ALGORITHM = "AES"; > + > + protected static final String HASH_IDENTIFIER = "hash"; > + > + protected static final String CRYPT_IDENTIFIER = "crypt"; > + > + protected static final String SEPARATOR = ":"; > + > + protected static final String FORM_PASSWORD_PLACEHODLER = > "********"; > + > + public PasswordClass(PropertyMetaClass wclass) > + { > + super("password", "Password", wclass); > + setxWikiClass(wclass); > + } > + > + public PasswordClass() > + { > + this(null); > + } > + > + public BaseProperty fromString(String value) > + { > + if (value.equals(FORM_PASSWORD_PLACEHODLER)) { > + return null; > + } > + BaseProperty property = newProperty(); > + property.setValue(getProcessedPassword(value)); > + return property; > + } > + > + public void displayHidden(StringBuffer buffer, String name, > String prefix, > + BaseCollection object, XWikiContext context) > + { > + // Passwords cannot go through the preview interface, so > we don't do something here.. > + } > + > + public void displayView(StringBuffer buffer, String name, > String prefix, > + BaseCollection object, XWikiContext context) > + { > + ElementInterface prop = object.safeget(name); > + if (prop != null) { > + buffer.append(FORM_PASSWORD_PLACEHODLER); > + } > + } > + > + public void displayEdit(StringBuffer buffer, String name, > String prefix, > + BaseCollection object, XWikiContext context) > + { > + input input = new input(); > + ElementInterface prop = object.safeget(name); > + if (prop != null) { > + input.setValue(FORM_PASSWORD_PLACEHODLER); > + } > + > + input.setType("password"); > + input.setName(prefix + name); > + input.setSize(getSize()); > + buffer.append(input.toString()); > + } > + > + /** > + * > + * @return One of 'Clear', 'Hash' or 'Encrypt'. > + */ > + public String getStorageType() > + { > + BaseProperty st = (BaseProperty) this.getField > ("storageType"); > + if (st != null) { > + String type = st.getValue().toString().trim(); > + if (!type.equals("")) { > + return type; > + } > + } > + return DEFAULT_STORAGE; > + } > + > + /** > + * > + * @return The hash algorithm configured for this XProperty. > + */ > + public String getHashAlgorithm() > + { > + BaseProperty alg = (BaseProperty) this.getField > (PasswordMetaClass.ALGORITHM_KEY); > + if (alg != null && alg.getValue() != null && !alg.getValue > ().toString().trim().equals("")) { > + return alg.getValue().toString(); > + } > + return DEFAULT_HASH_ALGORITHM; > + } > + > + /** > + * > + * @return The encryption algorithm configured for this > XProperty. > + */ > + public String getCryptAlgorithm() > + { > + BaseProperty alg = (BaseProperty) this.getField > (PasswordMetaClass.ALGORITHM_KEY); > + if (alg != null && alg.getValue() != null && !alg.getValue > ().toString().trim().equals("")) { > + return alg.getValue().toString(); > + } > + return DEFAULT_CRYPT_ALGORITHM; > + } > + > + /** > + * > + * @param password > + * @return The algorithm used for the given password. > + */ > + public String getAlgorithmFromPassword(String password) > + { > + int beginIndex = password.indexOf(SEPARATOR) + 1; > + if (beginIndex >= 0) { > + int endIndex = password.indexOf(SEPARATOR, beginIndex); > + if (endIndex >= 0) { > + return password.substring(beginIndex, endIndex); > + } > + } > + return DEFAULT_HASH_ALGORITHM; > + } > + > + /** > + * Transforms a plain text password so that it has the same > encryption as a password stored in > + * the database. The current configuration for this password > XProperty cannot be used, as the > + * user might have a different encryption mechanism (for > example, if the user was imported, or > + * the password was not yet upgraded). > + * > + * @param storedPassword The stored password, which gives the > storage type and algorithm. > + * @param plainPassword The plain text password to be encrypted. > + * @return The input password, encrypted with the same > mechanism as the stored password. > + */ > + public String getEquivalentPassword(String storedPassword, > String plainPassword) > + { > + String result = plainPassword; > + if (storedPassword.startsWith(HASH_IDENTIFIER + SEPARATOR)) { > + result = getPasswordHash(result, > getAlgorithmFromPassword(storedPassword)); > + } else if (storedPassword.startsWith(CRYPT_IDENTIFIER + > SEPARATOR)) { > + result = getPasswordCrypt(result, > getAlgorithmFromPassword(storedPassword)); > + } > + return result; > + } > + > + public String getProcessedPassword(String password) > + { > + String storageType = getStorageType(); > + String result = password; > + if (storageType.equals(PasswordMetaClass.HASH)) { > + result = getPasswordHash(result); > + } else if (storageType.equals(PasswordMetaClass.ENCRYPTED)) { > + result = getPasswordCrypt(result); > + } > + return result; > + } > + > + public String getPasswordCrypt(String password) > + { > + return getPasswordCrypt(password, getCryptAlgorithm()); > + } > + > + public String getPasswordCrypt(String password, String > algorithmName) > + { > + // TODO Write me! > + return password; > + } > + > + public String getPasswordHash(String password) > + { > + return getPasswordHash(password, getHashAlgorithm()); > + } > + > + public String getPasswordHash(String password, String > algorithmName) > + { > + try { > + MessageDigest hashAlgorithm = MessageDigest.getInstance > (algorithmName); > + hashAlgorithm.update(password.getBytes()); > + byte[] digest = hashAlgorithm.digest(); > + StringBuffer sb = > + new StringBuffer(HASH_IDENTIFIER + SEPARATOR + > algorithmName + SEPARATOR); > + for (int j = 0; j < digest.length; ++j) { > + int b = digest[j] & 0xFF; > + if (b < 0x10) > + sb.append('0'); > + sb.append(Integer.toHexString(b)); > + } > + return sb.toString(); > + } catch (NoSuchAlgorithmException ex) { > + log.error("Wrong hash algorithm '" + algorithmName + > "' in '" + this.className + "'", > + ex); > + } catch (NullPointerException ex) { > + log.error("Error hashing password", ex); > + } > + return password; > + } > +} > > Modified: xwiki/trunk/core/src/main/java/com/xpn/xwiki/objects/meta/ > PasswordMetaClass.java > =================================================================== > --- xwiki/trunk/core/src/main/java/com/xpn/xwiki/objects/meta/ > PasswordMetaClass.java 2007-04-23 20:16:46 UTC (rev 2956) > +++ xwiki/trunk/core/src/main/java/com/xpn/xwiki/objects/meta/ > PasswordMetaClass.java 2007-04-23 20:23:53 UTC (rev 2957) > @@ -1,5 +1,5 @@ > /* > - * Copyright 2006, XpertNet SARL, and individual contributors as > indicated > + * Copyright 2006-2007, XpertNet SARL, and individual contributors > as indicated > * by the contributors.txt. > * > * This is free software; you can redistribute it and/or modify it > @@ -17,7 +17,6 @@ > * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > * 02110-1301 USA, or see the FSF site: http://www.fsf.org. > * > - * @author ludovic > */ > > package com.xpn.xwiki.objects.meta; > @@ -25,17 +24,46 @@ > import com.xpn.xwiki.XWikiContext; > import com.xpn.xwiki.objects.BaseCollection; > import com.xpn.xwiki.objects.classes.PasswordClass; > +import com.xpn.xwiki.objects.classes.StaticListClass; > +import com.xpn.xwiki.objects.classes.StringClass; > > -public class PasswordMetaClass extends StringMetaClass { > +public class PasswordMetaClass extends StringMetaClass > +{ > + public static final String CLEAR = "Clear"; > > - public PasswordMetaClass() { > + public static final String ENCRYPTED = "Encrypted"; > + > + public static final String HASH = "Hash"; > + > + public static final String SEPARATOR = "|"; > + > + public static final String ALGORITHM_KEY = "algorithm"; > + > + public PasswordMetaClass() > + { > super(); > - // setType("passwordmetaclass"); > setPrettyName("Password Class"); > setName(PasswordClass.class.getName()); > + > + StaticListClass storageType_class = new StaticListClass > (this); > + storageType_class.setName("storageType"); > + storageType_class.setPrettyName("Storage type"); > + storageType_class.setValues(CLEAR + SEPARATOR + HASH);// + > SEPARATOR + ENCRYPTED > + storageType_class.setRelationalStorage(false); > + storageType_class.setDisplayType("select"); > + storageType_class.setMultiSelect(false); > + storageType_class.setSize(1); > + safeput("storageType", storageType_class); > + > + StringClass encryptAlgorithm_class = new StringClass(this); > + encryptAlgorithm_class.setName(ALGORITHM_KEY); > + encryptAlgorithm_class.setPrettyName("Encryption/hash > algorithm"); > + encryptAlgorithm_class.setSize(20); > + safeput("encryptAlgorithm", encryptAlgorithm_class); > } > > - public BaseCollection newObject(XWikiContext context) { > + public BaseCollection newObject(XWikiContext context) > + { > return new PasswordClass(); > } > } > > Modified: xwiki/trunk/core/src/main/java/com/xpn/xwiki/plugin/ > packaging/Package.java > =================================================================== > --- xwiki/trunk/core/src/main/java/com/xpn/xwiki/plugin/packaging/ > Package.java 2007-04-23 20:16:46 UTC (rev 2956) > +++ xwiki/trunk/core/src/main/java/com/xpn/xwiki/plugin/packaging/ > Package.java 2007-04-23 20:23:53 UTC (rev 2957) > @@ -755,6 +755,12 @@ > ZipEntry zipentry = new ZipEntry(zipname); > zos.putNextEntry(zipentry); > String docXml = doc.toXML(true, false, true, > withVersions, context); > + if (!context.getWiki().getRightService().hasAdminRights > (context)) { > + docXml = > + context.getUtil().substitute( > + "s/<password>.*?<\\/password>/ > <password>********<\\/password>/goi", > + docXml); > + } > zos.write(docXml.getBytes(context.getWiki().getEncoding > ())); > zos.closeEntry(); > } catch (Exception e) { > @@ -786,6 +792,12 @@ > } > File file = new File(spacedir, filename); > String xml = doc.toXML(true, false, true, > withVersions, context); > + if (!context.getWiki().getRightService().hasAdminRights > (context)) { > + xml = > + context.getUtil().substitute( > + "s/<password>.*?<\\/password>/ > <password>********<\\/password>/goi", > + xml); > + } > FileOutputStream fos = new FileOutputStream(file); > fos.write(xml.getBytes(context.getWiki().getEncoding())); > fos.flush(); > > Modified: xwiki/trunk/core/src/main/java/com/xpn/xwiki/user/impl/ > xwiki/XWikiAuthServiceImpl.java > =================================================================== > --- xwiki/trunk/core/src/main/java/com/xpn/xwiki/user/impl/xwiki/ > XWikiAuthServiceImpl.java 2007-04-23 20:16:46 UTC (rev 2956) > +++ xwiki/trunk/core/src/main/java/com/xpn/xwiki/user/impl/xwiki/ > XWikiAuthServiceImpl.java 2007-04-23 20:23:53 UTC (rev 2957) > @@ -22,27 +22,30 @@ > > package com.xpn.xwiki.user.impl.xwiki; > > +import java.io.IOException; > +import java.security.Principal; > +import java.util.List; > + > +import javax.servlet.http.HttpServletRequest; > +import javax.servlet.http.HttpServletResponse; > + > +import org.apache.commons.lang.StringUtils; > +import org.apache.commons.logging.Log; > +import org.apache.commons.logging.LogFactory; > +import org.securityfilter.config.SecurityConfig; > +import org.securityfilter.filter.SecurityRequestWrapper; > +import org.securityfilter.realm.SimplePrincipal; > + > import com.xpn.xwiki.XWiki; > import com.xpn.xwiki.XWikiContext; > import com.xpn.xwiki.XWikiException; > +import com.xpn.xwiki.doc.XWikiDocument; > +import com.xpn.xwiki.objects.classes.PasswordClass; > import com.xpn.xwiki.plugin.ldap.LDAPPlugin; > -import com.xpn.xwiki.doc.XWikiDocument; > import com.xpn.xwiki.user.api.XWikiAuthService; > import com.xpn.xwiki.user.api.XWikiUser; > import com.xpn.xwiki.web.Utils; > -import org.apache.commons.lang.StringUtils; > -import org.apache.commons.logging.Log; > -import org.apache.commons.logging.LogFactory; > -import org.securityfilter.config.SecurityConfig; > -import org.securityfilter.filter.SecurityRequestWrapper; > -import org.securityfilter.realm.SimplePrincipal; > > -import javax.servlet.http.HttpServletRequest; > -import javax.servlet.http.HttpServletResponse; > -import java.io.IOException; > -import java.security.Principal; > -import java.util.List; > - > public class XWikiAuthServiceImpl implements XWikiAuthService > { > private static final Log log = LogFactory.getLog > (XWikiAuthServiceImpl.class); > @@ -390,6 +393,10 @@ > // We only allow empty password from users having a > XWikiUsers object. > if (doc.getObject("XWiki.XWikiUsers") != null) { > String passwd = doc.getStringValue > ("XWiki.XWikiUsers", "password"); > + password = > + ((PasswordClass) context.getWiki().getClass > ("XWiki.XWikiUsers", context) > + .getField > ("password")).getEquivalentPassword(passwd, password); > + > result = (password.equals(passwd)); > } > > > > > -- > You receive this message as a subscriber of the xwiki- > commits(a)objectweb.org mailing list. > To unsubscribe: mailto:[email protected] > For general help: mailto:[email protected]?subject=help > ObjectWeb mailing lists service home page: http://www.objectweb.org/ > wws

2 2

[JIRA] Tracability from commits
by Vincent Massol 24 Apr '07

24 Apr '07

Hi committers, I see that we're now quite good at putting jira references in our first commits. That's good! However sometimes when we make a mistake, or forget something to commit, we don't put again the reference to the JIRA issue in the subsequent commits. It would be better if we were always putting the reference to JIRA. For example, I fixed something related to XWIKI-49 this morning and I used the following format: " XWIKI-49: PDF generation failed with vietnamese characters encoded in UTF-8 * Replaced SNAPSHOT by a timestamped version so that the build can be reproduced and so that we can perform a release of RC2 tomorrow. * Moved out the JTidy <dependency> as it was now wrongly in the "custom xwiki repository" section. * Removed JTidy from our custom XWiki repository " Why do we need this? Because it then makes it very easy later on to find what happened related to a JIRA issue. We had this need for example when we were trying to find out the difference between 2 branches (you may remember, I spent a whole day on that a month ago). Thanks to the Subversion plugin in JIRA we can see what happens related to an issue. For example: http://jira.xwiki.org/jira/browse/XWIKI-49? page=com.atlassian.jira.plugin.ext.subversion:subversion-commits- tabpanel However that only works if we have put a reference to the jira issue in the commit log. Thanks -Vincent

1 0

Re: [xwiki-commits] r2972 - xwiki/trunk
by Vincent Massol 24 Apr '07

24 Apr '07

Hi Sergiu, Just to let you know it's dangerous to depend on a snapshot version as it means anytime they update their snapshot we'll get the update so our build can start to fail at any time. Also, we cannot release XWiki if we have snapshot versions (at least that's the maven strategy and maven will even prevent you from doing a release) so we'll need to fix before we release 1.1 B1. I see Hibernate has used some timestamped versions, maybe we could do the same or use their versions: http://repo1.maven.org/maven2/org/hibernate/jtidy/ Thanks -Vincent On Apr 24, 2007, at 4:25 AM, Sergiu Dumitriu wrote: > Author: sdumitriu > Date: 2007-04-24 04:25:11 +0200 (Tue, 24 Apr 2007) > New Revision: 2972 > > Modified: > xwiki/trunk/pom.xml > Log: > Adding the JTidy maven repository to the list of known repos. > > > > Modified: xwiki/trunk/pom.xml > =================================================================== > --- xwiki/trunk/pom.xml 2007-04-24 01:57:38 UTC (rev 2971) > +++ xwiki/trunk/pom.xml 2007-04-24 02:25:11 UTC (rev 2972) > @@ -55,6 +55,14 @@ > <enabled>true</enabled> > </releases> > </repository> > + <repository> > + <id>jtidy</id> > + <name>JTidy Maven2 Remote Repository</name> > + <url>http://jtidy.sourceforge.net/snapshots/</url> > + <releases> > + <enabled>true</enabled> > + </releases> > + </repository> > </repositories> > </project> > > \ No newline at end of file

1 3

Re: [xwiki-commits] r2970 - xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/user/impl/xwiki
by Vincent Massol 24 Apr '07

24 Apr '07

Ludovic, Do we already have an issue associated with this? Thanks -Vincent On Apr 24, 2007, at 3:39 AM, Ludovic Dubost wrote: > Author: ludovic > Date: 2007-04-24 03:38:37 +0200 (Tue, 24 Apr 2007) > New Revision: 2970 > > Modified: > xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/user/ > impl/xwiki/MyPersistentLoginManager.java > Log: > Fixed regression on cleanup impacting rememberme cookie > > > Modified: xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > user/impl/xwiki/MyPersistentLoginManager.java > =================================================================== > --- xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/user/ > impl/xwiki/MyPersistentLoginManager.java 2007-04-24 01:36:29 UTC > (rev 2969) > +++ xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/user/ > impl/xwiki/MyPersistentLoginManager.java 2007-04-24 01:38:37 UTC > (rev 2970) > @@ -38,7 +38,7 @@ > * Class responsible for remembering the login information between > requests. It uses (encrypted) > * cookies for this. The encryption key is stored in xwiki.cfg, > xwiki.authentication.encryptionKey > * parameter. > - * > + * > * The cookies used are: > * <dl>> > * <dt>username</dt> > @@ -54,7 +54,7 @@ > * xwiki.authentication.useip . The secret parameter is specified in > * xwiki.authentication.validationKey</dd> > * </dl> > - * > + * > * @version $Id: $ > */ > public class MyPersistentLoginManager extends > DefaultPersistentLoginManager > @@ -97,7 +97,7 @@ > > /** > * Setter for the {@link #cookieDomains} parameter. > - * > + * > * @param cdlist The new value for {@link #cookieDomains}. > * @see #cookieDomains > */ > @@ -108,7 +108,7 @@ > > /** > * Setter for the {@link #cookiePath} parameter. > - * > + * > * @param cp The new value for {@link #cookiePath}. > * @see #cookiePath > */ > @@ -119,7 +119,7 @@ > > /** > * Setup a cookie: expiration date, path, domain + send it to > the response. > - * > + * > * @param cookie The cookie to setup. > * @param sessionCookie Whether the cookie is only for this > session, or for a longer period. > * @param cookieDomain The domain for which the cookie is set. > @@ -140,7 +140,7 @@ > > /** > * Remember a specific login using cookies. > - * > + * > * @param request The servlet request. > * @param response The servlet response. > * @param username The username that's being remembered. > @@ -177,7 +177,7 @@ > setupCookie(passwdCookie, sessionCookie, cookieDomain, > response); > > // Remember me > - Cookie rememberCookie = new Cookie(COOKIE_REMEMBERME, > sessionCookie + ""); > + Cookie rememberCookie = new Cookie(COOKIE_REMEMBERME, ! > sessionCookie + ""); > setupCookie(rememberCookie, sessionCookie, cookieDomain, > response); > > if (protection.equals(PROTECTION_ALL) || protection.equals > (PROTECTION_VALIDATION)) { > @@ -202,7 +202,7 @@ > /** > * Sets the maximum age for cookies. The maximum age is > configured in xwiki.cfg using the > * xwiki.authentication.cookielife parameter (number of days). > The default age is 14 days. > - * > + * > * @param cookie The cookie for which the expiration date is > configured. > */ > private void setMaxAge(Cookie cookie) > @@ -218,7 +218,7 @@ > > /** > * Adds a cookie to the response. > - * > + * > * @param response The servlet response. > * @param cookie The cookie to be sent. > */ > @@ -235,7 +235,7 @@ > * Compute the actual domain the cookie is supposed to be set > for. Search through the list of > * generalized domains for a partial match. If no match is > found, then no specific domain is > * used, which means that the cookie will be valid only for > the requested domain. > - * > + * > * @param request The servlet request. > * @return The configured domain generalization that matches > the request, or null if no match is > * found. > @@ -261,10 +261,10 @@ > /** > * Get validation hash for the specified parameters. The hash > includes a secret password, and > * optionally binds the cookie to the requester's IP. > - * > + * > * The hash secret is configured using the > xwiki.authentication.validationKey parameter. The IP > * binding is enabled using the xwiki.authentication.useip > parameter. > - * > + * > * @param username The remembered username. > * @param password The remembered password. > * @param clientIP The client IP of the request. > @@ -319,7 +319,7 @@ > /** > * Encrypt a string. The encryption is password-based. The > password can be configured using the > * xwiki.authentication.encryptionKey parameter. > - * > + * > * @param clearText The text to be encrypted. > * @return clearText, encrypted. > * @todo Optimize this code by creating the Cipher only once. > @@ -351,7 +351,7 @@ > > /** > * Forget a login by removing the authentication cookies. > - * > + * > * @param request The servlet request. > * @param response The servlet response. > */ > @@ -369,7 +369,7 @@ > * Given an array of cookies and a name, this method tries to > find and return the cookie from > * the array that has the given name. If there is no cookie > matching the name in the array, null > * is returned. > - * > + * > * @param cookies The list of cookies sent by the client. > * @param cookieName The name of the cookie to be retrieved. > * @return The requested cookie, or null if no cookie with the > given name was found. > @@ -389,7 +389,7 @@ > > /** > * Remove a cookie. > - * > + * > * @param request The servlet request. > * @param response The servlet response. > * @param cookieName The name of the cookie that must be removed. > @@ -411,7 +411,7 @@ > > /** > * Check if a text is supposed to be an affirmative value > ("true", "yes" or "1"). > - * > + * > * @param text The text to check. > * @return true if the text is one of "true", "yes" or "1", > false otherwise. > */ > > > > -- > You receive this message as a subscriber of the xwiki- > commits(a)objectweb.org mailing list. > To unsubscribe: mailto:[email protected] > For general help: mailto:[email protected]?subject=help > ObjectWeb mailing lists service home page: http://www.objectweb.org/ > wws

1 0

Code macro
by shivshan 23 Apr '07

23 Apr '07

Hi Anybody know what syntax other than Java & XML are supported by the code macro? I will update this page if i get any information. http://www.xwiki.org/xwiki/bin/view/Code/CodeMacro Thanks Shiva -- View this message in context: http://www.nabble.com/Code-macro-tf3633000.html#a10144576 Sent from the XWiki- Dev mailing list archive at Nabble.com.

2 2

[JIRA] Moving all 1.1 tasks to Future?
by Vincent Massol 23 Apr '07

23 Apr '07

Hi, We have lots of jira tasks scheduled for 1.1 but I don't think that's right. According to our new strategy we're only scheduling issues that we know we want to do in a given release. I think we've used 1.1 in the past as a way to say "later". But we have "future" for this now. So I'd like to move all the tasks in 1.1 into "Future" if that's ok with you. Let me know. Note: We also need to continue moving the issues that have no "fix for" set (unscheduled issues). There are 76 of these. Thanks -Vincent

2 2

Re: [xwiki-commits] r2916 - in xwiki/trunk/web/standard/src/main/webapp: skins/albatross skins/dodo skins/finch templates
by Vincent Massol 23 Apr '07

23 Apr '07

Hi Ludovic, You cannot do this as XWIKI-1000 is already closed (in B6)! So your change won't appear in the release notes of whatever version comes next You need a new JIRA issue for this. Thanks -Vincent PS: Ludovic, I think we really ought to talk about JIRA because if we do not all agree on how to use it, it's going to be a mess. I'm trying my best to maintain a consistent usage of it but I need everyone's help for that. I have the feeling that some of us do not agree or understand with the practices that we have set forth (proposed/votes for most of them). That's fine but in that case we need to discuss them openly and revisit them. I'd rather we all argeed on something than playing the "police" every time which is not a nice role to play... :) On Apr 20, 2007, at 11:49 PM, Ludovic Dubost wrote: > Author: ludovic > Date: 2007-04-20 23:49:55 +0200 (Fri, 20 Apr 2007) > New Revision: 2916 > > Added: > xwiki/trunk/web/standard/src/main/webapp/skins/albatross/ > pdfhtmlheader.vm > xwiki/trunk/web/standard/src/main/webapp/skins/dodo/ > pdfhtmlheader.vm > xwiki/trunk/web/standard/src/main/webapp/skins/finch/ > pdfhtmlheader.vm > xwiki/trunk/web/standard/src/main/webapp/templates/pdfhtmlheader.vm > Modified: > xwiki/trunk/web/standard/src/main/webapp/skins/albatross/pdf.vm > xwiki/trunk/web/standard/src/main/webapp/skins/dodo/pdf.vm > xwiki/trunk/web/standard/src/main/webapp/skins/finch/pdf.vm > xwiki/trunk/web/standard/src/main/webapp/templates/pdf.vm > Log: > XWIKI-1000 missing pdf templates for improvements > > Modified: xwiki/trunk/web/standard/src/main/webapp/skins/albatross/ > pdf.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/skins/albatross/pdf.vm > 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/skins/albatross/pdf.vm > 2007-04-20 21:49:55 UTC (rev 2916) > @@ -1,20 +1,32 @@ > -#template("xwiki.vm") > -#template("httpheader.vm") > -#template("pdfheader.vm") > -<div id="xwikicontent"> > -$cdoc.getRenderedContent() > -</div> > -#if ($request.get("comments")=="1") > -#template("comments2.vm") > -#end > -#if ($request.get("attachments")=="1") > -<div id="xwikiattachments"> > -#foreach ($attach in $doc.attachmentList) > -#if ($attach.isImage()) > -<img src="$doc.getAttachmentURL("${attach.filename}", "download")" > alt="${attach.filename}" /> > -<br /> > -#end > -#end > -</div> > -#end > -#template("pdffooter.vm") > +#template("xwiki.vm") > +$doc.use("XWiki.PDFClass") > +#template("pdfhtmlheader.vm") > +#set($pdfheader = $doc.display("header")) > +#if($pdfheader=="") > +#template("pdfheader.vm") > +#else > +$pdfheader > +#end > +<div id="xwikicontent"> > +$cdoc.getRenderedContent() > +</div> > +#if ($request.get("comments")=="1") > +#template("comments2.vm") > +#end > +#if ($request.get("attachments")=="1") > +<div id="xwikiattachments"> > +#foreach ($attach in $doc.attachmentList) > +#if ($attach.isImage()) > +<img src="$doc.getAttachmentURL("${attach.filename}", "download")" > alt="${attach.filename}" /> > +<br /> > +#end > +#end > +</div> > +#end > +$doc.use("XWiki.PDFClass") > +#set($pdffooter = $doc.display("footer")) > +#if($pdffooter=="") > +#template("pdffooter.vm") > +#else > +$pdffooter > +#end > \ No newline at end of file > > Added: xwiki/trunk/web/standard/src/main/webapp/skins/albatross/ > pdfhtmlheader.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/skins/albatross/ > pdfhtmlheader.vm 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/skins/albatross/ > pdfhtmlheader.vm 2007-04-20 21:49:55 UTC (rev 2916) > @@ -0,0 +1,24 @@ > +<?xml version="1.0" encoding="$xwiki.encoding" ?> > +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" > + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> > +<html xmlns="http://www.w3.org/1999/xhtml"> > +<head> > +<title> > +$doc.use("XWiki.PDFClass") > +#set($title = $doc.display("title")) > +#if((!$title)||($title=="")) > +#set( $title = $!xwiki.getWebPreference("title")) > +#if ( $title != "") > +$xwiki.parseContent($title) > +#else > +XWiki - $!doc.web - $!doc.displayTitle > +#end > +#else > +$title > +#end > +</title> > +<meta http-equiv="Content-Type" content="text/html; charset= > $xwiki.encoding" /> > +</head> > +<body id="body" class="${context.action}body"> > +<div id="xwikimaincontainer"> > +<div id="xwikimaincontainerinner"> > > Modified: xwiki/trunk/web/standard/src/main/webapp/skins/dodo/pdf.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/skins/dodo/pdf.vm > 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/skins/dodo/pdf.vm > 2007-04-20 21:49:55 UTC (rev 2916) > @@ -1,6 +1,12 @@ > #template("xwiki.vm") > -#template("httpheader.vm") > +$doc.use("XWiki.PDFClass") > +#template("pdfhtmlheader.vm") > +#set($pdfheader = $doc.display("header")) > +#if($pdfheader=="") > #template("pdfheader.vm") > +#else > +$pdfheader > +#end > <div id="xwikicontent"> > $cdoc.getRenderedContent() > </div> > @@ -17,4 +23,10 @@ > #end > </div> > #end > +$doc.use("XWiki.PDFClass") > +#set($pdffooter = $doc.display("footer")) > +#if($pdffooter=="") > #template("pdffooter.vm") > +#else > +$pdffooter > +#end > \ No newline at end of file > > Added: xwiki/trunk/web/standard/src/main/webapp/skins/dodo/ > pdfhtmlheader.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/skins/dodo/ > pdfhtmlheader.vm 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/skins/dodo/ > pdfhtmlheader.vm 2007-04-20 21:49:55 UTC (rev 2916) > @@ -0,0 +1,24 @@ > +<?xml version="1.0" encoding="$xwiki.encoding" ?> > +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" > + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> > +<html xmlns="http://www.w3.org/1999/xhtml"> > +<head> > +<title> > +$doc.use("XWiki.PDFClass") > +#set($title = $doc.display("title")) > +#if((!$title)||($title=="")) > +#set( $title = $!xwiki.getWebPreference("title")) > +#if ( $title != "") > +$xwiki.parseContent($title) > +#else > +XWiki - $!doc.web - $!doc.displayTitle > +#end > +#else > +$title > +#end > +</title> > +<meta http-equiv="Content-Type" content="text/html; charset= > $xwiki.encoding" /> > +</head> > +<body id="body" class="${context.action}body"> > +<div id="xwikimaincontainer"> > +<div id="xwikimaincontainerinner"> > > Modified: xwiki/trunk/web/standard/src/main/webapp/skins/finch/pdf.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/skins/finch/pdf.vm > 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/skins/finch/pdf.vm > 2007-04-20 21:49:55 UTC (rev 2916) > @@ -1,20 +1,32 @@ > -#template("xwiki.vm") > -#template("httpheader.vm") > -#template("pdfheader.vm") > -<div id="xwikicontent"> > -$cdoc.getRenderedContent() > -</div> > -#if ($request.get("comments")=="1") > -#template("comments2.vm") > -#end > -#if ($request.get("attachments")=="1") > -<div id="xwikiattachments"> > -#foreach ($attach in $doc.attachmentList) > -#if ($attach.isImage()) > -<img src="$doc.getAttachmentURL("${attach.filename}", "download")" > alt="${attach.filename}" /> > -<br /> > -#end > -#end > -</div> > -#end > -#template("pdffooter.vm") > +#template("xwiki.vm") > +$doc.use("XWiki.PDFClass") > +#template("pdfhtmlheader.vm") > +#set($pdfheader = $doc.display("header")) > +#if($pdfheader=="") > +#template("pdfheader.vm") > +#else > +$pdfheader > +#end > +<div id="xwikicontent"> > +$cdoc.getRenderedContent() > +</div> > +#if ($request.get("comments")=="1") > +#template("comments2.vm") > +#end > +#if ($request.get("attachments")=="1") > +<div id="xwikiattachments"> > +#foreach ($attach in $doc.attachmentList) > +#if ($attach.isImage()) > +<img src="$doc.getAttachmentURL("${attach.filename}", "download")" > alt="${attach.filename}" /> > +<br /> > +#end > +#end > +</div> > +#end > +$doc.use("XWiki.PDFClass") > +#set($pdffooter = $doc.display("footer")) > +#if($pdffooter=="") > +#template("pdffooter.vm") > +#else > +$pdffooter > +#end > \ No newline at end of file > > Added: xwiki/trunk/web/standard/src/main/webapp/skins/finch/ > pdfhtmlheader.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/skins/finch/ > pdfhtmlheader.vm 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/skins/finch/ > pdfhtmlheader.vm 2007-04-20 21:49:55 UTC (rev 2916) > @@ -0,0 +1,24 @@ > +<?xml version="1.0" encoding="$xwiki.encoding" ?> > +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" > + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> > +<html xmlns="http://www.w3.org/1999/xhtml"> > +<head> > +<title> > +$doc.use("XWiki.PDFClass") > +#set($title = $doc.display("title")) > +#if((!$title)||($title=="")) > +#set( $title = $!xwiki.getWebPreference("title")) > +#if ( $title != "") > +$xwiki.parseContent($title) > +#else > +XWiki - $!doc.web - $!doc.displayTitle > +#end > +#else > +$title > +#end > +</title> > +<meta http-equiv="Content-Type" content="text/html; charset= > $xwiki.encoding" /> > +</head> > +<body id="body" class="${context.action}body"> > +<div id="xwikimaincontainer"> > +<div id="xwikimaincontainerinner"> > > Modified: xwiki/trunk/web/standard/src/main/webapp/templates/pdf.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/templates/pdf.vm > 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/templates/pdf.vm > 2007-04-20 21:49:55 UTC (rev 2916) > @@ -1,6 +1,12 @@ > #template("xwiki.vm") > -#template("httpheader.vm") > +$doc.use("XWiki.PDFClass") > +#template("pdfhtmlheader.vm") > +#set($pdfheader = $doc.display("header")) > +#if($pdfheader=="") > #template("pdfheader.vm") > +#else > +$pdfheader > +#end > <div id="xwikicontent"> > $cdoc.getRenderedContent() > </div> > @@ -17,4 +23,10 @@ > #end > </div> > #end > +$doc.use("XWiki.PDFClass") > +#set($pdffooter = $doc.display("footer")) > +#if($pdffooter=="") > #template("pdffooter.vm") > +#else > +$pdffooter > +#end > \ No newline at end of file > > Added: xwiki/trunk/web/standard/src/main/webapp/templates/ > pdfhtmlheader.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/templates/ > pdfhtmlheader.vm 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/templates/ > pdfhtmlheader.vm 2007-04-20 21:49:55 UTC (rev 2916) > @@ -0,0 +1,24 @@ > +<?xml version="1.0" encoding="$xwiki.encoding" ?> > +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" > + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> > +<html xmlns="http://www.w3.org/1999/xhtml"> > +<head> > +<title> > +$doc.use("XWiki.PDFClass") > +#set($title = $doc.display("title")) > +#if((!$title)||($title=="")) > +#set( $title = $!xwiki.getWebPreference("title")) > +#if ( $title != "") > +$xwiki.parseContent($title) > +#else > +XWiki - $!doc.web - $!doc.displayTitle > +#end > +#else > +$title > +#end > +</title> > +<meta http-equiv="Content-Type" content="text/html; charset= > $xwiki.encoding" /> > +</head> > +<body id="body" class="${context.action}body"> > +<div id="xwikimaincontainer"> > +<div id="xwikimaincontainerinner"> > > > > -- > You receive this message as a subscriber of the xwiki- > commits(a)objectweb.org mailing list. > To unsubscribe: mailto:[email protected] > For general help: mailto:[email protected]?subject=help > ObjectWeb mailing lists service home page: http://www.objectweb.org/ > wws

2 1

What's left for the final 1.0 release?
by Vincent Massol 23 Apr '07

23 Apr '07

Hi everyone, As release manager of the 1.0 version I'd like everyone's input on any important pending issues that you may know and that would need to be in the 1.0 release. As you've seen we've released RC1 yesterday. We'd now like to release the 1.0 version in one or two weeks depending on issues that need to be fixed. I've already listed one issue in JIRA for 1.0: * XWIKI-1107: XML content inside {code} macro is rendered in the WYSIWYG editor http://jira.xwiki.org/jira/browse/XWIKI-1107 Any other? Thanks -Vincent

4 5

[Proposal] Separate xwiki configuration from the XWiki WAR
by Vincent Massol 21 Apr '07

21 Apr '07

Hi, For XWiki 1.1 I'd like to separate XWiki's configuration files from the generated WAR. What I mean by configuration files: xwiki.cfg, hibernate.cfg.xml, xwiki.hbm, feeds.hbm and possibly some others. Rationale: 1) It would be nice to release different already made configurations for XWiki: for HSQLDB, for MySQL, for Oracle, with a minimal list of plugins configured, with all plugins enabled, with virtual wiki set up, etc. It's going to be way better to release a single WAR that is the same for all configs and a set of config files separately. This also makes it much easier in the build process. 2) It's currently a little bit of a pain for users when they upgrade their xwiki installation to a newer version. They have to remember to save their config files, to unpack the XWiki WAR, modify the configuration files, etc. What if an upgrade was a simple as dropping the new WAR file in the webapps/ directory of your servlet container? :) Thus I'd like to propose the following strategy: * XWiki looks for where the config files are stored using the following algorithm: 1) first it checks if a system property has been defined (say for example "xwiki.configuration.directory") 1) if not, it checks if a location has been specified in the web.xml file (as an init parameter) 2) if not found, it checks if the files can be found at the root of the classpath (e.g. "/xwiki.cfg") * The standalone distribution contains an already configured directory structure which uses the system property strategy for finding the configuration directory. <further future - but not too far as it's the best solution I think> We should propose a configuration wizard application which is in charge of generating xwiki configuration files. I propose the following distribution channels: - as a webapp wizard configured on xwiki.org. Users use forms to select what they want (which plugin, virtual wiki or not, etc). It generate the files that can be downloaded by the users. Actually this can even be implemented as a XWiki Application... ;-) Eating our dog food they said... - as a webapp wizard released inside the default WAR and that is activated automatically if no configuration is found, i.e. the first time XWiki is started. This is really by far the best I believe. </further future> WDYT? Thanks -Vincent

2 5