jpmobile 0.0.4 → 0.0.6

data/lib/jpmobile/{hook_abstract_request.rb → hook_request.rb}

@@ -1,5 +1,5 @@
 require 'jpmobile/request_with_mobile'
 
-class ActionController::AbstractRequest
+class ActionController::Request
   include Jpmobile::RequestWithMobile
 end

data/lib/jpmobile/mobile/au.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # =au携帯電話
 
 require 'ipaddr'
@@ -78,12 +79,12 @@ module Jpmobile::Mobile
         nil
       end
     end
-    
+
     # 簡易位置情報取得に対応している場合は +true+ を返す。
     def supports_location?
       ! LOCATION_UNSUPPORTED_DEVICE_ID.include?(device_id)
     end
-    
+
     # GPS位置情報取得に対応している場合は +true+ を返す。
     def supports_gps?
       ! GPS_UNSUPPORTED_DEVICE_ID.include?(device_id)
@@ -91,7 +92,12 @@ module Jpmobile::Mobile
 
     # cookieに対応しているか？
     def supports_cookie?
-      true
+      protocol = @request.respond_to?(:scheme) ? @request.scheme : @request.protocol rescue "none"
+      if protocol =~ /\Ahttps/
+        false
+      else
+        true
+      end
     end
   end
 end

data/lib/jpmobile/mobile/z_display_info_docomo.rb

@@ -128,12 +128,12 @@ Jpmobile::Mobile::Docomo::DISPLAY_INFO =
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>240},
  "SO903iTV"=>
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>368},
+ "SH903iTV"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>320},
  "KO209i"=>
   {:color_p=>true, :colors=>256, :browser_width=>96, :browser_height=>96},
  "F903iX"=>
   {:color_p=>true, :colors=>262144, :browser_width=>230, :browser_height=>240},
- "SH903iTV"=>
-  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>320},
  "SH702iD"=>
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>240},
  "SH04A"=>
@@ -225,6 +225,8 @@ Jpmobile::Mobile::Docomo::DISPLAY_INFO =
    :colors=>16777216,
    :browser_width=>240,
    :browser_height=>368},
+ "P06A"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>350},
  "P211iS"=>
   {:color_p=>true, :colors=>65536, :browser_width=>120, :browser_height=>130},
  "F700i"=>
@@ -347,6 +349,8 @@ Jpmobile::Mobile::Docomo::DISPLAY_INFO =
    :colors=>16777216,
    :browser_width=>240,
    :browser_height=>320},
+ "F07A"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>256},
  "SH705i"=>
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>320},
  "D701iWM"=>
@@ -456,6 +460,8 @@ Jpmobile::Mobile::Docomo::DISPLAY_INFO =
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>267},
  "SO903i"=>
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>368},
+ "N05A"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>320},
  "F883iESS"=>
   {:color_p=>true, :colors=>65536, :browser_width=>240, :browser_height=>256},
  "SH700iS"=>
@@ -608,6 +614,8 @@ Jpmobile::Mobile::Docomo::DISPLAY_INFO =
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>320},
  "P705iCL"=>
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>350},
+ "L03A"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>280},
  "N900iG"=>
   {:color_p=>true, :colors=>65536, :browser_width=>240, :browser_height=>269},
  "D252i"=>

data/lib/jpmobile/mobile/z_ip_addresses_au.rb

