You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2006/08/22 05:18:06 UTC
svn commit: r433483 - in /directory/branches/apacheds/1.0:
core/src/main/java/org/apache/directory/server/core/schema/
server-unit/src/test/java/org/apache/directory/server/
Author: akarasulu
Date: Mon Aug 21 20:18:05 2006
New Revision: 433483
URL: http://svn.apache.org/viewvc?rev=433483&view=rev
Log:
fix for DIRSERVER-630
Added:
directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModificationITest.java
- copied, changed from r433475, directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModification.java
Removed:
directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModification.java
Modified:
directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=433483&r1=433482&r2=433483&view=diff
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Mon Aug 21 20:18:05 2006
@@ -786,6 +786,17 @@
{
objectClassMod = mods[ii];
}
+
+ // Freak out under some weird cases
+ if ( mods[0].getAttribute().size() == 0 )
+ {
+ // not ok for add but ok for replace and delete
+ if ( mods[0].getModificationOp() == DirContext.ADD_ATTRIBUTE )
+ {
+ throw new LdapInvalidAttributeValueException( "No value is not a valid value for an attribute.",
+ ResultCodeEnum.INVALIDATTRIBUTESYNTAX );
+ }
+ }
StringBuffer keybuf = new StringBuffer();
keybuf.append( mods[ii].getModificationOp() );
Copied: directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModificationITest.java (from r433475, directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModification.java)
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModificationITest.java?p2=directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModificationITest.java&p1=directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModification.java&r1=433475&r2=433483&rev=433483&view=diff
==============================================================================
--- directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModification.java (original)
+++ directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModificationITest.java Mon Aug 21 20:18:05 2006
@@ -48,7 +48,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev: $
*/
-public class IllegalModification extends AbstractServerTest
+public class IllegalModificationITest extends AbstractServerTest
{
static final String DN = "cn=Kate Bush,ou=system";
static final String USER = "uid=admin,ou=system";
@@ -93,7 +93,7 @@
try
{
- con.modify( "cn=Kate Bush,dc=example,dc=com", mod );
+ con.modify( "cn=Kate Bush,ou=system", mod );
fail( "error expected due to empty attribute value" );
}
catch ( LDAPException e )
@@ -103,7 +103,6 @@
// Check whether entry is unmodified, i.e. no description
LDAPEntry entry = con.read( DN );
- System.err.println( entry );
assertEquals( "description exists?", null, entry.getAttribute( "description" ) );
}
}
Re: svn commit: r433483 - in /directory/branches/apacheds/1.0: core/src/main/java/org/apache/directory/server/core/schema/ server-unit/src/test/java/org/apache/directory/server/
Posted by Ersin Er <er...@gmail.com>.
On 8/22/06, Ersin Er <er...@gmail.com> wrote:
> On 8/22/06, Ersin Er <er...@gmail.com> wrote:
> > On 8/22/06, akarasulu@apache.org <ak...@apache.org> wrote:
> > > Author: akarasulu
> > > Date: Mon Aug 21 20:18:05 2006
> > > New Revision: 433483
> > >
> > > URL: http://svn.apache.org/viewvc?rev=433483&view=rev
> > > Log:
> > > fix for DIRSERVER-630
> > >
> > > Added:
> > > directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModificationITest.java
> > > - copied, changed from r433475, directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModification.java
> > > Removed:
> > > directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModification.java
> > > Modified:
> > > directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
> > >
> > > Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
> > > URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=433483&r1=433482&r2=433483&view=diff
> > > ==============================================================================
> > > --- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
> > > +++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Mon Aug 21 20:18:05 2006
> > > @@ -786,6 +786,17 @@
> > > {
> > > objectClassMod = mods[ii];
> > > }
> > > +
> > > + // Freak out under some weird cases
> > > + if ( mods[0].getAttribute().size() == 0 )
> > > + {
> > > + // not ok for add but ok for replace and delete
> > > + if ( mods[0].getModificationOp() == DirContext.ADD_ATTRIBUTE )
> > > + {
> > > + throw new LdapInvalidAttributeValueException( "No value is not a valid value for an attribute.",
> > > + ResultCodeEnum.INVALIDATTRIBUTESYNTAX );
> > > + }
> > > + }
> > >
> > > StringBuffer keybuf = new StringBuffer();
> > > keybuf.append( mods[ii].getModificationOp() );
> > >
> >
> > Alex,
>
> Well,
>
> > 1. I think the index used for mods[0].get... portions should be ii instead of 0.
>
> Here is the test case to show that there is still an issue as
> mentioned in this item:
>
> http://svn.apache.org/viewvc?view=rev&revision=433577
>
> > 2. What about the other modify method in the schema service?
>
> And here is another about this item:
>
> http://svn.apache.org/viewvc?view=rev&revision=433578
>
> --
> Ersin
>
OK, I have fixed both here:
http://svn.apache.org/viewvc?view=rev&revision=433580
Patch for 1.1 branch will follow (after I learn to use this svn merge
stuff from cl).
--
Ersin
Re: svn commit: r433483 - in /directory/branches/apacheds/1.0: core/src/main/java/org/apache/directory/server/core/schema/ server-unit/src/test/java/org/apache/directory/server/
Posted by Ersin Er <er...@gmail.com>.
On 8/22/06, Ersin Er <er...@gmail.com> wrote:
> On 8/22/06, akarasulu@apache.org <ak...@apache.org> wrote:
> > Author: akarasulu
> > Date: Mon Aug 21 20:18:05 2006
> > New Revision: 433483
> >
> > URL: http://svn.apache.org/viewvc?rev=433483&view=rev
> > Log:
> > fix for DIRSERVER-630
> >
> > Added:
> > directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModificationITest.java
> > - copied, changed from r433475, directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModification.java
> > Removed:
> > directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModification.java
> > Modified:
> > directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
> >
> > Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
> > URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=433483&r1=433482&r2=433483&view=diff
> > ==============================================================================
> > --- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
> > +++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Mon Aug 21 20:18:05 2006
> > @@ -786,6 +786,17 @@
> > {
> > objectClassMod = mods[ii];
> > }
> > +
> > + // Freak out under some weird cases
> > + if ( mods[0].getAttribute().size() == 0 )
> > + {
> > + // not ok for add but ok for replace and delete
> > + if ( mods[0].getModificationOp() == DirContext.ADD_ATTRIBUTE )
> > + {
> > + throw new LdapInvalidAttributeValueException( "No value is not a valid value for an attribute.",
> > + ResultCodeEnum.INVALIDATTRIBUTESYNTAX );
> > + }
> > + }
> >
> > StringBuffer keybuf = new StringBuffer();
> > keybuf.append( mods[ii].getModificationOp() );
> >
>
> Alex,
Well,
> 1. I think the index used for mods[0].get... portions should be ii instead of 0.
Here is the test case to show that there is still an issue as
mentioned in this item:
http://svn.apache.org/viewvc?view=rev&revision=433577
> 2. What about the other modify method in the schema service?
And here is another about this item:
http://svn.apache.org/viewvc?view=rev&revision=433578
--
Ersin
Re: svn commit: r433483 - in /directory/branches/apacheds/1.0: core/src/main/java/org/apache/directory/server/core/schema/
server-unit/src/test/java/org/apache/directory/server/
Posted by Alex Karasulu <ao...@bellsouth.net>.
Ersin Er wrote:
> On 8/22/06, akarasulu@apache.org <ak...@apache.org> wrote:
>> Author: akarasulu
>> Date: Mon Aug 21 20:18:05 2006
>> New Revision: 433483
>>
>> URL: http://svn.apache.org/viewvc?rev=433483&view=rev
>> Log:
>> fix for DIRSERVER-630
>>
>> Added:
>>
>> directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModificationITest.java
>>
>> - copied, changed from r433475,
>> directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModification.java
>>
>> Removed:
>>
>> directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModification.java
>>
>> Modified:
>>
>> directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
>>
>>
>> Modified:
>> directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
>>
>> URL:
>> http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=433483&r1=433482&r2=433483&view=diff
>>
>> ==============================================================================
>>
>> ---
>> directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
>> (original)
>> +++
>> directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
>> Mon Aug 21 20:18:05 2006
>> @@ -786,6 +786,17 @@
>> {
>> objectClassMod = mods[ii];
>> }
>> +
>> + // Freak out under some weird cases
>> + if ( mods[0].getAttribute().size() == 0 )
>> + {
>> + // not ok for add but ok for replace and delete
>> + if ( mods[0].getModificationOp() ==
>> DirContext.ADD_ATTRIBUTE )
>> + {
>> + throw new LdapInvalidAttributeValueException( "No
>> value is not a valid value for an attribute.",
>> + ResultCodeEnum.INVALIDATTRIBUTESYNTAX );
>> + }
>> + }
>>
>> StringBuffer keybuf = new StringBuffer();
>> keybuf.append( mods[ii].getModificationOp() );
>>
>
> Alex,
>
> 1. I think the index used for mods[0].get... portions should be ii
> instead of 0.
> 2. What about the other modify method in the schema service?
>
Man I was sleeping. Sorry about this. Thanks for the corrections.
Alex
Re: svn commit: r433483 - in /directory/branches/apacheds/1.0: core/src/main/java/org/apache/directory/server/core/schema/ server-unit/src/test/java/org/apache/directory/server/
Posted by Ersin Er <er...@gmail.com>.
On 8/22/06, akarasulu@apache.org <ak...@apache.org> wrote:
> Author: akarasulu
> Date: Mon Aug 21 20:18:05 2006
> New Revision: 433483
>
> URL: http://svn.apache.org/viewvc?rev=433483&view=rev
> Log:
> fix for DIRSERVER-630
>
> Added:
> directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModificationITest.java
> - copied, changed from r433475, directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModification.java
> Removed:
> directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModification.java
> Modified:
> directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
>
> Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
> URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=433483&r1=433482&r2=433483&view=diff
> ==============================================================================
> --- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
> +++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Mon Aug 21 20:18:05 2006
> @@ -786,6 +786,17 @@
> {
> objectClassMod = mods[ii];
> }
> +
> + // Freak out under some weird cases
> + if ( mods[0].getAttribute().size() == 0 )
> + {
> + // not ok for add but ok for replace and delete
> + if ( mods[0].getModificationOp() == DirContext.ADD_ATTRIBUTE )
> + {
> + throw new LdapInvalidAttributeValueException( "No value is not a valid value for an attribute.",
> + ResultCodeEnum.INVALIDATTRIBUTESYNTAX );
> + }
> + }
>
> StringBuffer keybuf = new StringBuffer();
> keybuf.append( mods[ii].getModificationOp() );
>
Alex,
1. I think the index used for mods[0].get... portions should be ii instead of 0.
2. What about the other modify method in the schema service?
--
Ersin