pixnet-sso 0.0.3 → 0.0.4

data/lib/pixnet-sso/config.rb

@@ -11,6 +11,9 @@ module Pixnet
       mattr_accessor :openid_enabled
       @@openid_enabled = false
 
+      mattr_accessor :version
+      @@version = 1
+
       # SSO Key
       mattr_accessor :sso_key
 

data/lib/pixnet-sso/controller_methods.rb

@@ -6,7 +6,11 @@ module Pixnet
       end
 
       def current_user
-        @current_user ||= login_from_session unless @current_user == false
+        if Pixnet::SSO::Config.version == 1
+          @current_user ||= login_from_session unless @current_user == false
+        else
+          @current_user ||= login_from_cookie unless @current_user == false
+        end
       end
 
       def current_user=(new_user)
@@ -18,6 +22,16 @@ module Pixnet
         self.current_user = Pixnet::SSO::Config.user_klass.find(session[:user_id]) if session[:user_id]
       end
 
+      def login_from_cookie
+        pixdata = get_login_user
+        if pixdata
+          sso = Pixnet::SSO::App.new
+          self.current_user = sso.get_user(pixdata['user_name'])
+        else
+          self.current_user = nil
+        end
+      end
+
       def login_required
         if logged_in?
           return true
@@ -27,11 +41,27 @@ module Pixnet
         end
       end
 
+      # sso2
+      def get_login_user(type = 'pixnet')
+        pixdata = cookies['pixdata'] ? JSON::parse(cookies['pixdata']) : nil
+        if (!pixdata or !pixdata['sig'])
+          return nil
+        end
+        sig = pixdata['sig']
+        str = cookies['pixdata'].gsub(/,"sig":\d+/, '')
+        crc32 = Zlib.crc32("#{str}#{pixdata['nonce']}#{Pixnet::SSO::Config.sso_secret}")
+        return nil unless sig == crc32
+        return pixdata if 'pixnet' == type && pixdata['user_name']
+        return pixdata if 'openid' == type && pixdata['openid']
+        return nil
+      end
+
       def self.included(base)
         base.helper_method :logged_in?
         base.helper_method :current_user
-        base.helper_method :login_required
+        base.helper_method :login_required #sso1
         base.helper_method :redirect_back_or_default
+        base.helper_method :get_login_user
       end
     end
   end

data/lib/pixnet-sso/helper.rb

@@ -35,6 +35,18 @@ module Pixnet
 </script>
 <script src="//api.pixnet.cc/api/checklogin.php?js=1&amp;unique=#{unique}&amp;timestamp=#{now}&amp;type=2" type="text/javascript"></script>
 <script src="http://s.pixfs.net/js/pixnet/checklogin.js?v=20110519" type="text/javascript"></script>
+MSG
+        return html.html_safe
+      end
+
+      def pixnet_sso2_scripts
+        unique = Zlib.crc32(UUID.generate).to_s
+        now = Time.now.to_i.to_s
+        sig = Zlib.crc32("#{Pixnet::SSO::Config.sso_secret}#{unique}#{now}")
+        html = <<MSG
+        <script type="text/javascript" src="//checklogin.#{request.host}/login_name.php?key=#{Pixnet::SSO::Config.sso_key}&unique=#{unique}&timestamp=#{now}&sig=#{sig}"></script>
+        <script type="text/javascript" src="//api.pixnet.cc/api/checklogin.php?js=1&unique=#{unique}&timestamp=#{now}&type=2"></script>
+        <script type="text/javascript" src="//s.pixfs.net/js/pixnet/checklogin.min.js"></script>
 MSG
         return html.html_safe
       end

data/lib/pixnet-sso/openid_controller_methods.rb

@@ -7,13 +7,28 @@ module Pixnet
       end
 
       def current_openid_user
-        @current_openid_user ||= openid_login_from_session unless @current_openid_user == false
+        if Pixnet::SSO::Config.version == 1
+          @current_openid_user ||= openid_login_from_session unless @current_openid_user == false
+        else
+          @current_openid_user ||= openid_login_from_cookie unless @current_openid_user == false
+        end
       end
 
       def openid_login_from_session
         self.current_openid_user = Pixnet::SSO::Config.openid_klass.find(session[:openid_user_id]) if session[:openid_user_id]
       end
 
+      def openid_login_from_cookie
+        pixdata = get_login_user('openid')
+        if pixdata
+          sso = Pixnet::SSO::App.new
+          info = { 'msg' => pixdata }
+          self.current_openid_user = sso.get_openid_user(info)
+        else
+          self.current_openid_user = nil
+        end
+      end
+
       def self.included(base)
         base.helper_method :current_openid_user
       end

metadata

@@ -1,56 +1,77 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: pixnet-sso
-version: !ruby/object:Gem::Version
-  version: 0.0.3
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 4
+  version: 0.0.4
 platform: ruby
-authors:
+authors: 
 - Manic Chuang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-15 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-04-09 00:00:00 +08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   name: rails
-  requirement: &14348620 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
-  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *14348620
-- !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &14347920 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *14347920
-- !ruby/object:Gem::Dependency
   name: json
-  requirement: &14347320 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
-  prerelease: false
-  version_requirements: *14347320
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id003
 description: Client for PIXNET SSO
-email:
+email: 
 - manic@pixnet.tw
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - app/controllers/pixauth_controller.rb
 - config/routes.rb
 - lib/tasks/pixnet-sso_tasks.rake
@@ -70,34 +91,39 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.md
+has_rdoc: true
 homepage: https://github.com/manic/pixnet-sso
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -409314474799638778
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -409314474799638778
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Client for PIXNET SSO
 test_files: []
+