libgss 0.7.6 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41ec932303909de4bd6ba629106d6090c7c0c301
-  data.tar.gz: 3918ed995b910482bb17d3dcee64b55a0dc97eb5
+  metadata.gz: 003ad5bfa2a5716b99d9f0d4198c07c3a3ff9e82
+  data.tar.gz: 4709750e7b9547e8a0fd707866bf89bf8e2b4a8e
 SHA512:
-  metadata.gz: b0e92ac070c31f742624157721a56016078471ef9463a2158e65bca6c3db7c1574f9b6eb6d33ccdc93d42fd8129a4667964cc3dad77060f3955e447e35ee1e7c
-  data.tar.gz: a73d09d54c21f757ab590d88abbb4096ece741e89f6c48a3c07612acf887f2c648281cba9869fcdb19ad51a30500b1f62f43bbcefbe11f6cd8000a3cc67213f1
+  metadata.gz: 6d5b51d3a75db29e2e3f9f0e3ab86c7487f692d668b02678e5bbadaebaec7c7ea1814d4326975ce24ab9f393197b1ed8f6baa6db8c86895284dbb52cb7cda8ae
+  data.tar.gz: b2db6f7782cd97f9979b0003c8cc17210de7a812cfe6780776275ccbf4bc110c441caa2d2a49e7a19ec6e75c8f627e745a8c8f9a7af69dc0cb853c67faaa7eb6

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.DS_Store
 InstalledFiles
 _yardoc
 coverage

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    libgss (0.7.5)
+    libgss (0.8.0)
       httpclient
       json
       oauth
@@ -21,7 +21,7 @@ GEM
     diff-lcs (1.2.3)
     factory_girl (4.2.0)
       activesupport (>= 3.0.0)
-    fontana_client_support (0.7.2)
+    fontana_client_support (0.8.0)
     httpclient (2.3.4.1)
     i18n (0.6.5)
     json (1.8.0)
@@ -33,7 +33,7 @@ GEM
       origin (~> 1.0)
       tzinfo (~> 0.3.29)
     moped (1.5.1)
-    multi_json (1.7.9)
+    multi_json (1.8.0)
     oauth (0.4.7)
     origin (1.1.0)
     rake (10.0.4)

data/lib/libgss/action_request.rb

@@ -11,6 +11,9 @@ module Libgss
     class Error < StandardError
     end
 
+    class SignatureError < Error
+    end
+
     STATUS_PREPARING = 0
     STATUS_SENDING   = 1
     STATUS_WAITING   = 2
@@ -25,6 +28,8 @@ module Libgss
     attr_reader :action_url, :req_headers
     attr_reader :status, :outputs
 
+    attr_accessor :response_hook
+
     # コンストラクタ
     def initialize(network, action_url, req_headers)
       @network = network
@@ -56,26 +61,104 @@ module Libgss
       res = Libgss.with_retry("action_request") do
         network.httpclient_for_action.post(action_url, {"inputs" => @actions.map(&:to_hash)}.to_json, req_headers)
       end
-      r = process_response(res, :async_request)
+      response_hook.call(res) if response_hook # テストでレスポンスを改ざんを再現するために使います
+      r = process_response(res, :action_request)
       @outputs = Outputs.new(r["outputs"])
       callback.call(@outputs) if callback
       @outputs
     end
 
+    # レスポンスの処理を行います
     def process_response(res, req_type)
       case res.code.to_i
       when 200..299 then # OK
       else
         raise Error, "failed to send #{req_type}: [#{res.code}] #{res.content}"
       end
+      verify_signature(res) do |content|
+        begin
+          JSON.parse(content)
+        rescue JSON::ParserError => e
+          $stderr.puts("\e[31m[#{e.class}] #{e.message}\e[0m\n#{content}")
+          raise e
+        end
+      end
+    end
+    private :process_response
+
+    # シグネチャの検証を行います
+    def verify_signature(res, &block)
+      case network.api_version
+      when "1.0.0" then verify_signature_on_headers(res, &block)
+      when "1.1.0" then verify_signature_included_body(res, &block)
+      else
+        raise Error, "Unsupported API version: #{network.api_version}"
+      end
+    end
+
+    private
+
+    # ヘッダから検証のための諸情報を取得します。
+    # キーの名前がbodyのJSONから取得する場合と微妙に違っているので注意してください。
+    def verify_signature_on_headers(res, &block)
+      content = res.content
+      attrs = {
+        content:      content,
+        consumer_key: res.headers["Res-Sign-Consumer-Key"] || "",
+        nonce:        res.headers["Res-Sign-Nonce"],
+        timestamp:    res.headers["Res-Sign-Timestamp"],
+      }
+      verify_signature_by_oauth(res.headers["Res-Sign-Signature"], attrs, &block)
+    end
+
+    # bodyのJSONから検証のための諸情報を取得します。
+    # キーの名前がヘッダから取得する場合と微妙に違っているので注意してください。
+    def verify_signature_included_body(res, &block)
+      resp = nil
       begin
-        return JSON.parse(res.content)
+        resp = JSON.parse(res.content)
       rescue JSON::ParserError => e
         $stderr.puts("\e[31m[#{e.class}] #{e.message}\e[0m\n#{res.content}")
         raise e
       end
+      content = resp["body"]
+      attrs = {
+        content:      content,
+        consumer_key: resp["res_sign_consumer_key"] || "",
+        nonce:        resp["res_sign_nonce"],
+        timestamp:    resp["res_sign_timestamp"],
+      }
+      verify_signature_by_oauth(resp["res_sign_signature"], attrs, &block)
     end
-    private :process_response
+
+    def verify_signature_by_oauth(signature, attrs)
+      if network.skip_verifying_signature?
+        return yield(attrs[:content]) if block_given?
+      end
+      res_hash = {
+        "uri" => "",
+        "method" => "",
+        "parameters" => {
+          "body" => attrs[:content],
+          "oauth_consumer_key" => attrs[:consumer_key],
+          "oauth_token" => network.auth_token,
+          "oauth_signature_method" => "HMAC-SHA1",
+          "oauth_nonce" => attrs[:nonce],
+          "oauth_timestamp" => attrs[:timestamp]
+        }
+      }
+      s = OAuth::Signature.build(res_hash){ [ network.signature_key, network.consumer_secret] }
+      # puts "res_hash: " << res_hash.inspect
+      # puts "signature_key: " << network.signature_key.inspect
+      # puts "consumer_secret: " << network.consumer_secret.inspect
+      # puts "signature_base_string: " << s.signature_base_string
+      unless signature == s.signature
+        raise SignatureError, "invalid signature or something"
+      end
+      return yield(attrs[:content]) if block_given?
+    end
+
+    public
 
     # 条件に該当するデータを取得
     # @param [String] name 対象となるコレクション名
@@ -88,6 +171,7 @@ module Libgss
       args[:order] = order if order
       add_action(args)
     end
+    alias_method :all, :find_all
 
     # ページネーション付きで条件に該当するデータを取得
     # @param [String] name 対象となるコレクション名
@@ -124,6 +208,7 @@ module Libgss
       args[:order] = order if order
       add_action(args)
     end
+    alias_method :first, :find_first
 
     # 辞書テーブルからinputに対応するoutputの値を返します。
     # @param [String] name 対象となる辞書のコレクション名
@@ -135,6 +220,7 @@ module Libgss
       args[:conditions] = conditions if conditions
       add_action(args)
     end
+    alias_method :get_dictionary, :get_by_dictionary
 
     # 期間テーブルからinputに対応するoutputの値を返します。
     # @param [String] name 対象となる機関テーブルのコレクション名
@@ -146,6 +232,7 @@ module Libgss
       args[:conditions] = conditions if conditions
       add_action(args)
     end
+    alias_method :get_schedule, :get_by_schedule
 
     # 整数範囲テーブルからinputに対応するoutputの値を返します。
     # @param [String] name 対象となる整数範囲テーブルのコレクション名
@@ -157,6 +244,7 @@ module Libgss
       args[:conditions] = conditions if conditions
       add_action(args)
     end
+    alias_method :get_int_range, :get_by_int_range
 
     # 確率テーブルからinputに対応するoutputの値を返します。
     # diceがあるのであまり使われないはず。
@@ -170,6 +258,7 @@ module Libgss
       args[:conditions] = conditions if conditions
       add_action(args)
     end
+    alias_method :get_probability, :get_by_probability
 
     # プレイヤーからplayer_idに対応するプレイヤーを返します
     #
@@ -183,6 +272,7 @@ module Libgss
       args[:player_id] = player_id.to_s if player_id
       add_action(args)
     end
+    alias_method :get_player, :get_by_player
 
     # ゲームデータからplayer_idに対応するゲームデータを返します
     #
@@ -196,6 +286,7 @@ module Libgss
       args[:player_id] = player_id.to_s if player_id
       add_action(args)
     end
+    alias_method :get_game_data, :get_by_game_data
 
 
 

data/lib/libgss/async_action_request.rb

@@ -22,10 +22,11 @@ module Libgss
     # アクション群を実行するために実際にHTTPリクエストを送信します。
     def send_request
       res = network.httpclient_for_action.post(action_url, {"inputs" => @actions.map(&:to_hash)}.to_json, req_headers)
-      r = process_response(res, :async_request)
-      outputs = Outputs.new(r["outputs"])
-      @ids = outputs.map{|output| output['id'] }
-      outputs
+      response_hook.call(res) if response_hook # テストでレスポンスを改ざんを再現するために使います
+      r = process_response(res, :async_action_request)
+      @outputs = Outputs.new(r["outputs"])
+      @ids = @outputs.map{|output| output['id'] }
+      @outputs
     end
 
     def async_status(ids=nil)
@@ -34,8 +35,9 @@ module Libgss
       raise Error, "failed to get response. please exec send_request before call." unless ids
 
       res = network.httpclient_for_action.post(result_url, {'input_ids' => ids}.to_json, req_headers)
-      r = process_response(res, :aync_results)
-      Outputs.new(r["outputs"])
+      response_hook.call(res) if response_hook # テストでレスポンスを改ざんを再現するために使います
+      r = process_response(res, :aync_results_request)
+      @outputs = Outputs.new(r["outputs"]) # Outputsを使うことでidによるアクセスを可能に
     end
     alias :async_results :async_status
   end

data/lib/libgss/network.rb

@@ -15,8 +15,6 @@ module Libgss
     class Error < StandardError
     end
 
-    API_VERSION = "1.0.0".freeze
-
     attr_reader :base_url
     attr_reader :ssl_base_url
     attr_reader :ssl_disabled
@@ -39,6 +37,8 @@ module Libgss
     attr_accessor :client_version
     attr_accessor :device_type_cd
 
+    attr_accessor :skip_verifying_signature
+
     PRODUCTION_HTTP_PORT  =  80
     PRODUCTION_HTTPS_PORT = 443
 
