web-connect 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f2d79d7e04cd133c4f3ac7ebfec21fa50742650
-  data.tar.gz: c8db33715f544a85a17cb89e5a1be90d6bdf5f2b
+  metadata.gz: 7e2fdc0e26429acf2ba0b9913963559a3ad1ea2c
+  data.tar.gz: ef63471c2d83ce54c0f8abb29a4771a95a37affc
 SHA512:
-  metadata.gz: ab76e029cfa6d7d95e7490bd87c87de34872e40ac8f4153f49214035991880d3f757e60d56ccaad0d172ed0c5cd42c494ab6b9a87ae36b6c4ceb620d5ffd01d0
-  data.tar.gz: bb3cee43adee9ac75af954f63e4ef4649764000ab2ce6a2d6d82cf49367377efc190ab35f08de2192e9b34fd5cfb88e4e29ace99edce3e217644fd389a1da8c1
+  metadata.gz: d516716e5554f39e4685cedcac4bac81d0e0a7b6ee48925b8be8baf469af5bdce234bc350bd6229653bf1b8836446b43be1be2056d3e2a39ee16b518161f9182
+  data.tar.gz: 59cc9a8cad9c2d92739844e7e77b76c5fdf2aa67d643eb479981d47c93321bfa4b78b79259e85efb01666fb7d37a443eda907b01758442d1e19fcabcbd837582

data/lib/netfira/web_connect.rb

@@ -61,6 +61,10 @@ module Netfira
       @schema ||= Schema.new if @config
     end
 
+    def self.session_lifetime
+      @config.session_lifetime
+    end
+
     private
 
     def self.null_logger

data/lib/netfira/web_connect/configuration.rb

@@ -2,7 +2,7 @@ module Netfira::WebConnect
   class Configuration
 
     attr_accessor :db_table_prefix, :file_store, :authenticator, :custom_fields,
-                  :time_zone, :materialize_when_db_changed
+                  :time_zone, :materialize_when_db_changed, :session_lifetime
 
     attr_reader :logger, :db
 

data/lib/netfira/web_connect/db_schema/20140514_support.rb

@@ -33,6 +33,12 @@ class Support < Netfira::WebConnect::Migration
       t.binary :value, limit: 0x10000
     end
 
+    create_table :_sessions do |t|
+      t.references :shop, index: true
+      t.string :token, limit: 40, index: true
+      t.datetime :expires_at
+    end
+
   end
 
 end

data/lib/netfira/web_connect/models.rb

@@ -68,6 +68,4 @@ module Netfira::WebConnect
   end
 end
 
-require_relative 'models/support/setting'
-require_relative 'models/support/shop'
-require_relative 'models/support/table'
+require_relative 'models/support'

data/lib/netfira/web_connect/models/support.rb

@@ -0,0 +1,4 @@
+require_relative 'support/setting'
+require_relative 'support/shop'
+require_relative 'support/table'
+require_relative 'support/session'

data/lib/netfira/web_connect/models/support/session.rb

@@ -0,0 +1,25 @@
+require 'securerandom'
+
+module Netfira::WebConnect
+  class Models::Session < Model::Support
+
+    belongs_to :shop
+
+    after_initialize :generate_token
+
+    def self.by_token(token)
+      where(token: token).where(expires_at_column.eq(nil).or expires_at_column.gt(Time.now)).first
+    end
+
+    private
+
+    def generate_token
+      self.token ||= SecureRandom.random_bytes(20).unpack('H*').first
+    end
+
+    def self.expires_at_column
+      @expires_at_column ||= arel_table[:expires_at]
+    end
+
+  end
+end

data/lib/netfira/web_connect/models/support/shop.rb

@@ -2,6 +2,7 @@ module Netfira::WebConnect
   class Models::Shop < Model::Support
 
     has_many :setting_models, class_name: Models::Setting.name, inverse_of: :shop
+    has_many :sessions
 
     def settings
       @settings ||= Settings.new(setting_models)

data/lib/netfira/web_connect/rack_app/action_helpers/env_importer.rb

@@ -3,32 +3,57 @@ module Netfira::WebConnect
 
     def import_env(env)
       @env = env
+      @shop = nil
+      session = nil
 
       # Parse the environment
       request = Rack::Request.new env
 
-      # Authentication
-      authenticator = Netfira::WebConnect.authenticator
-      if authenticator.respond_to? :call
-        shop_name = env['HTTP_X_SHOP_NAME']
-        password = request['pw'] || env['HTTP_X_PASSWORD']
-
-        # Basic auth
-        auth = Rack::Auth::Basic::Request.new(env)
-        if auth.provided? && auth.basic?
-          shop_name ||= auth.username
-          password ||= auth.credentials[1]
+      # Restore sessions
+      session_lifetime = Netfira::WebConnect.session_lifetime
+      session_token = session_lifetime && env['HTTP_X_SESSION']
+      if session_token
+        session = Models::Session.by_token(session_token)
+        if session
+          @shop = session.shop
+        else
+          raise Unauthorized, 'Session has expired'
         end
+      end
+
+      # Authentication
+      unless @shop
+        authenticator = Netfira::WebConnect.authenticator
+        if authenticator.respond_to? :call
+          shop_name = env['HTTP_X_SHOP_NAME']
+          password = request['pw'] || env['HTTP_X_PASSWORD']
 
-        result = authenticator.call shop_name, password
-        raise Unauthorized unless result
-        header :x_vary_password, result if String === result
-        @shop = Netfira::WebConnect::Models::Shop.find_or_create_by(name: shop_name)
+          # Basic auth
+          auth = Rack::Auth::Basic::Request.new(env)
+          if auth.provided? && auth.basic?
+            shop_name ||= auth.username
+            password ||= auth.credentials[1]
+          end
 
-      elsif authenticator.nil?
-        @shop = Netfira::WebConnect.anonymous_shop
-      else
-        raise 'Authenticator is not callable'
+          result = authenticator.call shop_name, password
+          raise Unauthorized unless result
+          @shop = Netfira::WebConnect::Models::Shop.find_or_create_by(name: shop_name)
+
+          header :x_vary_password, result if String === result
+
+          # Sessions
+          if session_lifetime
+            session ||= @shop.sessions.new
+            session.expires_at = Time.now + session_lifetime if Fixnum === session_lifetime
+            session.save
+            header :x_session, session.token
+          end
+
+        elsif authenticator.nil?
+          @shop = Netfira::WebConnect.anonymous_shop
+        else
+          raise 'Authenticator is not callable'
+        end
       end
 
       # The request verb (PUT, GET, POST etc)

data/lib/netfira/web_connect/version.rb

@@ -1,5 +1,5 @@
 module Netfira
   module WebConnect
-    VERSION = '0.1.4'
+    VERSION = '0.1.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web-connect
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Neil E. Pearson
@@ -194,6 +194,8 @@ files:
 - lib/netfira/web_connect/models/image.rb
 - lib/netfira/web_connect/models/order.rb
 - lib/netfira/web_connect/models/order_line.rb
+- lib/netfira/web_connect/models/support.rb
+- lib/netfira/web_connect/models/support/session.rb
 - lib/netfira/web_connect/models/support/setting.rb
 - lib/netfira/web_connect/models/support/shop.rb
 - lib/netfira/web_connect/models/support/shop/settings.rb