@@ -1,13 +1,6 @@
 Jpmobile::Mobile::Au::IP_ADDRESSES = 
 ["210.230.128.224/28",
- "61.117.0.128/25",
- "61.117.1.128/25",
- "218.222.1.0/25",
  "121.111.227.160/27",
- "218.222.1.128/28",
- "218.222.1.144/28",
- "218.222.1.160/28",
- "61.202.3.64/28",
  "61.117.1.0/28",
  "219.108.158.0/27",
  "219.125.146.0/28",
@@ -26,22 +19,4 @@ Jpmobile::Mobile::Au::IP_ADDRESSES =
  "118.152.214.192/26",
  "118.159.131.0/25",
  "118.159.133.0/25",
- "219.125.148.160/27",
- "219.125.148.192/27",
- "222.7.56.0/27",
- "222.7.56.32/27",
- "222.7.56.96/27",
- "222.7.56.128/27",
- "222.7.56.192/27",
- "222.7.56.224/27",
- "222.7.57.64/27",
- "222.7.57.96/27",
- "222.7.57.128/27",
- "222.7.57.160/27",
- "222.7.57.192/27",
- "222.7.57.224/27",
- "219.125.151.128/27",
- "219.125.151.160/27",
- "219.125.151.192/27",
- "222.7.57.32/27",
- "121.111.231.160/27"].map {|ip| IPAddr.new(ip) }
+ "118.159.132.160/27"].map {|ip| IPAddr.new(ip) }

data/lib/jpmobile/mobile/z_ip_addresses_willcom.rb

@@ -97,8 +97,6 @@ Jpmobile::Mobile::Willcom::IP_ADDRESSES =
  "219.108.13.0/24",
  "219.108.14.0/24",
  "219.108.15.0/24",
- "219.108.2.0/24",
- "219.108.3.0/24",
  "219.108.4.0/24",
  "219.108.5.0/24",
  "219.108.6.0/24",
@@ -115,5 +113,5 @@ Jpmobile::Mobile::Willcom::IP_ADDRESSES =
  "221.119.7.0/24",
  "221.119.8.0/24",
  "221.119.9.0/24",
- "219.108.0.0/24",
- "219.108.1.0/24"].map {|ip| IPAddr.new(ip) }
+ "219.108.2.0/24",
+ "219.108.3.0/24"].map {|ip| IPAddr.new(ip) }

data/lib/jpmobile/rack/auth.rb

@@ -0,0 +1,55 @@
+module Jpmobile
+  module Rack
+    # in your_app.ru
+    #
+    # check ip
+    #   require 'jpmobile/rack'
+    #   use Jpmobile::Rack::Auth::Docomo
+
+    # (but allow localhost), {
+    #      :ident => %w( xxxxxx ),
+    #      :check_ip => true,
+    #      :allow_ip => %w( 127.0.0.1 )
+    #   }    # you can use block
+
+    # req is Jpmobile::Rack::Request's subclass instance.
+    #   require 'jpmobile/rack'
+    #   use Jpmobile::Rack::Auth {|req|
+    #     Your::Model::AuSubno.count(:subno => req.ident) != 0
+    #   }
+    class Auth
+      FORBIDDEN = [403, {'Content-Type' => 'text/plain' }, 'Forbidden' ]
+
+      def initialize(app, hash=nil, &block)
+        @app = app
+        if hash
+          @allow_ip         = hash[:allow_ip]
+        end
+        @cond = block
+      end
+
+      def career
+      end
+
+      def call(env)
+        request = Request.new(env)
+
+        if request.mobile? and request.valid_ip?
+          @app.call(env)
+        else
+          FORBIDDEN
+        end
+      end
+
+      ::Jpmobile::Mobile.constants.each do |career|
+        klass = Class.new(self)
+        klass.class_eval do
+          define_method :career do
+            ::Jpmobile::Mobile.const_get(career)
+          end
+        end
+        const_set(career, klass)
+      end
+    end
+  end
+end

data/lib/jpmobile/rack/combined_logger.rb