@@ -50,13 +50,15 @@ module Libgss
     # @param [String] base_url_or_host 接続先の基準となるURLあるいはホスト名
     # @param [Hash] options オプション
     # @option options [String]  :platform 接続先のGSSサーバの認証のプラットフォーム。デフォルトは"fontana"。
+    # @option options [String]  :api_version APIのバージョン。デフォルトは "1.0.0"
     # @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 [Boolean] :ignore_signature_key シグネチャキーによる署名を無視するかどうか
+    # @option options [Boolean] :skip_verifying_signature レスポンスのシグネチャキーによる署名の検証をスキップするかどうか
     # @option options [Integer] :device_type_cd GSS/fontanaに登録されたデバイス種別
     # @option options [String]  :client_version GSS/fontanaに登録されたクライアントリリースのバージョン
     def initialize(base_url_or_host, options = {})
@@ -72,6 +74,7 @@ module Libgss
       end
       @ssl_base_url = @base_url if @ssl_disabled
       @platform  = options[:platform] || "fontana"
+      @api_version = options[:api_version] || "1.0.0"
       @player_id = options[:player_id]
       @player_info = options[:player_info] || {}
 
@@ -84,6 +87,8 @@ module Libgss
       @device_type_cd = options[:device_type_cd]
       @client_version = options[:client_version]
 
+      @skip_verifying_signature = options[:skip_verifying_signature]
+
       @httpclient = HTTPClient.new
       @httpclient.ssl_config.verify_mode = nil # 自己署名の証明書をOKにする
     end
@@ -130,6 +135,11 @@ module Libgss
       @ignore_signature_key
     end
 
+    # @return [Boolean] コンストラクタに指定されたskip_verifying_signatureを返します
+    def skip_verifying_signature?
+      @skip_verifying_signature
+    end
+
     # load_player_id メソッドをオーバーライドした場合に使用することを想定しています。
     # それ以外の場合は使用しないでください。
     def setup
@@ -204,7 +214,6 @@ module Libgss
         HttpClientWithSignatureKey.new(@httpclient, self)
     end
 
-
     private
 
     def req_headers
@@ -258,15 +267,15 @@ module Libgss
     end
 
     def action_url
-      @action_url ||= base_url + "/api/#{API_VERSION}/actions.json?auth_token=#{auth_token}"
+      @action_url ||= base_url + "/api/#{api_version}/actions.json?auth_token=#{auth_token}"
     end
 
     def async_action_url
-      @async_action_url ||= base_url + "/api/#{API_VERSION}/async_actions.json?auth_token=#{auth_token}"
+      @async_action_url ||= base_url + "/api/#{api_version}/async_actions.json?auth_token=#{auth_token}"
     end
 
     def async_result_url
-      @async_result_url ||= base_url + "/api/#{API_VERSION}/async_results.json?auth_token=#{auth_token}"
+      @async_result_url ||= base_url + "/api/#{api_version}/async_results.json?auth_token=#{auth_token}"
     end
 
     def public_asset_url(asset_path)
@@ -275,7 +284,7 @@ module Libgss
 
     def protected_asset_url(asset_path)
       path = URI.encode(asset_path) # パラメータとして渡されるのでURLエンコードする必要がある
-      @action_url ||= base_url + "/api/#{API_VERSION}/assets?path=#{path}&auth_token=#{auth_token}"
+      @action_url ||= base_url + "/api/#{api_version}/assets?path=#{path}&auth_token=#{auth_token}"
     end
   end
 

data/lib/libgss/version.rb

@@ -1,3 +1,3 @@
 module Libgss
-  VERSION = "0.7.6"
+  VERSION = "0.8.0"
 end

data/spec/factories/async_action.rb

@@ -14,10 +14,10 @@ FactoryGirl.define do
 
   factory :async_action02, class: AsyncAction do
     player
-    action_id   "2"
+    action_id   2
     request_url "http://localhost:3000/api/1.0.0/async_actions.json?auth_token=CzyWmCg3vjpxeYuHL8dr"
     request({"id"=>2, "action"=>"server_time"})
-    response({"result"=>1379990870, "id"=>"2"})
+    response({"result"=>1379990870, "id"=>2})
     attempts 0
   end
 

data/spec/libgss/actions/dictionary_spec.rb

@@ -11,25 +11,28 @@ describe Libgss::ActionRequest do
   end
 
 
-  describe "#get_by_dictionary" do
-    shared_examples_for "Libgss::ActionRequest#get_by_dictionary" do |input, output, conditions|
-      it do
-        callback_called = false
-        request.get_by_dictionary("ArmorUpgrade1", input, conditions)
-        request.send_request do |outputs|
-          callback_called = true
-          outputs.length.should == 1
-          outputs.first["result"].should == output
+  shared_examples_for "Libgss::ActionRequest#get_by_dictionary" do |input, output, conditions|
+    [:get_dictionary, :get_by_dictionary].each do |action|
+      describe "##{action}" do
+        it do
+          callback_called = false
+          request.send(action, "ArmorUpgrade1", input, conditions)
+          request.send_request do |outputs|
+            callback_called = true
+            outputs.length.should == 1
+            outputs.first["result"].should == output
+          end
+          callback_called.should == true
         end
-        callback_called.should == true
       end
     end
 
-    it_should_behave_like "Libgss::ActionRequest#get_by_dictionary", 10001, 10002, nil
-    it_should_behave_like "Libgss::ActionRequest#get_by_dictionary", 10002, 10004, nil
-
-    it_should_behave_like "Libgss::ActionRequest#get_by_dictionary", 10001, nil, {"input$gt" => 10003}
-    it_should_behave_like "Libgss::ActionRequest#get_by_dictionary", 10002, nil, {"input$gt" => 10003}
   end
 
