libgss 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a77c17af378bc6038a7ce58b8a07e4d60757fab3
-  data.tar.gz: aaf5b60ce2937cacce2f6fc35a398d446fcd0e9f
+  metadata.gz: d53665633c09d8a6f5ca84777c9de59b69f26ca0
+  data.tar.gz: 099b87fa95d54caac1aadb658a9aed566073d185
 SHA512:
-  metadata.gz: fb962ff05a56236c77dda5c1a85c29bb5d9230a285c07784379d63b109db944f24641690f34e680095f8e388aa3a9ca3e500a09a655421e1faa9febed8e5b11a
-  data.tar.gz: e91b141a88aee2001402312a5c0b968707d37e3324fea35686ab9825316b68019424ede486313f023a01c212f84c2b98f1ae95f9f2d2a68093602ad12d1a7f8b
+  metadata.gz: 48963d4fe7b7a7f02629fa5a0a92cef7030f6c9ebd8651624b0efa7203aba63f798417f91cebe0003cde45a4d7a1537bf73a317593564ec82dfcb1ffda1047cb
+  data.tar.gz: cf7df2a141e586bf514a485cc1a2e135572067e1413ce86b1fcd6a1c1bd5dd32983ae3924cda5bc58fb1db87c7f81e6efac33a45007d9d6ee5b7f9c8d76676d8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    libgss (0.7.2)
+    libgss (0.7.3)
       httpclient
       json
       oauth

data/lib/libgss/http_client_with_signature_key.rb

@@ -22,9 +22,13 @@ module Libgss
       headers = {
         "oauth_consumer_key" => network.consumer_key || "",
         "oauth_token"        => network.auth_token,
-        "oauth_nonce"        => oauth_nonce,
-        "oauth_timestamp"    => oauth_timestamp,
       }