@@ -0,0 +1,54 @@
+module Jpmobile
+  module Rack
+    # Rack::CommonLogger show too few infomation to debugging mobile web application.
+    # So you can Rack::Jpmobile::CombinedLogger as alternate.
+    # SYNOPSIS
+    #   in your_app.up
+    #     require 'jpmobile/rack'
+    #     class Rack::CommonLogger
+    #       include Jpmobile::Rack::CombinedLogger
+    #     end
+    #
+    #     use Rack::CommonLogger, STDERR   # you need not write this when you use rackup on development.
+    #
+    module CombinedLogger
+
+      # XXX: It's evil way for replacing Rack::CommonLogger#each.
+      def self.included klass
+        klass.class_eval do
+          alias orig_each each
+          remove_method :each
+        end
+      end
+
+      def each
+        length = 0
+        @body.each { |part|
+          length += part.size
+          yield part
+        }
+
+        @now = Time.now
+
+        # Combined Log Format: http://httpd.apache.org/docs/1.3/logs.html#combined
+        # 127.0.0.1 - frank [10/Oct/2000:13:55:36 -0700] "GET /apache_pb.gif HTTP/1.0" 200 2326 "http://www.example.com/start.html" "Mozilla/4.08 [en] (Win98; I ;Nav)"
+        #          "%h %l %u [%t] \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\""
+        @logger << %{%s - %s [%s] "%s %s%s %s" %d %s %s "%s" %0.4f\n} %
+          [
+           @env['HTTP_X_FORWARDED_FOR'] || @env["REMOTE_ADDR"] || "-",
+           @env["REMOTE_USER"] || @env["HTTP_X_DCMGUID"] || @env["HTTP_X_UP_SUBNO"] || @env["HTTP_X_JPHONE_UID"] || @env["HTTP_X_EM_UID"] || "-",
+           @now.strftime("%d/%b/%Y %H:%M:%S"),
+           @env["REQUEST_METHOD"],
+           @env["PATH_INFO"],
+           @env["QUERY_STRING"].empty? ? "" : "?"+@env["QUERY_STRING"],
+           @env["HTTP_VERSION"],
+           @status.to_s[0..3],
+           (length.zero? ? "-" : length.to_s),
+           @env["HTTP_REFERER"] ? %{"#{@env['Referer']}"} : '-',
+           @env["HTTP_USER_AGENT"],
+           @now - @time
+          ]
+      end
+    end
+  end
+end

data/lib/jpmobile/rack/request.rb

@@ -0,0 +1,7 @@
+module Jpmobile
+  module Rack
+    class Request < ::Rack::Request
+      include ::Jpmobile::RequestWithMobile
+    end
+  end
+end

data/lib/jpmobile/rack/trans_sid.rb

@@ -0,0 +1,14 @@
+# = セッションID を QUERY_STRING などから上書きする処理
+module Jpmobile
+  module Rack
+    class TransSid
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        @app.call(env)
+      end
+    end
+  end
+end

data/lib/jpmobile/trans_sid.rb

@@ -1,53 +1,72 @@
 # = セッションIDの付与
-#
-# based on http://moriq.tdiary.net/20070209.html#p01
-# by moriq <moriq@moriq.com>
-#
-# cookie support detection inspired by takai http://recompile.net/
-#
-# Rails 2.0.2 support is based on the code contributed
-# by masuidrive <masuidrive (at) masuidrive.jp>
 
-# FastCGI環境では(どういうわけか) cgi.query_string でクエリ文字列を取得できないので
-# ENV['QUERY_STRING'] に代入しておく。
 module ActionController
-  class CgiRequest
-    alias_method :initialize_without_ext, :initialize
-    def initialize(cgi, options = {})
-      initialize_without_ext(cgi, options)
-      ENV['QUERY_STRING'] = query_string
+  # cookie よりも params を先に見るパッチ
+  module Session
+    class AbstractStore
+      def load_session(env)
+        request = Rack::Request.new(env)
+        unless @cookie_only
+          sid = request.params[@key]
+        end
+        sid ||= request.cookies[@key]
+
+        sid, session = get_session(env, sid)
+        [sid, session]
+      end
     end
   end
-end
 