+  it_should_behave_like "Libgss::ActionRequest#get_by_dictionary", 10001, 10002, nil
+  it_should_behave_like "Libgss::ActionRequest#get_by_dictionary", 10002, 10004, nil
+
+  it_should_behave_like "Libgss::ActionRequest#get_by_dictionary", 10001, nil, {"input$gt" => 10003}
+  it_should_behave_like "Libgss::ActionRequest#get_by_dictionary", 10002, nil, {"input$gt" => 10003}
+
 end

data/spec/libgss/actions/game_data_spec.rb

@@ -33,25 +33,26 @@ describe Libgss::ActionRequest do
     "read_notifications"=>[]
   }
 
-  describe "#get_by_game_data" do
-    before do
-      request_fixture_load("01_basic")
-    end
+  [:get_game_data, :get_by_game_data].each do |action|
+    describe "##{action}" do
+      before do
+        request_fixture_load("01_basic")
+      end
 
-    it "basic call" do
-      callback_called = false
-      request.get_by_game_data
-      request.send_request do |outputs|
-        callback_called = true
-        outputs.length.should == 1
-        game_data = outputs.first["result"]
-        # AppSeedで定義されているデータの確認
-        # game_data.select!{|k,v| expected_game_data_1000001.keys.include?(k) }
-        game_data.should == expected_game_data_1000001
+      it action do
+        callback_called = false
+        request.send(action)
+        request.send_request do |outputs|
+          callback_called = true
+          outputs.length.should == 1
+          game_data = outputs.first["result"]
+          # AppSeedで定義されているデータの確認
+          # game_data.select!{|k,v| expected_game_data_1000001.keys.include?(k) }
+          game_data.should == expected_game_data_1000001
+        end
+        callback_called.should == true
       end
-      callback_called.should == true
     end
-
   end
 
   describe "#update" do

data/spec/libgss/actions/int_range_spec.rb

@@ -11,32 +11,35 @@ describe Libgss::ActionRequest do
   end
 
 
-  describe "#get_by_int_range" do
-    shared_examples_for "Libgss::ActionRequest#get_by_int_range" do |input, output, conditions|
-      it do
-        callback_called = false
-        request.get_by_int_range("RequiredExperience", input, conditions)
-        request.send_request do |outputs|
-          callback_called = true
-          outputs.length.should == 1
-          outputs.first["result"].should == output
+  shared_examples_for "Libgss::ActionRequest#get_by_int_range" do |input, output, conditions|
+    [:get_int_range, :get_by_int_range].each do |action|
+      describe "##{action}" do
+        it action do
+          callback_called = false
+          request.send(action, "RequiredExperience", input, conditions)
+          request.send_request do |outputs|
+            callback_called = true
+            outputs.length.should == 1
+            outputs.first["result"].should == output
+          end
+          callback_called.should == true
         end
-        callback_called.should == true
       end
     end
 
-    it_should_behave_like "Libgss::ActionRequest#get_by_int_range",   0,  1, nil
-    it_should_behave_like "Libgss::ActionRequest#get_by_int_range",   9,  1, nil
-    it_should_behave_like "Libgss::ActionRequest#get_by_int_range",  10,  2, nil
-    it_should_behave_like "Libgss::ActionRequest#get_by_int_range",  24,  2, nil
-    it_should_behave_like "Libgss::ActionRequest#get_by_int_range",  25,  3, nil
-
-    cond = {"value$gte" => 10 }
-    it_should_behave_like "Libgss::ActionRequest#get_by_int_range",   0, nil, cond
-    it_should_behave_like "Libgss::ActionRequest#get_by_int_range",   9, nil, cond
-    it_should_behave_like "Libgss::ActionRequest#get_by_int_range",  10, nil, cond
-    it_should_behave_like "Libgss::ActionRequest#get_by_int_range",  24, nil, cond
-    it_should_behave_like "Libgss::ActionRequest#get_by_int_range",  25, nil, cond
   end
 
+  it_should_behave_like "Libgss::ActionRequest#get_by_int_range",   0,  1, nil
+  it_should_behave_like "Libgss::ActionRequest#get_by_int_range",   9,  1, nil
+  it_should_behave_like "Libgss::ActionRequest#get_by_int_range",  10,  2, nil
+  it_should_behave_like "Libgss::ActionRequest#get_by_int_range",  24,  2, nil
+  it_should_behave_like "Libgss::ActionRequest#get_by_int_range",  25,  3, nil
+
+  cond = {"value$gte" => 10 }
+  it_should_behave_like "Libgss::ActionRequest#get_by_int_range",   0, nil, cond
+  it_should_behave_like "Libgss::ActionRequest#get_by_int_range",   9, nil, cond
+  it_should_behave_like "Libgss::ActionRequest#get_by_int_range",  10, nil, cond
+  it_should_behave_like "Libgss::ActionRequest#get_by_int_range",  24, nil, cond
+  it_should_behave_like "Libgss::ActionRequest#get_by_int_range",  25, nil, cond
+
 end

data/spec/libgss/actions/master_spec.rb

@@ -10,50 +10,52 @@ describe Libgss::ActionRequest do
     network.new_action_request
   end
 
