Commit 3ebea17
2017-11-10 19:50:39
1 parent
b30d063
Changed files (4)
airport
app
controllers
proof
app
controllers
saml-kit
lib
saml
kit
spec
saml
airport/app/controllers/sessions_controller.rb
@@ -34,8 +34,8 @@ class SessionsController < ApplicationController
end
def authentication_request
- builder = AuthenticationRequest::Builder.new
- builder.acs_url = assertion_consumer_service
- Saml::Kit::Request.encode(builder)
+ builder = Saml::Kit::AuthenticationRequest::Builder.new
+ builder.acs_url = session_url
+ Saml::Kit::Request.serialize(builder)
end
end
proof/app/controllers/sessions_controller.rb
@@ -39,7 +39,7 @@ class SessionsController < ApplicationController
end
def load_saml_request(raw_saml_request = params[:SAMLRequest])
- @saml_request = Saml::Kit::Request.decode(raw_saml_request)
+ @saml_request = Saml::Kit::Request.deserialize(raw_saml_request)
render_error(:forbidden, item: @saml_request) if @saml_request.invalid?
end
end
saml-kit/lib/saml/kit/request.rb
@@ -1,11 +1,11 @@
module Saml
module Kit
class Request
- def self.encode(document)
+ def self.serialize(document)
Saml::Kit::Content.encode_raw_saml(document.to_xml)
end
- def self.decode(raw_request)
+ def self.deserialize(raw_request)
request = Saml::Kit::Content.decode_raw_saml(raw_request)
AuthenticationRequest.new(request)
rescue
saml-kit/spec/saml/request_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
RSpec.describe Saml::Kit::Request do
- describe ".encode" do
+ describe ".serialize" do
subject { described_class }
it 'returns a compressed and base64 encoded document' do
@@ -9,11 +9,11 @@ RSpec.describe Saml::Kit::Request do
document = double(to_xml: xml)
expected_value = Base64.encode64(Zlib::Deflate.deflate(xml, 9)).gsub(/\n/, '')
- expect(subject.encode(document)).to eql(expected_value)
+ expect(subject.serialize(document)).to eql(expected_value)
end
end
- describe ".decode" do
+ describe ".deserialize" do
subject { described_class }
let(:issuer) { FFaker::Internet.http_url }
let(:registry) { instance_double(Saml::Kit::DefaultRegistry) }
@@ -31,15 +31,15 @@ RSpec.describe Saml::Kit::Request do
it 'decodes the raw_request' do
builder = Saml::Kit::AuthenticationRequest::Builder.new
builder.issuer = issuer
- raw_saml = subject.encode(builder)
+ raw_saml = subject.serialize(builder)
- result = subject.decode(raw_saml)
+ result = subject.deserialize(raw_saml)
expect(result.issuer).to eql(issuer)
expect(result).to be_valid
end
it 'returns an invalid request when the raw request is corrupted' do
- expect(subject.decode("nonsense")).to be_invalid
+ expect(subject.deserialize("nonsense")).to be_invalid
end
end
end