-class ActionController::Base #:nodoc:
-  class_inheritable_accessor :trans_sid_mode
-  alias :transit_sid_mode :trans_sid_mode
-  class << self
-    def trans_sid(mode=:mobile)
-      include Jpmobile::TransSid
-      self.trans_sid_mode = mode
-      unless mode == :none
-        # CSRF対策への対策
-        session :cookie_only => false
-        # url/postからsession_keyを取得できるようhookを追加する
-        unless ::CGI::Session.private_method_defined?(:initialize_without_session_key_fixation)
-          ::CGI::Session.class_eval do
-            alias_method :initialize_without_session_key_fixation, :initialize
-            def initialize(cgi, options = {})
-              key = options['session_key']
-              if cgi.cookies[key].empty?
-                session_id = (CGI.parse(cgi.env_table['RAW_POST_DATA'])[key] rescue nil) ||
-                  (CGI.parse(ENV['QUERY_STRING'] || cgi.query_string)[key] rescue nil)
-                cgi.params[key] = session_id unless session_id.blank?
-              end
-              initialize_without_session_key_fixation(cgi, options)
-            end
-          end
+  class Base #:nodoc:
+    class_inheritable_accessor :trans_sid_mode
+    alias :redirect_to_full_url_without_jpmobile :redirect_to_full_url
+
+    def transit_sid_mode(*args)
+      STDERR.puts "Method transit_sid is now deprecated. Use trans_sid instead."
+      trans_sid_mode(*args)
+    end
+
+    def redirect_to_full_url(url, status)
+      if apply_trans_sid? and !url.match(/#{session_key}/)
+        uri = URI.parse(url)
+        if uri.query
+          uri.query += "&#{session_key}=#{jpmobile_session_id}"
+        else
+          uri.query = "#{session_key}=#{jpmobile_session_id}"
+        end
+        url = uri.to_s
+      end
+
+      redirect_to_full_url_without_jpmobile(url, status)
+    end
+
+    class << self
+      # 2.3.x or higher
+      def trans_sid(mode = :mobile)
+        include Jpmobile::TransSid
+        self.trans_sid_mode = mode
+      end
+
+      def transit_sid(*args)
+        STDERR.puts "Method transit_sid is now deprecated. Use trans_sid instead."
+        trans_sid(*args)
+      end
+    end
+
+    private
+    # trans_sidを適用すべきかを返す。
+    def apply_trans_sid?
+      return false if trans_sid_mode == :none
+      return true if trans_sid_mode == :always
+      if trans_sid_mode == :mobile
+        if request.mobile?
+          return !request.mobile.supports_cookie?
+        else
+          return false
         end
       end
+      return false
     end
-    alias :transit_sid :trans_sid
   end
 end
 
@@ -59,21 +78,24 @@ module Jpmobile::TransSid #:nodoc:
   protected
   # URLにsession_idを追加する。
   def default_url_options(options=nil)
-    return unless request # for test process
-    return unless apply_trans_sid?
-    { session_key => session.session_id }
+    result = super || {}
+    return result unless request # for test process
+    return result unless apply_trans_sid?
+    return result.merge({ session_key => jpmobile_session_id })
   end
 
   private
   # session_keyを返す。
   def session_key
-    if session_enabled?
-      session_key = request.session_options[:session_key] || '_session_id'
-    end
+    (request.session_options || ActionController::Base.session_options)[:key]
+  end
+  # session_idを返す
+  def jpmobile_session_id
+    request.session_options[:id] rescue session.session_id
   end
   # session_idを埋め込むためのhidden fieldを出力する。
   def sid_hidden_field_tag
-    "<input type=\"hidden\" name=\"#{CGI::escapeHTML session_key}\" value=\"#{CGI::escapeHTML session.session_id}\" />"
+    "<input type=\"hidden\" name=\"#{CGI::escapeHTML session_key}\" value=\"#{CGI::escapeHTML jpmobile_session_id}\" />"
   end
   # formにsession_idを追加する。
   def append_session_id_parameter
@@ -81,18 +103,4 @@ module Jpmobile::TransSid #:nodoc:
     return unless apply_trans_sid?
     response.body.gsub!(%r{(</form>)}i, sid_hidden_field_tag+'\1')
   end
-  # trans_sidを適用すべきかを返す。
-  def apply_trans_sid?
-    return false unless session_enabled?
-    return false if trans_sid_mode == :none
-    return true if trans_sid_mode == :always
-    if trans_sid_mode == :mobile
-      if request.mobile?
-        return !request.mobile.supports_cookie?
-      else
-        return false
-      end
-    end
-    return false
-  end
 end