maestrano-rails 1.0.0.pre.RC6 → 1.0.0.pre.RC7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 461ebd14276eb85f090f1a89d74d3e3bc4dbde56
-  data.tar.gz: 4eb9f3687ac4fb2f74474b535d7de1a284d2621e
+  metadata.gz: 367b1f484295aae1a3dfc42c588d4c134e6c1d1d
+  data.tar.gz: a34329e30c0b9c1bb888f2764eeeecab9a816486
 SHA512:
-  metadata.gz: 8d519d5bd0c3810b4d6f21f884e632fadd4623bab9835122afa5a400ea99db4f5ff8d4d0762d72cdb33f53e4f916594994ed3ab501b3c4857d8c05dee5c468e6
-  data.tar.gz: cf22d2ffdf72ebf5717adb20623b6997232fd63f572f4fe60360c5d6d2cf2b8c37f6b9c785b94a73769ee4de91d7658b7f14ba9f9e73f125e797938617281fc2
+  metadata.gz: f06b766c6703c03b3e1a87e983d2b010b7c26fe9da9a62f2479d6b856a2e22f8663614e1474237f30a4b5aa57ae18607aa8d0fcaee6a6f11ea8b2659f99bae2c
+  data.tar.gz: 7633fe1aba8b0b8e0ec1d20825531d619ce934231a92b6ded1fa28fd06ede38cfd16d07b7d7c42b711d55326e72eaa1e94687fd1488e04192c220c8aaa345121

data/Gemfile

@@ -5,7 +5,7 @@ gem 'jquery-rails'
 gem 'haml-rails'
 gem 'mongoid', require: false
 
-gem 'maestrano', '1.0.0.pre.RC6'
+gem 'maestrano', '1.0.0.pre.RC7'
 
 group :development, :test do
   gem 'sqlite3', :platforms => :ruby

data/Gemfile.lock

@@ -104,7 +104,7 @@ GEM
       nokogiri (>= 1.5.9)
     macaddr (1.7.1)
       systemu (~> 2.6.2)
-    maestrano (1.0.0.pre.RC6)
+    maestrano (1.0.0.pre.RC7)
       httparty (~> 0.14)
       json (~> 1.8)
       mime-types (~> 1.25)
@@ -220,7 +220,7 @@ DEPENDENCIES
   haml-rails
   jeweler
   jquery-rails
-  maestrano (= 1.0.0.pre.RC6)
+  maestrano (= 1.0.0.pre.RC7)
   mocha (~> 1.1)
   mongoid
   pg

data/lib/maestrano/rails/controllers/maestrano_security.rb

@@ -17,15 +17,27 @@ module Maestrano
         # its validity. If not valid anymore the filter
         # triggers a Maestrano SSO handshake
         def verify_maestrano_session
-          if Maestrano.param(:sso_enabled)
+          if Maestrano[session_preset].param(:sso_enabled)
             unless controller_name == 'saml' && ['init','consume'].include?(action_name)
-              if !Maestrano::SSO::Session.new(session).valid?(if_session:true)
-                redirect_to Maestrano::SSO.init_url
+              if !Maestrano::SSO::Session[session_preset].new(session).valid?(if_session:true)
+                redirect_to Maestrano::SSO[session_preset].init_url
               end
             end
           end
           true
         end
+
+        def session_preset
+          @session_preset ||= begin
+            mno_session = (self.session[:maestrano] || self.session['maestrano'])
+            if mno_session
+              decrypted_session = JSON.parse(Base64.decode64(mno_session))
+              decrypted_session['preset']
+            else
+              nil
+            end
+          end
+        end
       end
     end
   end

data/maestrano-rails.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: maestrano-rails 1.0.0.pre.RC6 ruby lib
+# stub: maestrano-rails 1.0.0.pre.RC7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-rails"
-  s.version = "1.0.0.pre.RC6"
+  s.version = "1.0.0.pre.RC7"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -61,7 +61,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<jquery-rails>, [">= 0"])
       s.add_runtime_dependency(%q<haml-rails>, [">= 0"])
       s.add_runtime_dependency(%q<mongoid>, [">= 0"])
-      s.add_runtime_dependency(%q<maestrano>, ["= 1.0.0.pre.RC6"])
+      s.add_runtime_dependency(%q<maestrano>, ["= 1.0.0.pre.RC7"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -70,7 +70,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jquery-rails>, [">= 0"])
       s.add_dependency(%q<haml-rails>, [">= 0"])
       s.add_dependency(%q<mongoid>, [">= 0"])
-      s.add_dependency(%q<maestrano>, ["= 1.0.0.pre.RC6"])
+      s.add_dependency(%q<maestrano>, ["= 1.0.0.pre.RC7"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -80,7 +80,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jquery-rails>, [">= 0"])
     s.add_dependency(%q<haml-rails>, [">= 0"])
     s.add_dependency(%q<mongoid>, [">= 0"])
-    s.add_dependency(%q<maestrano>, ["= 1.0.0.pre.RC6"])
+    s.add_dependency(%q<maestrano>, ["= 1.0.0.pre.RC7"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.RC6
+  version: 1.0.0.pre.RC7
 platform: ruby
 authors:
 - Arnaud Lachaume
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre.RC6
+        version: 1.0.0.pre.RC7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre.RC6
+        version: 1.0.0.pre.RC7
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement