Re: bug report and unit test for infinite loop parsing Content-Disposion header

[Paul Rogers <pmr16366@gmail.com>]

Thanks for the responses, and sorry for the double posting, not sure
what happened there.

I also found I can quote the filename which passes the tests. The app
Im using this in is a mock for another service, and I'll have to check
if the real service accepts a quoted string.

I'll also try these fixes in case that works better for me

Thanks

Paul

On May 6, 6:39 pm, Lawrence Pit <lawrence....@gmail.com> wrote:
> Given the value of DISPPARM must always have at least 1 character (according to RFC2183 and RFC2045) that fix seems correct to me.
>
> In addition I would make the TOKEN regexp non-greedy (for the BROKEN_UNQUOTED case):
>
>     TOKEN = /[^\s()<>,;:\\"\/\[\]?=]+?/
>
> Also, why is the "@" character accepted as part of a TOKEN? It is part of the tspecials (in RFC2045), so I think it should not be accepted as a valid token character.
>
> Cheers,
> Lawrence
>
>
>
>
>
>
>
> > I think the following should fix your issue (but I'm not sure it's
> > correct):
>
> > diff --git a/lib/rack/multipart.rb b/lib/rack/multipart.rb
> > index 3777106..6849248 100644
> > --- a/lib/rack/multipart.rb
> > +++ b/lib/rack/multipart.rb
> > @@ -12,7 +12,7 @@ module Rack
> >     MULTIPART = %r|\Amultipart/.*boundary=\"?([^\";,]+)\"?|n
> >     TOKEN = /[^\s()<>,;:\\"\/\[\]?=]+/
> >     CONDISP = /Content-Disposition:\s*#{TOKEN}\s*/i
> > -    DISPPARM = /;\s*(#{TOKEN})=("(?:\\"|[^"])*"|#{TOKEN})*/
> > +    DISPPARM = /;\s*(#{TOKEN})=("(?:\\"|[^"])*"|#{TOKEN})/
> >     RFC2183 = /^#{CONDISP}(#{DISPPARM})+$/i
> >     BROKEN_QUOTED = /^#{CONDISP}.*;\sfilename="(.*?)"(?:\s*$|\s*;\s*#{TOKEN}=)/i
> >     BROKEN_UNQUOTED = /^#{CONDISP}.*;\sfilename=(#{TOKEN})/i