Merge lp:~zorba-coders/zorba/fix-oauth-security into lp:zorba/oauth-module

[Matthias Brantner]

fix to work with hmac v.2 module

adapted to new hmac v.2 module

[Chris Hillery (ceejatec)]

Shouldn't you also change the import statement to explicitly import v2 of the hmac module?

[Sorin Marian Nasoi (sorin.marian.nasoi)]

review: Approve

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix-oauth-security-2012-12-14T06-43-34.462Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/fix-oauth-security into lp:zorba/oauth-module failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job fix-oauth-security-2012-12-14T06-43-34.462Z is
  finished. The final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[lp:~zorba-coders/zorba/fix-oauth-security]

27. By Chris Hillery on 2012-12-14

Bumped DECLARE_ZORBA_MODULE() version to match module; removed commented-out
code.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix-oauth-security-2012-12-14T08-49-34.391Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job fix-oauth-security-2012-12-14T08-49-34.391Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/com/zorba-xquery/www/modules/oauth/CMakeLists.txt'
--- src/com/zorba-xquery/www/modules/oauth/CMakeLists.txt	2011-08-15 13:29:12 +0000
+++ src/com/zorba-xquery/www/modules/oauth/CMakeLists.txt	2012-12-14 07:20:25 +0000
@@ -12,10 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DECLARE_ZORBA_MODULE (URI "http://www.zorba-xquery.com/modules/oauth/client" VERSION 1.0 FILE "client.xq")
-# This test is introduced by DECLARE_ZORBA_MODULE(), so this is the
-# best place for the EXPECTED_FAILURE() (especially because we're
-# cheating and using the undocumented ${num_zorba_modules}).
-#EXPECTED_FAILURE("check_mod_${num_zorba_modules}_client.xq" 3389465)
+DECLARE_ZORBA_MODULE (URI "http://www.zorba-xquery.com/modules/oauth/client" VERSION 2.0 FILE "client.xq")
 
 DECLARE_ZORBA_MODULE (URI "http://www.zorba-xquery.com/modules/oauth/error" VERSION 1.0 FILE "error.xq")

=== modified file 'src/com/zorba-xquery/www/modules/oauth/client.xq'
--- src/com/zorba-xquery/www/modules/oauth/client.xq	2012-04-25 16:32:43 +0000
+++ src/com/zorba-xquery/www/modules/oauth/client.xq	2012-12-14 07:20:25 +0000
@@ -31,7 +31,7 @@
 module namespace oauth = "http://www.zorba-xquery.com/modules/oauth/client";
 
 import module namespace ra = "http://www.zorba-xquery.com/modules/random";
-import module namespace hmac = "http://www.zorba-xquery.com/modules/cryptography/hmac";
+import module namespace hmac = "http://www.zorba-xquery.com/modules/cryptography/hmac#2.0";
 import module namespace http-client = "http://expath.org/ns/http-client";
 import schema namespace http = "http://expath.org/ns/http-client";
 
@@ -52,7 +52,7 @@
 
 declare option op:disable "f:trace";
 
-declare option ver:module-version "1.0";
+declare option ver:module-version "2.0";
 
 (:~
  : Utility function to build a service provider object.
@@ -504,7 +504,7 @@
    : uses the hmac-sha1 algorithm found here @see http://tools.ietf.org/html/rfc2104
    :)
   if($oauth-signature-method = "HMAC-SHA1")
-  then hmac:sha1($base-string, $key)
+  then xs:string(hmac:sha1($base-string, $key))
   (:
    : RSA-SHA1
    : @see http://tools.ietf.org/html/rfc5849#section-3.4.3