mumukit-login 6.1.9 → 7.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98a58c54fb727d1043865ff9a80c288e9db0d3c5a86e07135f5296f54edc8682
-  data.tar.gz: eea9e88bedd8e22cc6567179a7b68324d93d653214110f6791662a5db1bb1b1a
+  metadata.gz: 03d86c08686a70a40b6b3395cfc566d7b1f210289525716f3c5413cd60977704
+  data.tar.gz: 983a7c19738beb01b0a23f8c03e7bd98dc6ca51d983a26179d4019f3b1a83b85
 SHA512:
-  metadata.gz: 1782e1f6a12158a45fdf133ff570f395cdb552a93207768d7fb14c98fa003153f67e8ba10aa5e52940ab7ee24e70be832b2c7e897774c8a6cecb313e5c0f792d
-  data.tar.gz: 220ece34cddbbad92765a620014d44e66c5a97ee79a09e10fda03efee41e1059e3fc5a65b967b295c6a1275aecf689ca15dc332836f986ded2db15328ef6d14c
+  metadata.gz: 3868084c92bef7ba72a7eb6289229adad904eeb932206cc23f46f2be0d738d3fbdbc72d2adf66515018f615680b1cd06c0ab398a134bfcbb8819888ba4593f35
+  data.tar.gz: 6b15059270ff67d166129a95e3f8930f5c00f5bb457bd8c9c04dcba0a50f28814f0faf3786781fdfc38689c55b815ef86ba56e933cd62e3762d22282279a4c57

data/lib/mumukit/login/helpers.rb

@@ -1,3 +1,5 @@
 require_relative './helpers/authentication_helpers'
 require_relative './helpers/authorization_helpers'
 require_relative './helpers/login_controller_helpers'
+require_relative './helpers/organization_helpers'
+require_relative './helpers/login_settings_helpers'

data/lib/mumukit/login/helpers/login_controller_helpers.rb

@@ -1,7 +1,7 @@
 module Mumukit::Login::LoginControllerHelpers
 
   def login_current_user!
-    mumukit_controller.write_cookie!(:login_organization, organization_name)
+    mumukit_controller.mucookie.write!(:login_organization, organization_name)
     origin_redirector.save_after_login_location!
     if current_user?
       origin_redirector.redirect_after_login!

data/lib/mumukit/login/helpers/login_settings_helpers.rb

@@ -0,0 +1,13 @@
+module Mumukit::Login::LoginSettingsHelpers
+  def login_settings
+    @login_settings ||= Mumukit::Login::Settings.new(login_methods)
+  end
+
+  def customized_login_methods?
+    login_methods.size < Mumukit::Login::Settings.login_methods.size
+  end
+
+  def inconsistent_public_login?
+    customized_login_methods? && public?
+  end
+end

data/lib/mumukit/login/helpers/organization_helpers.rb

@@ -0,0 +1,5 @@
+module Mumukit::Login::OrganizationHelpers
+  def login_provider_object
+    @login_provider_object ||= login_provider.try { |it| Mumukit::Login::Provider.parse_login_provider it }
+  end
+end

data/lib/mumukit/login/mucookie.rb

@@ -6,10 +6,10 @@ class Mumukit::Login::Mucookie
   end
 
   def write!(key, value, options={})
-    @controller.write_cookie! cookie_name(key),
-                              spec.merge(
-                                value: value.to_s,
-                                httponly: !!options[:httponly])
+    do_write! cookie_name(key),
+              spec.merge(
+                value: value.to_s,
+                httponly: !!options[:httponly])
   end
 
   def encrypt_and_write!(key, value, options={})
@@ -21,7 +21,7 @@ class Mumukit::Login::Mucookie
   end
 
   def read(key)
-    @controller.read_cookie cookie_name(key)
+    do_read!(cookie_name(key))
   end
 
   def decrypt_and_read(key)
@@ -33,17 +33,43 @@ class Mumukit::Login::Mucookie
   end
 
   def delete!(key)
-    @controller.delete_cookie! cookie_name(key), Mumukit::Login.config.mucookie_domain
+    do_delete! cookie_name(key), Mumukit::Login.config.mucookie_domain
   end
 
   def spec