+      unless @network.ignore_oauth_nonce
+        headers.update({
+            "oauth_nonce"     => oauth_nonce,
+            "oauth_timestamp" => oauth_timestamp,
+          })
+      end
       oauth_params = {
         "body" => body,
         "oauth_signature_method" => "HMAC-SHA1"
@@ -56,9 +60,13 @@ module Libgss
       headers = {
         "oauth_consumer_key" => network.consumer_key || "",
         "oauth_token"        => network.auth_token,
-        "oauth_nonce"        => oauth_nonce,
-        "oauth_timestamp"    => oauth_timestamp,
       }
+      unless @network.ignore_oauth_nonce
+        headers.update({
+            "oauth_nonce"     => oauth_nonce,
+            "oauth_timestamp" => oauth_timestamp,
+          })
+      end
       oauth_params = {
         "body" => '',
         "oauth_signature_method" => "HMAC-SHA1"
@@ -109,11 +117,11 @@ module Libgss
     end
 
     def oauth_nonce
-      SecureRandom.uuid.to_s
+      @network.oauth_nonce || SecureRandom.uuid.to_s
     end
 
     def oauth_timestamp
-      Time.now.utc.to_i
+      @network.oauth_timestamp || Time.now.utc.to_i
     end
 
     class Signature

data/lib/libgss/network.rb

@@ -25,6 +25,9 @@ module Libgss
 
     attr_accessor :consumer_secret
     attr_accessor :consumer_key
+    attr_accessor :ignore_oauth_nonce
+    attr_accessor :oauth_nonce
+    attr_accessor :oauth_timestamp
 
     attr_accessor :api_version
     attr_accessor :platform
@@ -49,6 +52,9 @@ module Libgss
     # @option options [String]  :platform 接続先のGSSサーバの認証のプラットフォーム。デフォルトは"fontana"。
     # @option options [String]  :player_id 接続に使用するプレイヤのID
     # @option options [String]  :consumer_secret GSSサーバとクライアントの間で行う署名の検証に使用される文字列。
+    # @option options [Boolean] :ignore_oauth_nonce OAuth認証時にoauth_nonceとoauth_timestampを使用しないかどうか。
+    # @option options [String]  :oauth_nonce OAuth認証のoauth_nonceパラメータ
+    # @option options [Integer] :oauth_timestamp OAuth認証のoauth_timestampパラメータ
     # @option options [Boolean] :ssl_disabled SSLを無効にするかどうか。
     # @option options [Boolean] :ignore_signature_key シグネチャキーによる署名を行うかどうか
     # @option options [Integer] :device_type_cd GSS/fontanaに登録されたデバイス種別
@@ -71,6 +77,9 @@ module Libgss
 
       @consumer_secret = options[:consumer_secret] || ENV["CONSUMER_SECRET"]
       @ignore_signature_key = !!options[:ignore_signature_key]
+      @ignore_oauth_nonce = !!options[:ignore_oauth_nonce]
+      @oauth_nonce = options[:oauth_nonce] || nil
+      @oauth_timestamp = options[:oauth_timestamp] || nil
 
       @device_type_cd = options[:device_type_cd]
       @client_version = options[:client_version]

data/lib/libgss/version.rb

@@ -1,3 +1,3 @@
 module Libgss
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/spec/libgss/network_spec.rb

@@ -19,6 +19,9 @@ describe Libgss::Network do
         network.player_id.should_not == nil
         network.auth_token.should_not == nil
         network.signature_key.should_not == nil
+        network.ignore_oauth_nonce.should == false
+        network.oauth_nonce.should == nil
+        network.oauth_timestamp.should == nil
         res.should == true
       end
     end
@@ -63,7 +66,6 @@ describe Libgss::Network do
       it_should_behave_like "Libgss::Network#login success",
         Proc.new{ network.player_id = nil },
         Proc.new{ network.player_id.should_not == nil }
-
     end
 
     context "failure with unregistered (maybe invalid) player_id" do
@@ -184,4 +186,42 @@ describe Libgss::Network do
     end
   end
 
+  describe "with oauth options" do
+
+    def spec_with_network_options(opts={}, &block)
+      r = new_network_with_options(opts).tap(&:login).new_action_request
+      r.server_time
+      r.send_request do |outputs|
+        outputs.length.should == 1
+        result = outputs.first['result']
+        yield(result) if block_given?
+      end
+    end
+
+    context "success" do
+      it "with ignore_oauth_nonce" do
+        spec_with_network_options({ignore_oauth_nonce: true})
+      end
+      it "with oauth_nonce" do
+        spec_with_network_options({oauth_nonce: UUID.new.generate})
+      end
+      it "with oauth_timestamp" do
+        time = Time.now
+        spec_with_network_options({oauth_timestamp: time.to_i})
+      end
+    end
+    context "401 error" do
+      it "with empty oauth_nonce" do
+        proc{
+          spec_with_network_options({oauth_nonce: ''})
+        }.should raise_error(::Libgss::ActionRequest::Error)
+      end
+      it "with old oauth_timestamp" do
+        time = Time.local(2013,7,1,12,0,0)
+        proc{
+          spec_with_network_options({oauth_timestamp: time.to_i})
+        }.should raise_error(::Libgss::ActionRequest::Error)
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -21,3 +21,15 @@ def new_network(url = "http://localhost:4000", player_id = "1000001")
   }
   Libgss::Network.new(url, opts)
 end
+
+def new_network_with_options(opts={}, url = "http://localhost:4000", player_id = "1000001")
+  config = YAML.load_file(File.expand_path("../../fontana_sample/config/app_garden.yml", __FILE__))
+  opts = {
+    device_type_cd: 1,
+    client_version: "2013073101",
+    consumer_secret: config["consumer_secret"],
+    player_id: player_id,
+    # ssl_disabled: true,
+  }.update(opts)
+  Libgss::Network.new(url, opts)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libgss
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -209,4 +209,3 @@ test_files:
 - spec/protected_assets/Icon.png
 - spec/public_assets/Default.png
 - spec/spec_helper.rb
-has_rdoc: