Merge lp:~jsjgruber/ubuntu/oneiric/couchdb/couchdb.fix780972.r1039345 into lp:ubuntu/oneiric/couchdb

[John S. Gruber]

Proposed fix for LP: #780972, cherry picking from couchdb upstream svn r1039345.

Test build is in ppa:jsjgruber/ppa couchdb -- 1.0.1-0ubuntu17~jsg4.whole.patch

i386 build log is at: https://launchpad.net/~jsjgruber/+archive/ppa/+build/2773697/+files/buildlog_ubuntu-oneiric-i386.couchdb_1.0.1-0ubuntu17%7Ejsg4.whole.patch_BUILDING.txt.gz

to test use the command:

python -c "from desktopcouch.application.server import *; d=DesktopDatabase('test', create=True)"

Which should return without a traceback. The bug causes this to produce an unauthorized exception.

[dobey (dobey)]

I'm voting my disapproval of this branch, not because I think the patch is bad, but because of how it is applied. Patches need to be files under debian/patches/ (like all the other patches in this package), and not direct changes in the tree. You also should not include your PPA ~version piece in the changelog version string for an upload into Ubuntu proper.

Since it was quick to do, I've went ahead and made another branch and proposed it, by making the changes into a proper patch, and tweaking the changelog entry, while still properly attributing the fix to you. It is at https://code.launchpad.net/~dobey/ubuntu/oneiric/couchdb/fix-780972/+merge/75238

Thanks.

review: Disapprove

Unmerged revisions

56. By John S. Gruber on 2011-09-08

Backport svn r1039345 from 1.0.3., fixing LP: #780972.

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-14 17:47:09 +0000
+++ debian/changelog	2011-09-08 19:56:53 +0000
@@ -1,3 +1,9 @@
+couchdb (1.0.1-0ubuntu17~jsg4.whole.patch) oneiric; urgency=low
+
+  * Backport svn r1039345 from 1.0.3., fixing LP: #780972.
+
+ -- John S Gruber <[e-mail]>  Fri, 02 Sep 2011 01:02:01 -0400
+
 couchdb (1.0.1-0ubuntu16) oneiric; urgency=low
 
   * Update Spidermonkey 1.8.5 patchset to the more palatable ones I'm
 
