mumukit-login 6.1.1 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4c0227c6312c203934f5b698f382707358a369eda06d8bd9e1a0a8acafbce8d
-  data.tar.gz: ed2e7d7c57184044d2ffe16f771a493766e66185beaafb85dce18e7461ea1ebf
+  metadata.gz: 3e253118b608f53f7d20743dc81cf0fa9322ee4689d46aa7a49077d33c84041c
+  data.tar.gz: 521feb734a561c1cd29700802d2dd448f1b0dcb46967e518bd6ecb626ab3ed03
 SHA512:
-  metadata.gz: 302ffd66ec3ba05ef8d0586cc8be0fe58369c03d5886f4daf24bbeed01bc2fcc9af8519c38cd8c39c33b83fb40d5294eaa2fccfdbdd6ae5ad8ca387c13a40b93
-  data.tar.gz: 92c97e2fef48b9a9af586241c5ac22a210fc0195d2640328a07d20684208c2e550275807a8e552505a8c6cac2fdc86c66f785c7232f6b58e4624c41d9bbc6b47
+  metadata.gz: 7a5e754fe88910cae7739255c8579219e590a737d33ce263e74bb5d95bcd274e16f1d6fc91d25206e2c8e7c251007a814be1b6f0ac8b708844a490ab5175bd8b
+  data.tar.gz: 20486d83d41dc0ea962b9ba4abd4c534f13fd8cf3727530169de1cb65e8307595f9dfce42ade940f2a9d5342d78f20e72e09b4b5d58b208c9d4a3ba89d4ca2df

data/lib/mumukit/login.rb

@@ -40,6 +40,7 @@ module Mumukit::Login
                            translation_image: ENV['MUMUKI_SAML_TRANSLATION_IMAGE'] || 'image'
       config.cas = struct url: ENV['MUMUKI_CAS_URL'],
                           host: ENV['MUMUKI_CAS_HOST'],
+                          ssl_certificate: ENV['MUMUKI_CAS_SSL_CERTIFICATE'],
                           disable_ssl_verification: ENV['MUMUKI_CAS_DISABLE_SSL_VERIFICATION'] == 'true'
       config.auth0 = struct client_id: ENV['MUMUKI_AUTH0_CLIENT_ID'],
                             client_secret: ENV['MUMUKI_AUTH0_CLIENT_SECRET'],

data/lib/mumukit/login/provider.rb

@@ -1,9 +1,9 @@
 module Mumukit::Login::Provider
   PROVIDERS = %w(
     developer
+    auth0
     saml
     cas
-    auth0
     google
   )
 
@@ -11,8 +11,10 @@ module Mumukit::Login::Provider
     parse_login_provider(login_provider_string)
   end
 
-  def self.default_enabled_providers                  # This is a list of the default enabled login providers
-    case ENV['RACK_ENV'] || ENV['RAILS_ENV']          # It depends only on the current environment
+  # This is a list of the default enabled login providers
+  # It depends only on the current environment
+  def self.default_enabled_providers
+    case ENV['RACK_ENV'] || ENV['RAILS_ENV']
       when 'production'
         PROVIDERS - %w(developer)
       when 'test'
@@ -22,17 +24,22 @@ module Mumukit::Login::Provider
     end
   end
 
-  def self.enabled_providers                          # This is a list of the login providers enabled on the current instance of the platform
-    if ENV['MUMUKI_ENABLED_LOGIN_PROVIDERS'].blank?   # It is obtained from the environment, and if unset, it defaults to default_enabled_providers
+  # This is a list of the login providers enabled on the current instance of the platform
+  # It is obtained from the environment, and if unset, it defaults to default_enabled_providers
+  def self.enabled_providers
+    if ENV['MUMUKI_ENABLED_LOGIN_PROVIDERS'].blank?
       default_enabled_providers
     else
       ENV['MUMUKI_ENABLED_LOGIN_PROVIDERS'].split ','
     end
   end
 
-  def self.login_provider_string                      # This is the default login provider used when it is not overriden in the organization's config
-    if ENV['MUMUKI_LOGIN_PROVIDER'].blank?            # It is obtained from env, and defaults to the first of the current enabled providers
-      enabled_providers.first                         # It should always be a provider within the enabled_providers list
+  # This is the default login provider used when it is not overriden in the organization's config
+  # It is obtained from env, and defaults to the first of the current enabled providers
+  # It should always be a provider within the enabled_providers list
+  def self.login_provider_string
+    if ENV['MUMUKI_LOGIN_PROVIDER'].blank?
+      enabled_providers.first
     else
       ENV['MUMUKI_LOGIN_PROVIDER']
     end

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

@@ -8,10 +8,6 @@ class Mumukit::Login::Provider::Cas < Mumukit::Login::Provider::Base
   def default_settings
     Mumukit::Login.config.cas
   end
-
-  def computed_settings(_cas)
-    { ca_path: '.' }
-  end
 end
 
 # Monkey-patching to support phpCAS implementation
@@ -31,3 +27,26 @@ module OmniAuth
     end
   end
 end
+
+module OmniAuth
+  module Strategies
+    class CAS
+      class ServiceTicketValidator
+        def get_service_response_body
+          result = ''
+          http = Net::HTTP.new(@uri.host, @uri.port)
+          http.use_ssl = @uri.port == 443 || @uri.instance_of?(URI::HTTPS)
+          if http.use_ssl?
+            http.verify_mode = OpenSSL::SSL::VERIFY_NONE if @options.disable_ssl_verification?
+            http.cert = @options.ssl_certificate.try { |it| OpenSSL::X509::Certificate.new it }
+          end
+          http.start do |c|
+            response = c.get "#{@uri.path}?#{@uri.query}", VALIDATION_REQUEST_HEADERS.dup
+            result = response.body
+          end
+          result
+        end
+      end
+    end
+  end
+end

data/lib/mumukit/login/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Login
-    VERSION = '6.1.1'
+    VERSION = '6.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-login
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.1.2
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2018-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler