wizdog 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 411c507ab5ef2a1b51649964b5d72f73cddeab2a
-  data.tar.gz: 93363c2f7870f3160cb99c6927ee873381ccc7d8
+  metadata.gz: b9e2e4e8884ccdd801328f1a8d14618491587495
+  data.tar.gz: 9c5fc3b1c4e7d3237ee029dac1ea1325371a1dc3
 SHA512:
-  metadata.gz: 5f519556de05ea98e9caba468759cc7e700eaf299575a1d50fbcd8e5ba9bc33b6b8743d0a003517f91f6e1edfe26ed9bea56189d23825c381b8b8556386f9559
-  data.tar.gz: 4548b5c9a007807268b055ad9af1df83daae8a58e556c807f6f9a1fc1784bdd3966bdb88ef62866ab3bd45ade9af6d4d2cdbdff09f4dbb401fb49049cdf049c9
+  metadata.gz: 36532dc5c62c5596207c70d8ce71689f1aa1ff74a026be27f1c1a0739a98d335f8dc83bafa968ae6acf11c99f31bbc577de1d1322718905b444b916effdb8e15
+  data.tar.gz: c009edab7db4301de04c468f8715650c803ac30d7e677426bde41c190de2822bd83342c73e86d7974e70449b95fa5fd1c70848233a18710ccedaf9a3e3469d77

data/lib/wizdog/authc/filter.rb

@@ -26,7 +26,7 @@ module WizAuthc
       # private
       # def activate_wiz_auth
       #   p self.session.to_s
-      #   WizAuthc::SecurityContext.init(self, Util::Account.new(self.session))
+      #   WizAuthc::SecurityContext.init(self, Util::Account)
       #   @current = WizAuthc::SecurityContext.current
       # end
     end

data/lib/wizdog/authc/security_context.rb

@@ -5,6 +5,24 @@ module WizAuthc
   class SecurityContext    
 #    @@ip = "0.0.0.0"
 #    @@contexts = {}
+    attr_accessor :principal, :authenticated, :session
+    
+    def initialize(principal, authenticated = nil, session = nil, ip = nil)
+      @principal = principal || nil
+      @authenticated = authenticated || false
+      @session = session
+      @ip = ip || "0.0.0.0"
+      @actived = false
+    end
+
+    def authenticated?
+      @authenticated
+    end
+
+    def user
+      @principal[:type].constantize.find(@principal[:identity])
+    end
+
     class << self
       def env
         Thread.current[:security_env_key]
@@ -20,7 +38,7 @@ module WizAuthc
 
       def current=(value)
 #        Thread.current[:security_context_key] = value
-         Thread.current[:security_contexts_key] = value
+        Thread.current[:security_contexts_key] = value
       end
 
       def session
@@ -35,17 +53,11 @@ module WizAuthc
         Thread.current[:security_contexts_key]
       end
 
-      def init(env, current)
+      def init(env, klass)
         self.env = env
-        self.current = current
+        self.current = klass.new(self.session)
       end
 
-
-
-
-
-      #--------------------------
-      
       def authenticate(realm, token)
         authc_info = realm.authenticate(token)
 #        ctx = self.current
@@ -56,26 +68,6 @@ module WizAuthc
 #        env.session[:security_contexts_key] = ctx
         self.current = ctx
       end
-
-
-    end
-
-    attr_accessor :principal, :authenticated, :session
-    
-    def initialize(principal, authenticated = nil, session = nil, ip = nil)
-      @principal = principal || nil
-      @authenticated = authenticated || false
-      @session = session
-      @ip = ip || "0.0.0.0"
-      @actived = false
-    end
-
-    def authenticated?
-      @authenticated
-    end
-
-    def user
-      @principal[:type].constantize.find(@principal[:identity])
     end
   end
 end

data/lib/wizdog/version.rb

@@ -1,3 +1,3 @@
 module Wizdog
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wizdog
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - songgz