Merge pull request #5 from luisvm/master

Polish ruby-saml routes, views and support single logout

Author: pitbulk

.gitignore

@@ -0,0 +1,2 @@
+log/*
+tmp/*

app/controllers/saml_controller.rb

@@ -2,19 +2,18 @@ class SamlController < ApplicationController
   skip_before_action :verify_authenticity_token, :only => [:acs, :logout]
 
   def index
-      render :action => :index
+    @attrs = []
   end
 
   def sso
     settings = Account.get_saml_settings
     if settings.nil?
       render :action => :no_settings
-      return 
+      return
     end
 
     request = OneLogin::RubySaml::Authrequest.new
     redirect_to(request.create(settings))
-    # redirect_to(request.create(saml_settings, {:RelayState => session[:return_to]}))
 
   end
 
@@ -25,10 +24,10 @@ def acs
     logger.info "NAMEID: #{response.name_id}"
 
     if response.is_valid?
-      session[:userid] = response.name_id
+      session[:user_id] = response.name_id
       session[:attributes] = response.attributes
       @attrs = session[:attributes]
-      render :action => :complete
+      redirect_to root_path
     else
       render :action => :fail
     end
@@ -42,17 +41,17 @@ def metadata
 
   # Trigger SP and IdP initiated Logout requests
   def logout
-    # If we're given a logout request, handle it in the IdP initiated method
+    # If we're given a logout request, handle it in the IdP logout initiated method
     if params[:SAMLRequest]
       return idp_logout_request
-    
-    # We've been given a response back from the IdP 
+
+    # We've been given a response back from the IdP
     elsif params[:SAMLResponse]
-      return logout_response
+      return process_logout_response
     elsif params[:slo]
       return sp_logout_request
     else
-      delete_session
+      reset_session
     end
   end
 
@@ -63,17 +62,17 @@ def sp_logout_request
 
     if settings.idp_slo_target_url.nil?
       logger.info "SLO IdP Endpoint not found in settings, executing then a normal logout'"
-      delete_session
+      reset_session
     else
 
       # Since we created a new SAML request, save the transaction_id
       # to compare it with the response we get back
       logout_request = OneLogin::RubySaml::Logoutrequest.new()
       session[:transaction_id] = logout_request.uuid
-      logger.info "New SP SLO for userid '#{session[:userid]}' transactionid '#{session[:transaction_id]}'"
+      logger.info "New SP SLO for User ID: '#{session[:user_id]}', Transaction ID: '#{session[:transaction_id]}'"
 
       if settings.name_identifier_value.nil?
-        settings.name_identifier_value = session[:userid]
+        settings.name_identifier_value = session[:user_id]
       end
 
       relayState =  url_for controller: 'saml', action: 'index'
@@ -83,12 +82,12 @@ def sp_logout_request
 
   # After sending an SP initiated LogoutRequest to the IdP, we need to accept
   # the LogoutResponse, verify it, then actually delete our session.
-  def logout_response
+  def process_logout_response
     settings = Account.get_saml_settings
 
     if session.has_key? :transation_id
       logout_response = OneLogin::RubySaml::Logoutresponse.new(params[:SAMLResponse], settings, :matches_request_id => session[:transation_id])
-    else 
+    else
       logout_response = OneLogin::RubySaml::Logoutresponse.new(params[:SAMLResponse], settings)
     end
 
@@ -100,30 +99,24 @@ def logout_response
     else
       # Actually log out this session
       if logout_response.success?
-        logger.info "Delete session for '#{session[:userid]}'"
-        delete_session
+        logger.info "Delete session for '#{session[:user_id]}'"
+        reset_session
       end
     end
   end
 
  # Method to handle IdP initiated logouts
   def idp_logout_request
-
-    render :inline => "IdP initiated Logout not supported"
-
-    #settings = Account.get_saml_settings
-    #logout_request = OneLogin::RubySaml::Logoutrequest.new(params[:SAMLRequest],settings)
-    #unless logout_request.is_valid?
-    #  logger.error "IdP initiated LogoutRequest was not valid!"
-    #end
-    # Check that the name ID's match
-    #if session[:userid] != logout_request.name_id
-    #  logger.error "The session's Name ID '#{session[:userid]}' does not match the LogoutRequest's Name ID '#{logout_request.name_id}'"
-    #end
-    #logger.info "IdP initiated Logout for #{logout_request.name_id}"
+    settings = Account.get_saml_settings
+    logout_request = OneLogin::RubySaml::SloLogoutrequest.new(params[:SAMLRequest])
+    if !logout_request.is_valid?
+      logger.error "IdP initiated LogoutRequest was not valid!"
+      render :inline => logger.error
+    end
+    logger.info "IdP initiated Logout for #{logout_request.name_id}"
 
     # Actually log out this session
-    #delete_session
+    reset_session
 
     # Generate a response to the IdP.  :transaction_id sets the InResponseTo
     # SAML message to create a reply to the IdP in the LogoutResponse.
@@ -137,13 +130,10 @@ def idp_logout_request
     #  when "POST"
     #    # for POST requests (form) render the content as HTML
     #    render :inline => content
-    #end
-  end
+    #end    logout_request_id = logout_request.id
 
-  # Delete a user's session.  Add your own custom stuff in here 
-  def delete_session
-    session[:userid] = nil
-    session[:attributes] = nil
+    logout_response = OneLogin::RubySaml::SloLogoutresponse.new.create(settings, logout_request_id, nil, :RelayState => params[:RelayState])
+    redirect_to logout_response
   end
 
 end

app/views/layouts/application.html.erb

@@ -7,8 +7,6 @@
   <%= csrf_meta_tags %>
 </head>
 <body>
-
-<%= yield %>
-
+  <%= yield %>
 </body>
 </html>

app/views/saml/complete.html.erb

@@ -1 +1,29 @@
-<p><%= link_to "Login", :action=>"sso"%></p>
+<% if session[:user_id].present? %>
+  <p>Logged in.</p>
+
+  <% if @attrs.any? %>
+    <p>You have the following attributes:</p>
+    <table><thead><th>Name</th><th>Values</th></thead><tbody>
+
+    <% @attrs.each do |key,attr_value|  %>
+
+      <tr><td><%= key %></td>
+      <td>
+      <% if attr_value.any? %>
+          <ul>
+          <% attr_value.each do |val| %>
+              <li><%= val %></li>
+          <% end %>
+          </ul>
+      <% end %>
+      </td></tr>
+    <% end %>
+    </tbody>
+    </table>
+  <% end %>
+  <p><%= link_to "Logout", :action => "logout" %></p>
+  <p><%= link_to "Single Logout", :action => "logout", :slo => '1' %></p>
+
+<% else %>
+  <p><%= link_to "Login", :action=>"sso"%></p>
+<% end -%>

app/views/saml/index.html.erb

@@ -1,10 +1,15 @@
 Rails.application.routes.draw do
 
-  get '/', to: 'saml#index'
-  get '/saml', to: 'saml#sso'
-  post '/saml/acs', to: 'saml#acs'
-  get '/saml/metadata', to: 'saml#metadata'
-  get '/saml/logout', to: 'saml#logout'
+  resources :saml, only: :index do
+    collection do
+      get :sso
+      post :acs
+      get :metadata
+      get :logout
+    end
+  end
+
+  root 'saml#index'
 
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".