akami 1.2.0 → 1.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4d17edac634460b7b9cee2f6113d89c2713813a4
+  data.tar.gz: f5e4aea68fbb2c589b4016998244180a0a124e3f
+SHA512:
+  metadata.gz: db43635bac8d3f6246bc5c265ee90ba55d258cd22fa2522a6f2c8c328973bf09d8e1bcb8991e3aef978076a68be28a6beda9a3d22e0cbd4170730b1698ebff35
+  data.tar.gz: c7d2242e8205bf0952dfc058026aa37544941c6cda31efc67329baa283aa90229736066ddf00832a9d80f93bcb3336314f801c9b2b2d8e0b17daf8635d642fca

data/.travis.yml

@@ -1,8 +1,8 @@
+# https://github.com/travis-ci/travis-ci/wiki/.travis.yml-options
+language: "ruby"
+script: "bundle exec rake"
 rvm:
-  - 1.8.7
   - 1.9.2
-  - ruby-head
-  - ree
+  - 1.9.3
+  - jruby-19mode
   - rbx
-  - rbx-2.0
-  - jruby

data/CHANGELOG.md

@@ -1,10 +1,16 @@
+## master
+
+## 1.2.1 (2014-01-31)
+* Fix: [#2](https://github.com/savonrb/akami/pull/2) Fixes related to WS-Security,
+  UserToken authentication.
+
 ## 1.2.0 (2012-06-28)
 
 * Fix: Lowered the version of Nokogiri required to use Akami.
 
 ## 1.1.0 (2012-06-06)
 
-* Feature: [#3](https://github.com/rubiii/akami/pull/3) - WSSE signing.
+* Feature: [#3](https://github.com/savonrb/akami/pull/3) - WSSE signing.
 
 ## 1.0.0 (2011-07-03)
 

data/Gemfile

@@ -1,2 +1,10 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 gemspec
+
+platform :rbx do
+  gem 'json'
+  gem 'racc'
+  gem 'rubysl'
+  gem 'rubinius-coverage'
+end
+

data/README.md

@@ -1,4 +1,4 @@
-Akami [![Build Status](http://travis-ci.org/rubiii/akami.png)](http://travis-ci.org/rubiii/akami)
+Akami [![Build Status](http://travis-ci.org/savonrb/akami.png)](http://travis-ci.org/savonrb/akami)
 =====
 
 Building Web Service Security.

data/akami.gemspec

@@ -7,20 +7,20 @@ Gem::Specification.new do |s|
   s.version     = Akami::VERSION
   s.authors     = ["Daniel Harrington"]
   s.email       = ["me@rubiii.com"]
-  s.homepage    = "https://github.com/rubiii/#{s.name}"
+  s.homepage    = "https://github.com/savonrb/#{s.name}"
   s.summary     = "Web Service Security"
   s.description = "Building Web Service Security"
 
   s.rubyforge_project = s.name
+  s.license = "MIT"
 
   s.add_dependency "gyoku", ">= 0.4.0"
-  s.add_dependency "nokogiri", ">= 1.4.0"
+  s.add_dependency "nokogiri"
 
-  s.add_development_dependency "rake",    "~> 0.8.7"
-  s.add_development_dependency "rspec",   "~> 2.5.0"
-  s.add_development_dependency "mocha",   "~> 0.9.8"
-  s.add_development_dependency "timecop", "~> 0.3.5"
-  s.add_development_dependency "autotest"
+  s.add_development_dependency "rake",    "~> 10.0"
+  s.add_development_dependency "rspec",   "~> 2.12"
+  s.add_development_dependency "mocha",   "~> 0.13"
+  s.add_development_dependency "timecop", "~> 0.5"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/akami/version.rb

@@ -1,5 +1,5 @@
 module Akami
 
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 
 end

data/lib/akami/wsse.rb

@@ -111,18 +111,21 @@ module Akami
     # Returns a Hash containing wsse:UsernameToken details.
     def wsse_username_token
       if digest?
-        security_hash :wsse, "UsernameToken",
+        token = security_hash :wsse, "UsernameToken",
           "wsse:Username" => username,
-          "wsse:Nonce" => nonce,
+          "wsse:Nonce" => Base64.encode64(nonce),
           "wsu:Created" => timestamp,
           "wsse:Password" => digest_password,
           :attributes! => { "wsse:Password" => { "Type" => PASSWORD_DIGEST_URI } }
+        # clear the nonce after each use
+        @nonce = nil
       else
-        security_hash :wsse, "UsernameToken",
+        token = security_hash :wsse, "UsernameToken",
           "wsse:Username" => username,
           "wsse:Password" => password,
           :attributes! => { "wsse:Password" => { "Type" => PASSWORD_TEXT_URI } }
       end
+      token
     end
 
     def wsse_signature
@@ -169,7 +172,7 @@ module Akami
     # Returns the WSSE password, encrypted for digest authentication.
     def digest_password
       token = nonce + timestamp + password
-      Base64.encode64(Digest::SHA1.hexdigest(token)).chomp!
+      Base64.encode64(Digest::SHA1.digest(token)).chomp!
     end
 
     # Returns a WSSE nonce.
@@ -184,7 +187,7 @@ module Akami
 
     # Returns a WSSE timestamp.
     def timestamp
-      @timestamp ||= Time.now.xmlschema
+      @timestamp ||= Time.now.utc.xmlschema
     end
 
     # Returns a new number with every call.

data/spec/akami/wsse_spec.rb

@@ -1,4 +1,6 @@
-require "spec_helper"
+require 'spec_helper'
+require 'base64'
+require 'nokogiri'
 
 describe Akami do
   let(:wsse) { Akami.wsse }
@@ -147,17 +149,38 @@ describe Akami do
       end
 
       it "contains a wsse:Nonce tag" do
-        wsse.to_xml.should match(/<wsse:Nonce>\w+<\/wsse:Nonce>/)
+        wsse.to_xml.should match(/<wsse:Nonce>[^<]+<\/wsse:Nonce>/)
       end
 
       it "contains a wsu:Created tag" do
-        datetime_regexp = /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/
-        wsse.to_xml.should match(/<wsu:Created>#{datetime_regexp}.+<\/wsu:Created>/)
+        created_at = Time.now
+        Timecop.freeze created_at do
+          wsse.to_xml.should include("<wsu:Created>#{created_at.utc.xmlschema}</wsu:Created>")
+        end
       end
 
       it "contains the PasswordDigest type attribute" do
         wsse.to_xml.should include(Akami::WSSE::PASSWORD_DIGEST_URI)
       end
+
+      it "should reset the nonce every time" do
+        created_at = Time.now
+        Timecop.freeze created_at do
+          nonce_regexp = /<wsse:Nonce>([^<]+)<\/wsse:Nonce>/
+          nonce_first = Base64.decode64(nonce_regexp.match(wsse.to_xml)[1])
+          nonce_second = Base64.decode64(nonce_regexp.match(wsse.to_xml)[1])
+          nonce_first.should_not == nonce_second
+        end
+      end
+
+      it "has contains a properly hashed password" do
+        xml_header = Nokogiri::XML(wsse.to_xml)
+        xml_header.remove_namespaces!
+        nonce = Base64.decode64(xml_header.xpath('//Nonce').first.content)
+        created_at = xml_header.xpath('//Created').first.content
+        password_hash = Base64.decode64(xml_header.xpath('//Password').first.content)
+        password_hash.should == Digest::SHA1.digest((nonce + created_at + "password"))
+      end
     end
 
     context "with #timestamp set to true" do

metadata

@@ -1,142 +1,106 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: akami
-version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
+version: !ruby/object:Gem::Version
+  version: 1.2.1
 platform: ruby
-authors: 
+authors:
 - Daniel Harrington
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
-        version: 0.4.0
+date: 2014-02-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: gyoku
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
   type: :runtime
   prerelease: false
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
-        version: 1.4.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
   name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
   type: :development
   prerelease: false
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
-        version: 2.5.0
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
   type: :development
   prerelease: false
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
-        version: 0.9.8
+      - !ruby/object:Gem::Version
+        version: '2.12'
+- !ruby/object:Gem::Dependency
   name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.13'
   type: :development
   prerelease: false
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 3
-        - 5
-        version: 0.3.5
+      - !ruby/object:Gem::Version
+        version: '0.13'
+- !ruby/object:Gem::Dependency
   name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :development
   prerelease: false
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: autotest
-  type: :development
-  prerelease: false
-  requirement: *id007
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
 description: Building Web Service Security
-email: 
+email:
 - me@rubiii.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -157,39 +121,30 @@ files:
 - lib/akami/xpath_helper.rb
 - spec/akami/wsse_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/rubiii/akami
-licenses: []
-
+homepage: https://github.com/savonrb/akami
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: akami
-rubygems_version: 1.8.21
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Web Service Security
-test_files: 
+test_files:
 - spec/akami/wsse_spec.rb
 - spec/spec_helper.rb