-  describe "#find_all" do
-    it "basic call" do
-      callback_called = false
-      request.find_all("Item")
-      request.send_request do |outputs|
-        callback_called = true
-        outputs.length.should == 1
-        items = outputs.first["result"]
-        items.length.should == 12
-        items.each do |item|
-          item["item_cd"].should_not == nil
-          item["name"].should_not == nil
+  [:all, :find_all].each do |action|
+    describe "##{action}" do
+      it "basic call" do
+        callback_called = false
+        request.send(action, "Item")
+        request.send_request do |outputs|
+          callback_called = true
+          outputs.length.should == 1
+          items = outputs.first["result"]
+          items.length.should == 12
+          items.each do |item|
+            item["item_cd"].should_not == nil
+            item["name"].should_not == nil
+          end
         end
+        callback_called.should == true
       end
-      callback_called.should == true
-    end
 
-    it "with conditions" do
-      callback_called = false
-      request.find_all("Item", {"item_cd$gte" => 20005, "item_cd$lte" => 20008})
-      request.send_request do |outputs|
-        callback_called = true
-        outputs.length.should == 1
-        items = outputs.first["result"]
-        items.length.should == 4
-        items.each do |item|
-          item["item_cd"].should_not == nil
-          item["name"].should_not == nil
+      it "with conditions" do
+        callback_called = false
+        request.send(action, "Item", {"item_cd$gte" => 20005, "item_cd$lte" => 20008})
+        request.send_request do |outputs|
+          callback_called = true
+          outputs.length.should == 1
+          items = outputs.first["result"]
+          items.length.should == 4
+          items.each do |item|
+            item["item_cd"].should_not == nil
+            item["name"].should_not == nil
+          end
         end
+        callback_called.should == true
       end
-      callback_called.should == true
-    end
 
-    it "with order and conditions" do
-      callback_called = false
-      request.find_all("Item", {"item_cd$gte" => 20005, "item_cd$lte" => 20008}, [["item_cd", "desc"]])
-      request.send_request do |outputs|
-        callback_called = true
-        outputs.length.should == 1
-        items = outputs.first["result"]
-        items.length.should == 4
-        items.map{|item| item["item_cd"]}.should == [20008, 20007, 20006, 20005]
+      it "with order and conditions" do
+        callback_called = false
+        request.send(action, "Item", {"item_cd$gte" => 20005, "item_cd$lte" => 20008}, [["item_cd", "desc"]])
+        request.send_request do |outputs|
+          callback_called = true
+          outputs.length.should == 1
+          items = outputs.first["result"]
+          items.length.should == 4
+          items.map{|item| item["item_cd"]}.should == [20008, 20007, 20006, 20005]
+        end
+        callback_called.should == true
       end
-      callback_called.should == true
     end
   end
 
@@ -96,41 +98,43 @@ describe Libgss::ActionRequest do
     end
   end
 
-  describe "#find_first" do
-    it "basic call" do
-      callback_called = false
-      request.find_first("Item")
-      request.send_request do |outputs|
-        callback_called = true
-        outputs.length.should == 1
-        item = outputs.first["result"]
-        item["item_cd"].should == 20001
+  [:first, :find_first].each do |action|
+    describe "##{action}" do
+      it "basic call" do
+        callback_called = false
+        request.send(action, "Item")
+        request.send_request do |outputs|
+          callback_called = true
+          outputs.length.should == 1
+          item = outputs.first["result"]
+          item["item_cd"].should == 20001
+        end
+        callback_called.should == true
       end
-      callback_called.should == true
-    end
 
-    it "with conditions" do
-      callback_called = false
-      request.find_first("Item", {"item_cd$gte" => 20005, "item_cd$lte" => 20008})
-      request.send_request do |outputs|
-        callback_called = true
-        outputs.length.should == 1
-        item = outputs.first["result"]
-        item["item_cd"].should == 20005
+      it "with conditions" do
+        callback_called = false
+        request.send(action, "Item", {"item_cd$gte" => 20005, "item_cd$lte" => 20008})
+        request.send_request do |outputs|
+          callback_called = true
+          outputs.length.should == 1
+          item = outputs.first["result"]
+          item["item_cd"].should == 20005
+        end
+        callback_called.should == true
       end
-      callback_called.should == true
-    end
 
-    it "with order and conditions" do
-      callback_called = false
-      request.find_first("Item", {"item_cd$gte" => 20005, "item_cd$lte" => 20008}, [["item_cd", "desc"]])
-      request.send_request do |outputs|
-        callback_called = true
-        outputs.length.should == 1
-        item = outputs.first["result"]
-        item["item_cd"].should == 20008
+      it "with order and conditions" do
+        callback_called = false
+        request.send(action, "Item", {"item_cd$gte" => 20005, "item_cd$lte" => 20008}, [["item_cd", "desc"]])
+        request.send_request do |outputs|
+          callback_called = true
+          outputs.length.should == 1
+          item = outputs.first["result"]
+          item["item_cd"].should == 20008
+        end
+        callback_called.should == true
       end
-      callback_called.should == true
     end
   end
 

data/spec/libgss/actions/probability_spec.rb

@@ -10,33 +10,36 @@ describe Libgss::ActionRequest do
     network.new_action_request
   end
 
-  describe "#get_by_probability" do
 
-    shared_examples_for "Libgss::ActionRequest#get_by_probability" do |value, conditions, result|
-      it "#{value.inspect} with #{conditions.inspect} returns #{result.inspect}" do
-        callback_called = false
-        request.get_by_probability("Composition1", value, conditions)
-        request.send_request do |outputs|
-          callback_called = true
-          outputs.length.should == 1
-          obj = outputs.first["result"]
-          # AppSeedで定義されているデータの確認
-          obj.should == result
+  shared_examples_for "Libgss::ActionRequest#get_by_probability" do |value, conditions, result|
+    [:get_probability, :get_by_probability].each do |action|
+      describe "##{action}" do
+        it "#{value.inspect} with #{conditions.inspect} returns #{result.inspect}" do
+          callback_called = false
+          request.send(action, "Composition1", value, conditions)
+          request.send_request do |outputs|
+            callback_called = true
+            outputs.length.should == 1
+            obj = outputs.first["result"]
+            # AppSeedで定義されているデータの確認
+            obj.should == result
+          end
+          callback_called.should == true
         end