=== modified file 'src/erlang-oauth/oauth.app.in'
--- src/erlang-oauth/oauth.app.in	2010-07-26 10:24:11 +0000
+++ src/erlang-oauth/oauth.app.in	2011-09-08 19:56:53 +0000
@@ -1,6 +1,6 @@
 {application, oauth, [
   {description, "Erlang OAuth implementation"},
-  {vsn, "dev"},
+  {vsn, "7d85d3ef"},
   {modules, [
     oauth,
     oauth_hmac_sha1,
 
=== modified file 'src/erlang-oauth/oauth_hmac_sha1.erl'
--- src/erlang-oauth/oauth_hmac_sha1.erl	2010-07-26 10:24:11 +0000
+++ src/erlang-oauth/oauth_hmac_sha1.erl	2011-09-08 19:56:53 +0000
@@ -8,4 +8,4 @@
   base64:encode_to_string(crypto:sha_mac(Key, BaseString)).
 
 verify(Signature, BaseString, CS, TS) ->
-  couch_util:verify(signature(BaseString, CS, TS), Signature).
+  Signature =:= signature(BaseString, CS, TS).
 
=== modified file 'src/erlang-oauth/oauth_http.erl'
--- src/erlang-oauth/oauth_http.erl	2009-08-24 15:44:14 +0000
+++ src/erlang-oauth/oauth_http.erl	2011-09-08 19:56:53 +0000
@@ -10,7 +10,7 @@
   request(post, {URL, [], "application/x-www-form-urlencoded", Data}).
 
 request(Method, Request) ->
-  http:request(Method, Request, [{autoredirect, false}], []).
+  httpc:request(Method, Request, [{autoredirect, false}], []).
 
 response_params(Response) ->
   oauth_uri:params_from_string(response_body(Response)).
 
=== modified file 'src/erlang-oauth/oauth_plaintext.erl'
--- src/erlang-oauth/oauth_plaintext.erl	2010-07-26 10:24:11 +0000
+++ src/erlang-oauth/oauth_plaintext.erl	2011-09-08 19:56:53 +0000
@@ -7,4 +7,4 @@
   oauth_uri:calate("&", [CS, TS]).
 
 verify(Signature, CS, TS) ->
-  couch_util:verify(signature(CS, TS), Signature).
+  Signature =:= signature(CS, TS).
 
=== modified file 'src/erlang-oauth/oauth_uri.erl'
--- src/erlang-oauth/oauth_uri.erl	2009-08-24 15:44:14 +0000
+++ src/erlang-oauth/oauth_uri.erl	2011-09-08 19:56:53 +0000
@@ -6,14 +6,6 @@
 
 -import(lists, [concat/1]).
 
--define(is_uppercase_alpha(C), C >= $A, C =< $Z).
--define(is_lowercase_alpha(C), C >= $a, C =< $z).
--define(is_alpha(C), ?is_uppercase_alpha(C); ?is_lowercase_alpha(C)).
--define(is_digit(C), C >= $0, C =< $9).
--define(is_alphanumeric(C), ?is_alpha(C); ?is_digit(C)).
--define(is_unreserved(C), ?is_alphanumeric(C); C =:= $-; C =:= $_; C =:= $.; C =:= $~).
--define(is_hex(C), ?is_digit(C); C >= $A, C =< $F).
-
 
 normalize(URI) ->
   case http_uri:parse(URI) of
@@ -66,23 +58,41 @@
 intersperse(Sep, [X|Xs]) ->
   [X, Sep|intersperse(Sep, Xs)].
 
-decode(Chars) ->
-  decode(Chars, []).
-
-decode([], Decoded) ->
-  lists:reverse(Decoded);
-decode([$%,A,B|Etc], Decoded) when ?is_hex(A), ?is_hex(B) ->
-  decode(Etc, [erlang:list_to_integer([A,B], 16)|Decoded]);
-decode([C|Etc], Decoded) when ?is_unreserved(C) ->
-  decode(Etc, [C|Decoded]).
-
-encode(Chars) ->
-  encode(Chars, []).
-
-encode([], Encoded) ->
-  lists:flatten(lists:reverse(Encoded));
-encode([C|Etc], Encoded) when ?is_unreserved(C) ->
-  encode(Etc, [C|Encoded]);
-encode([C|Etc], Encoded) ->
-  Value = io_lib:format("%~2.1.0s", [erlang:integer_to_list(C, 16)]),
-  encode(Etc, [Value|Encoded]).
+-define(is_alphanum(C), C >= $A, C =< $Z; C >= $a, C =< $z; C >= $0, C =< $9).
+
+encode(Term) when is_integer(Term) ->
+  integer_to_list(Term);
+encode(Term) when is_atom(Term) ->
+  encode(atom_to_list(Term));
+encode(Term) when is_list(Term) ->
+  encode(lists:reverse(Term, []), []).
+
+encode([X | T], Acc) when ?is_alphanum(X); X =:= $-; X =:= $_; X =:= $.; X =:= $~ ->
+  encode(T, [X | Acc]);
+encode([X | T], Acc) ->
+  NewAcc = [$%, dec2hex(X bsr 4), dec2hex(X band 16#0f) | Acc],
+  encode(T, NewAcc);
+encode([], Acc) ->
+  Acc.
+
+decode(Str) when is_list(Str) ->
+  decode(Str, []).
+
+decode([$%, A, B | T], Acc) ->
+  decode(T, [(hex2dec(A) bsl 4) + hex2dec(B) | Acc]);
+decode([X | T], Acc) ->
+  decode(T, [X | Acc]);
+decode([], Acc) ->
+  lists:reverse(Acc, []).
+
+-compile({inline, [{dec2hex, 1}, {hex2dec, 1}]}).
+
+dec2hex(N) when N >= 10 andalso N =< 15 ->
+  N + $A - 10;
+dec2hex(N) when N >= 0 andalso N =< 9 ->
+  N + $0.
+
+hex2dec(C) when C >= $A andalso C =< $F ->
+  C - $A + 10;
+hex2dec(C) when C >= $0 andalso C =< $9 ->
+  C - $0.