casino 2.0.4 → 2.0.5

data.tar.gz.sig

@@ -1 +1,2 @@
-%�hw�Z���;֫bu�W��}��{��#���b<�~H��`i���q2��I_k��CUޣ��
+�T+����~W����f`oYJVO��j��Z��t�Qv%L䕜&���������e���3�~Ao���gA�$z%6��r��8�N�QN|~[�0��jeN:׷��[]Oq�v��řyo�
+��� �?�V�|�d1�w�A���t�<��������d��7��ϝ�Tk�(-�d����3s�'�-�]7��遴�$�^I�u�=�W�d/�w�ע��ހq��������Q�X�9���y��zHM�n�γ^dY��

data/app/models/casino/service_ticket.rb

@@ -19,6 +19,13 @@ class CASino::ServiceTicket < ActiveRecord::Base
     self.delete_all(['created_at < ? AND consumed = ?', (CASino.config.service_ticket[:lifetime_consumed].seconds * 2).ago, true])
   end
 
+
+  def service=(service)
+    normalized_encoded_service = Addressable::URI.parse(service).normalize.to_str
+    super(normalized_encoded_service)
+  end
+
+
   def service_with_ticket_url
     service_uri = Addressable::URI.parse(self.service)
     service_uri.query_values = (service_uri.query_values(Array) || []) << ['ticket', self.ticket]

data/lib/casino/version.rb

@@ -1,3 +1,3 @@
 module CASino
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
 end

data/spec/model/service_ticket_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe CASino::ServiceTicket do
@@ -116,9 +118,33 @@ describe CASino::ServiceTicket do
   end
 
   describe '#service_with_ticket_url' do
-    it 'does not escape the url from the database' do
-      unconsumed_ticket.service = 'https://host.example.org/test.php?t=other&other=testing'
-      unconsumed_ticket.service_with_ticket_url.should eq('https://host.example.org/test.php?t=other&other=testing&ticket=ST-12345')
+    it 'appends the service ticket id to the querystring' do
+      unconsumed_ticket.service = 'https://host.example.org/test.php?iam=testing'
+      unconsumed_ticket.service_with_ticket_url.should eq('https://host.example.org/test.php?iam=testing&ticket=ST-12345')
+    end
+  end
+
+  describe '#service=' do
+    it 'encodes the url before writing to the database' do
+      unconsumed_ticket.service = 'https://example.org/this is a test/jö.png'
+      unconsumed_ticket.service.should eq('https://example.org/this%20is%20a%20test/j%C3%B6.png')
+    end
+
+    it 'does not encode the querystring symbols (&?=) before writing to the database' do
+      unconsumed_ticket.service = 'https://example.org/test.php?t=other&other=testing'
+      unconsumed_ticket.service.should eq('https://example.org/test.php?t=other&other=testing')
+    end
+
+    it 'does not encode the encoded string' do
+      unconsumed_ticket.service = 'https://example.org/this is a test/jö.png'
+      unconsumed_ticket.service = unconsumed_ticket.service
+      unconsumed_ticket.service.should eq('https://example.org/this%20is%20a%20test/j%C3%B6.png')
+    end
+
+    it 'does correctly reencode slashes' do
+      unconsumed_ticket.service = 'https://example.com/login?os_destination=http%3A%2F%2Fexample.com%2Fdisplay%2FTesting%2F%3Fa%3D1%26b%3D2'
+      unconsumed_ticket.service = unconsumed_ticket.service
+      unconsumed_ticket.service.should eq('https://example.com/login?os_destination=http://example.com/display/Testing/?a=1%26b=2')
     end
   end
 end

data/spec/processor/processor_concern/service_tickets_spec.rb

@@ -46,4 +46,4 @@ describe CASino::ProcessorConcern::ServiceTickets do
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: casino
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -38,7 +38,7 @@ cert_chain:
   b1VSdnUwRzgvWXlIVUFtSVUvV0tyanIxYmdjZjFWUnYKUjRLRDFNblVWL3Y1
   MDJwaU1sWG1qeE9XZGJLOHl2UUVIa3N1L3pqYkNqU3UrTTJrd0ZtV0dzeDVu
   eCtWZHc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara