Commit fa4a778
2017-10-23 01:41:13
1 parent
00f070e
Changed files (11)
airport
app
controllers
config
initializers
spec
controllers
proof
app
controllers
config
initializers
saml-kit
lib
spec
airport/app/controllers/sessions_controller.rb
@@ -9,7 +9,7 @@ class SessionsController < ApplicationController
end
def create
- saml_response = Saml::Kit::SamlResponse.parse(params[:SAMLResponse])
+ saml_response = Saml::Kit::Response.parse(params[:SAMLResponse])
session[:user] = { id: saml_response.name_id }.merge(saml_response.attributes)
redirect_to dashboard_path
end
@@ -18,7 +18,7 @@ class SessionsController < ApplicationController
def query_params
{
- 'SAMLRequest' => Saml::Kit::SamlRequest.encode(authentication_request),
+ 'SAMLRequest' => Saml::Kit::Request.encode(authentication_request),
'RelayState' => JSON.generate(inbound_path: '/'),
}.map do |(x, y)|
"#{x}=#{CGI.escape(y)}"
airport/config/initializers/filter_parameter_logging.rb
@@ -1,4 +1,4 @@
# Be sure to restart your server when you modify this file.
# Configure sensitive parameters which will be filtered from the log file.
-Rails.application.config.filter_parameters += [:password]
+Rails.application.config.filter_parameters += [:password, 'SAMLResponse', 'SAMLRequest']
airport/spec/controllers/sessions_controller_spec.rb
@@ -8,7 +8,7 @@ describe SessionsController do
it 'generates a saml request and redirects to the auth host' do
travel_to 1.seconds.from_now
- allow(Saml::Kit::SamlRequest).to receive(:encode).and_return(saml_request)
+ allow(Saml::Kit::Request).to receive(:encode).and_return(saml_request)
allow(Rails.configuration.x).to receive(:authentication_host).and_return(auth_host)
get :new
@@ -27,7 +27,7 @@ describe SessionsController do
describe "#create" do
let(:saml_response) do
- Saml::Kit::SamlResponse::Builder.new(user, auth_request).build.encode
+ Saml::Kit::Response::Builder.new(user, auth_request).build.encode
end
let(:auth_request) { double(id: '1', issuer: 'issuer', acs_url: '') }
let(:user) { double(uuid: user_id, assertion_attributes: { email: email, blah: 'blah' }) }
proof/app/controllers/sessions_controller.rb
@@ -38,7 +38,7 @@ class SessionsController < ApplicationController
end
def validate_saml_request(raw_saml_request = params[:SAMLRequest])
- @saml_request = Saml::Kit::SamlRequest.decode(raw_saml_request)
+ @saml_request = Saml::Kit::Request.decode(raw_saml_request)
head(:forbidden) unless @saml_request.valid?
end
end
proof/config/initializers/filter_parameter_logging.rb
@@ -1,4 +1,4 @@
# Be sure to restart your server when you modify this file.
# Configure sensitive parameters which will be filtered from the log file.
-Rails.application.config.filter_parameters += [:password]
+Rails.application.config.filter_parameters += [:password, 'SAMLResponse', 'SAMLRequest']
saml-kit/lib/saml/kit/authentication_request.rb
@@ -28,7 +28,7 @@ module Saml
end
def response_for(user)
- SamlResponse::Builder.new(user, self).build
+ Response::Builder.new(user, self).build
end
class Builder
saml-kit/lib/saml/kit/saml_request.rb → saml-kit/lib/saml/kit/request.rb
@@ -1,6 +1,6 @@
module Saml
module Kit
- class SamlRequest
+ class Request
def self.encode(document)
Base64.encode64(compress(document.to_xml))
end
saml-kit/lib/saml/kit/saml_response.rb → saml-kit/lib/saml/kit/response.rb
@@ -1,6 +1,6 @@
module Saml
module Kit
- class SamlResponse
+ class Response
def initialize(xml)
@xml = xml
@xml_hash = Hash.from_xml(xml)
@@ -85,7 +85,7 @@ module Saml
end
def build
- SamlResponse.new(to_xml)
+ Response.new(to_xml)
end
private
saml-kit/lib/saml/kit.rb
@@ -8,8 +8,8 @@ require "active_support/core_ext/hash/conversions"
require "saml/kit/authentication_request"
require "saml/kit/configuration"
require "saml/kit/namespaces"
-require "saml/kit/saml_request"
-require "saml/kit/saml_response"
+require "saml/kit/request"
+require "saml/kit/response"
require "saml/kit/service_provider_registry"
module Saml
saml-kit/spec/saml/saml_request_spec.rb → saml-kit/spec/saml/request_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-RSpec.describe Saml::Kit::SamlRequest do
+RSpec.describe Saml::Kit::Request do
describe ".encode" do
subject { described_class }
saml-kit/spec/saml/saml_response_spec.rb → saml-kit/spec/saml/response_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-RSpec.describe Saml::Kit::SamlResponse do
+RSpec.describe Saml::Kit::Response do
describe "#acs_url" do
let(:acs_url) { "https://#{FFaker::Internet.domain_name}/acs" }
let(:user) { double(:user, uuid: SecureRandom.uuid, assertion_attributes: { }) }