-        callback_called.should == true
       end
     end
 
-    it_should_behave_like "Libgss::ActionRequest#get_by_probability", 10002, nil, 60
-    it_should_behave_like "Libgss::ActionRequest#get_by_probability", 20007, nil, 20
+  end
 
-    context "with conditions" do
-      it_should_behave_like "Libgss::ActionRequest#get_by_probability", 20007, {"element" => { "20002" => 1, "20006" => 1 } }, 20
-      it_should_behave_like "Libgss::ActionRequest#get_by_probability", 20007, {"element" => { "20002" => 1, "20006" => 2 } }, nil
+  it_should_behave_like "Libgss::ActionRequest#get_by_probability", 10002, nil, 60
+  it_should_behave_like "Libgss::ActionRequest#get_by_probability", 20007, nil, 20
 
-      it_should_behave_like "Libgss::ActionRequest#get_by_probability", {"20002" => 2}, {"element" => { "20002" => 1, "20006" => 1 } }, 80
-      it_should_behave_like "Libgss::ActionRequest#get_by_probability", {"20002" => 2}, {"element" => { "20002" => 1, "20006" => 2 } }, nil
-    end
+  context "with conditions" do
+    it_should_behave_like "Libgss::ActionRequest#get_by_probability", 20007, {"element" => { "20002" => 1, "20006" => 1 } }, 20
+    it_should_behave_like "Libgss::ActionRequest#get_by_probability", 20007, {"element" => { "20002" => 1, "20006" => 2 } }, nil
+
+    it_should_behave_like "Libgss::ActionRequest#get_by_probability", {"20002" => 2}, {"element" => { "20002" => 1, "20006" => 1 } }, 80
+    it_should_behave_like "Libgss::ActionRequest#get_by_probability", {"20002" => 2}, {"element" => { "20002" => 1, "20006" => 2 } }, nil
   end
 
   describe "#dice" do

data/spec/libgss/actions/schedule_spec.rb

@@ -11,35 +11,38 @@ describe Libgss::ActionRequest do
   end
 
 
-  describe "#get_by_schedule" do
-    shared_examples_for "Libgss::ActionRequest#get_by_schedule" do |input, output, conditions|
-      it do
-        callback_called = false
-        request.get_by_schedule("ShopSchedule", input, conditions)
-        request.send_request do |outputs|
-          callback_called = true
-          outputs.length.should == 1
-          outputs.first["result"].should == output
+  shared_examples_for "Libgss::ActionRequest#get_by_schedule" do |input, output, conditions|
+    [:get_schedule, :get_by_schedule].each do |action|
+      describe "##{action}" do
+        it action do
+          callback_called = false
+          request.send(action, "ShopSchedule", input, conditions)
+          request.send_request do |outputs|
+            callback_called = true
+            outputs.length.should == 1
+            outputs.first["result"].should == output
+          end
+          callback_called.should == true
         end
-        callback_called.should == true
       end
     end
 
-    it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/09 00:00:00+09:00").to_i, "ShopMenu1", nil
-    it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/10 11:59:59+09:00").to_i, "ShopMenu1", nil
-    it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/10 12:00:00+09:00").to_i, "ShopMenu2", nil
-    it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/15 12:00:00+09:00").to_i, "ShopMenu2", nil
-    it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/20 12:59:59+09:00").to_i, "ShopMenu2", nil
-    it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/20 13:00:00+09:00").to_i, "ShopMenu2", nil # 整数範囲テーブルと違って末尾にも含まれる
-    it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/20 13:00:01+09:00").to_i, "ShopMenu1", nil
-
-    cond = {"value$ne" => "ShopMenu2" }
-    it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/09 00:00:00+09:00").to_i, "ShopMenu1", cond
-    it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/10 11:59:59+09:00").to_i, "ShopMenu1", cond
-    it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/10 12:00:00+09:00").to_i, "ShopMenu1", cond
-    it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/15 12:00:00+09:00").to_i, "ShopMenu1", cond
-    it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/20 12:59:59+09:00").to_i, "ShopMenu1", cond
-    it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/20 13:00:00+09:00").to_i, "ShopMenu1", cond
   end
 
+  it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/09 00:00:00+09:00").to_i, "ShopMenu1", nil
+  it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/10 11:59:59+09:00").to_i, "ShopMenu1", nil
+  it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/10 12:00:00+09:00").to_i, "ShopMenu2", nil
+  it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/15 12:00:00+09:00").to_i, "ShopMenu2", nil
+  it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/20 12:59:59+09:00").to_i, "ShopMenu2", nil
+  it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/20 13:00:00+09:00").to_i, "ShopMenu2", nil # 整数範囲テーブルと違って末尾にも含まれる
+  it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/20 13:00:01+09:00").to_i, "ShopMenu1", nil
+
+  cond = {"value$ne" => "ShopMenu2" }
+  it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/09 00:00:00+09:00").to_i, "ShopMenu1", cond
+  it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/10 11:59:59+09:00").to_i, "ShopMenu1", cond
+  it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/10 12:00:00+09:00").to_i, "ShopMenu1", cond
+  it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/15 12:00:00+09:00").to_i, "ShopMenu1", cond
+  it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/20 12:59:59+09:00").to_i, "ShopMenu1", cond
+  it_should_behave_like "Libgss::ActionRequest#get_by_schedule", Time.parse("2012/07/20 13:00:00+09:00").to_i, "ShopMenu1", cond
+
 end