-    { path: '/',
+    {
+      path: '/',
       expires: Mumukit::Login.config.mucookie_duration.days.since,
-      domain: Mumukit::Login.config.mucookie_domain }
+      domain: Mumukit::Login.config.mucookie_domain
+    }
+  end
+
+  def self.cookie_same_site
+    if %w(RACK_ENV RAILS_ENV).any? { |it| ENV[it] == 'production' }
+      :none
+    else
+      :lax
+    end
   end
 
   private
 
+  # Support for legacy browsers
+  # Duplicate write / read / delete cookies without samesite for old browsers that do not allow for SameSite=None attribute
+  def do_write!(cookie_name, spec)
+    @controller.write_cookie! cookie_name, spec.merge(same_site: self.class.cookie_same_site)
+    @controller.write_cookie! "#{cookie_name}_legacy", spec
+  end
+
+  def do_delete!(cookie_name, domain)
+    @controller.delete_cookie! cookie_name, domain
+    @controller.delete_cookie! "#{cookie_name}_legacy", domain
+  end
+
+  def do_read!(cookie_name)
+    @controller.read_cookie(cookie_name) || @controller.read_cookie("#{cookie_name}_legacy")
+  end
+
   def cookie_name(key)
     "mucookie_#{key}"
   end
@@ -84,5 +110,6 @@ class Mumukit::Login::Mucookie
       value.try { |it| encryptor.decrypt_and_verify it }
     end
   end
-
 end
+
+require_relative 'mucookie/store'

data/lib/mumukit/login/mucookie/store.rb

@@ -0,0 +1,14 @@
+require 'action_dispatch'
+
+class Mumukit::Login::Mucookie::Store < ActionDispatch::Session::CookieStore
+  def set_cookie(request, session_id, cookie)
+    cookie.merge! same_site: :none if on_embeddable_organization?(request)
+    super
+  end
+
+  private
+
+  def on_embeddable_organization?(request)
+    Mumukit::Platform::Organization.find_by_name!(request.cookies['mucookie_login_organization']).embeddable? rescue false
+  end
+end

data/lib/mumukit/login/provider.rb

@@ -58,12 +58,6 @@ module Mumukit::Login::Provider
   end
 end
 
-module Mumukit::Platform::Organization::Helpers
-  def login_provider_object
-    @login_provider_object ||= login_provider.try { |it| Mumukit::Login::Provider.parse_login_provider it }
-  end
-end
-
 require_relative './provider/base'
 
 Mumukit::Login::Provider.enabled_providers.each do |it|

data/lib/mumukit/login/provider/base.rb

@@ -82,7 +82,7 @@ class Mumukit::Login::Provider::Base
   end
 
   def setup_phase_login_organization_name(env)
-    Rack::Request.new(env).cookies['login_organization']
+    Rack::Request.new(env).cookies['mucookie_login_organization']
   end
 
   def organization_login_settings_for(name)

data/lib/mumukit/login/settings.rb

@@ -75,17 +75,3 @@ class Mumukit::Login::Settings
     [:user_pass]
   end
 end
-
-class Mumukit::Platform::Organization::Settings < Mumukit::Platform::Model
-  def login_settings
-    @login_settings ||= Mumukit::Login::Settings.new(login_methods)
-  end
-
-  def customized_login_methods?
-    login_methods.size < Mumukit::Login::Settings.login_methods.size
-  end
-
-  def inconsistent_public_login?
-    customized_login_methods? && public?
-  end
-end

data/lib/mumukit/login/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Login
-    VERSION = '6.1.9'
+    VERSION = '7.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-login
 version: !ruby/object:Gem::Version
-  version: 6.1.9
+  version: 7.3.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-16 00:00:00.000000000 Z
+date: 2020-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -224,22 +224,30 @@ dependencies:
   name: mumukit-platform
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.6'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
-    - - "<"
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.1'
 description: 
 email:
 - franco@mumuki.org
@@ -260,7 +268,10 @@ files:
 - lib/mumukit/login/helpers/authentication_helpers.rb
 - lib/mumukit/login/helpers/authorization_helpers.rb
 - lib/mumukit/login/helpers/login_controller_helpers.rb
+- lib/mumukit/login/helpers/login_settings_helpers.rb
+- lib/mumukit/login/helpers/organization_helpers.rb
 - lib/mumukit/login/mucookie.rb
+- lib/mumukit/login/mucookie/store.rb
 - lib/mumukit/login/origin_redirector.rb
 - lib/mumukit/login/profile.rb
 - lib/mumukit/login/provider.rb
@@ -294,7 +305,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Library for login mumuki requests