data/spec/libgss/async_action_request_spec.rb

@@ -72,6 +72,7 @@ describe Libgss::AsyncActionRequest do
   describe "async_status(POST: async_results.json)" do
 
     context "working async_action" do
+
       before do
         Player.delete_all
         AsyncAction.delete_all
@@ -97,7 +98,7 @@ describe Libgss::AsyncActionRequest do
 
       it do
         r = network.new_async_action_request
-        r.async_status(['2']).to_a.should == [{"id" => '2', "result" => 1379990870}]
+        r.async_status([2]).to_a.should == [{"id" => 2, "result" => 1379990870}]
       end
     end
 

data/spec/libgss/response_signatrue_spec.rb

@@ -0,0 +1,201 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+require 'active_support/core_ext/numeric/time'
+
+describe "response_signature" do
+  before do
+    request_fixture_load("01_basic")
+  end
+  shared_examples_for "action_request with response_signature" do |api_version|
+    before do
+      # 通信経路上で実際の時刻より過去の時刻を返すようにレスポンスを改ざんしていることを
+      # 想定して、レスポンスオブジェクトのcontentだけ内容を書き換えます。
+      @cheat = Proc.new do |res|
+        @cheated = res.content.dup
+        @cheated.sub!(/"result":(\d+)/){ "\"result\":%d" % ($1.to_i - 30.days) }
+        @cheated.sub!(/\\"result\\":(\d+)/){ "\\\"result\\\":%d" % ($1.to_i - 30.days) }
+        res.stub(:content).and_return(@cheated)
+      end
+    end
+
+    context "valid" do
+      it do
+        req = @network.new_action_request
+        req.server_time
+        req.send_request
+      end
+    end
+
+    context "invalid response body" do
+      it "raise SignatureError" do
+        req = @network.new_action_request
+        req.server_time
+        req.response_hook = @cheat
+        expect{ req.send_request }.to raise_error(Libgss::ActionRequest::SignatureError)
+      end
+
+      it "with skip_verifying_signature" do
+        @network.skip_verifying_signature = true
+        req = @network.new_action_request
+        req.server_time
+        req.response_hook = @cheat
+        expect{ req.send_request }.to_not raise_error(Libgss::ActionRequest::SignatureError)
+        # 検証をスキップしているので、通信経路上で改ざんされたデータを取得できてしまう
+        req.outputs.to_a.should be_a(Array)
+        req.outputs.first.should be_a(Hash)
+        req.outputs.first["id"].should == 1
+        req.outputs.first["result"].should be_a(Integer)
+      end
+    end
+  end
+
+  describe "action_request" do
+    context "default" do
+      before{ @network = new_network.login! }
+      it_should_behave_like "action_request with response_signature"
+    end
+
+    context "1.0.0" do
+      before{ @network = new_network_with_options(api_version: "1.0.0").login! }
+      it_should_behave_like "action_request with response_signature"
+    end
+
+    context "1.1.0" do
+      before{ @network = new_network_with_options(api_version: "1.1.0").login! }
+      it_should_behave_like "action_request with response_signature"
+    end
+  end
+
+
+  shared_examples_for "async_action_request with response_signature" do
+    context "valid" do
+      it do
+        req = @network.new_async_action_request
+        req.server_time
+        req.send_request
+      end
+    end
+
+    context "invalid response body" do
+      before do
+        # 通信経路上で実際の時刻より過去の時刻を返すようにレスポンスを改ざんしていることを
+        # 想定して、レスポンスオブジェクトのcontentだけ内容を書き換えます。
+        @cheat = Proc.new do |res|
+          @cheated = res.content.dup
+          @cheated.sub!(/"status":"executing"/){ "\"result\":%d" % (Time.now.to_i - 30.days) }
+          @cheated.sub!(/\\"status\\":\\"executing\\"/){ "\\\"result\\\":%d" % (Time.now.to_i - 30.days) }
+          res.stub(:content).and_return(@cheated)
+        end
+      end
+
+      it "raise SignatureError" do
+        req = @network.new_async_action_request
+        req.server_time
+        req.response_hook = @cheat
+        expect{ req.send_request }.to raise_error(Libgss::ActionRequest::SignatureError)
+      end
+
+      it "with skip_verifying_signature" do
+        @network.skip_verifying_signature = true
+        req = @network.new_async_action_request
+        req.server_time
+        req.response_hook = @cheat
+        expect{ req.send_request }.to_not raise_error(Libgss::ActionRequest::SignatureError)
+        # 検証をスキップしているので、通信経路上で改ざんされたデータを取得できてしまう
+        # ここでは「実行中」であるはずの結果が、改ざんされたものになってしまう
+        req.outputs.to_a.should be_a(Array)
+        req.outputs.first.should be_a(Hash)
+        req.outputs.first["id"].should == 1
+        req.outputs.first["result"].should be_a(Integer)
+      end
+    end
+  end
+
+  describe "async_action_request" do
+    context "default" do
+      before{ @network = new_network.login! }
+      it_should_behave_like "async_action_request with response_signature"
+    end
+
+    context "1.0.0" do
+      before{ @network = new_network_with_options(api_version: "1.0.0").login! }
+      it_should_behave_like "async_action_request with response_signature"
+    end
+
+    context "1.1.0" do
+      before{ @network = new_network_with_options(api_version: "1.1.0").login! }
+      it_should_behave_like "async_action_request with response_signature"
+    end
+  end
+
+
+
+
+  shared_examples_for "async_status_request with response_signature" do
+    context "valid" do
+      it do
+        req = @network.new_async_action_request
+        req.server_time
+        req.send_request
+      end
+    end
+
+    context "invalid response body" do
+      before do
+        # 通信経路上で実際の時刻より過去の時刻を返すようにレスポンスを改ざんしていることを
+        # 想定して、レスポンスオブジェクトのcontentだけ内容を書き換えます。
+        @cheat = Proc.new do |res|
+          cheated = res.content.dup
+          cheated.sub!(/"result":(\d+)/){ "\"result\":%d" % ($1.to_i - 30.days) }
+          cheated.sub!(/\\"result\\":(\d+)/){ "\\\"result\\\":%d" % ($1.to_i - 30.days) }
+          res.stub(:content).and_return(cheated)
+        end
+      end
+
+      it "raise SignatureError" do
+        req = @network.new_async_action_request
+        req.server_time
+        req.response_hook = @cheat
+        expect{ req.async_status([@async_action02.action_id]) }.to raise_error(Libgss::ActionRequest::SignatureError)
+      end
+
+      it "with skip_verifying_signature" do
+        @network.skip_verifying_signature = true
+        req = @network.new_async_action_request
+        req.server_time
+        req.response_hook = @cheat
+        expect{ req.async_status([@async_action02.action_id]) }.to_not raise_error(Libgss::ActionRequest::SignatureError)
+        # 検証をスキップしているので、通信経路上で改ざんされたデータを取得できてしまう
+        req.outputs.to_a.should be_a(Array)
+        req.outputs.first.should be_a(Hash)
+        req.outputs.first["id"].should == @async_action02.action_id
+        req.outputs.first["result"].should be_a(Integer)
+      end
+    end
+  end
+
+  describe "async_status_request" do
+    before do
+      Player.delete_all
+      AsyncAction.delete_all
+      @async_action02 = FactoryGirl.create(:async_action02)
+      @player01 = @async_action02.player
+    end
+
+    context "default" do
+      before{ @network = new_network(@player01.player_id).login! }
+      it_should_behave_like "async_status_request with response_signature"
+    end
+
+    context "1.0.0" do
+      before{ @network = new_network_with_options({api_version: "1.0.0"}, @player01.player_id).login! }
+      it_should_behave_like "async_status_request with response_signature"
+    end
+
+    context "1.1.0" do
+      before{ @network = new_network_with_options({api_version: "1.1.0"}, @player01.player_id).login! }
+      it_should_behave_like "async_status_request with response_signature"
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -4,8 +4,8 @@ require 'libgss'
 require 'tengine/support/yaml_with_erb'
 
 require 'fontana_client_support'
-require 'mongoid'
 
+require 'mongoid'
 
 Mongoid.logger.level = 0
 log_path = File.expand_path("../../tmp/test.log", __FILE__)
@@ -21,6 +21,8 @@ require 'active_support/dependencies'
 
 Time.zone = ActiveSupport::TimeZone.zones_map["Tokyo"]
 
+# require File.expand_path("../../fontana_sample/spec/spec_helper", __FILE__)
+
 d = File.expand_path("../support/models", __FILE__)
 "Directory not found: #{d.inspect}" unless Dir.exist?(d)
 ActiveSupport::Dependencies.autoload_paths << d
@@ -32,6 +34,7 @@ require 'factory_girl'
 FactoryGirl.find_definitions
 
 RSpec.configure do |config|
+
   # iOS開発環境が整っていない場合、SSLで接続する https://sandbox.itunes.apple.com/verifyreceipt が
   # オレオレ証明書を使っているので、その検証をができなくてエラーになってしまいます。
   # 本来ならば、信頼する証明書として追加する方が良いと思われますが、
@@ -40,5 +43,6 @@ RSpec.configure do |config|
   # ように設定してしまいます。
   require 'openssl'
   OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
+
   config.include FactoryGirl::Syntax::Methods
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libgss
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.8.0
 platform: ruby
 authors:
 - akima
@@ -196,7 +196,7 @@ files:
 - libgss.gemspec
 - spec/factories/async_action.rb
 - spec/factories/client_release.rb
-- spec/factories/device_type.rb
+- spec/factories/client_release/device_type.rb
 - spec/factories/game_data.rb
 - spec/factories/player.rb
 - spec/libgss/action_request_spec.rb
@@ -212,6 +212,7 @@ files:
 - spec/libgss/asset_request_spec.rb
 - spec/libgss/async_action_request_spec.rb
 - spec/libgss/network_spec.rb
+- spec/libgss/response_signatrue_spec.rb
 - spec/protected_assets/Icon.png
 - spec/public_assets/Default.png
 - spec/spec_helper.rb
@@ -249,7 +250,7 @@ summary: network library for Groovenauts GSS
 test_files:
 - spec/factories/async_action.rb
 - spec/factories/client_release.rb
-- spec/factories/device_type.rb
+- spec/factories/client_release/device_type.rb
 - spec/factories/game_data.rb
 - spec/factories/player.rb
 - spec/libgss/action_request_spec.rb
@@ -265,6 +266,7 @@ test_files:
 - spec/libgss/asset_request_spec.rb
 - spec/libgss/async_action_request_spec.rb
 - spec/libgss/network_spec.rb
+- spec/libgss/response_signatrue_spec.rb
 - spec/protected_assets/Icon.png
 - spec/public_assets/Default.png
 - spec/spec_helper.rb