synapses-cas 0.1.1 → 0.1.2

data/CHANGELOG

@@ -1,3 +1,24 @@
+=== 0.1.2 :: 2012-05-15
+
+* Button for password recovery has been added in login page.
+
+    The password recovery url must be defined in configuration file.
+    password_recovery_url: http://localhost:3000/users/password_recovery
+
+* Whitelist for ensure that only allowed clients can connect to cas server
+
+    To use this feature, you have to set the "service_whitelist" in your config file:
+    service_whitelist: http://localhost:3000,http://localhost:3001,http://localhost:3002
+    A config file example is available on /bin/cas_config.yml
+
+=== 0.1.1 :: 2012-05-11
+
+* Configuration default_locale parameter is used now.
+* You can switch between locales clicking on flags at login page. The locale is passed by parameters (?locale=pt) in URL.
+* The selected locale is saved in current session.
+* To start the cas server, you must type "synapses-cas" instead of "rubycas-server"
+* Default theme has been completely rewrite to use twitter bootstrap, including flash messages (error, success and info).
+
 === 0.1.0 :: 2012-05-10
 
 * First public release.

data/README.md

@@ -8,11 +8,14 @@ Other portions are copyright of their respective authors.
 ## Authors
 
 * Tiago Machado (tiago@synapses.com.br)
-* João Lucas (joaolucas@synapses.com.br
+* João Lucas (joaolucas@synapses.com.br)
 
 ## Differences between Synapses CAS and the original RubyCAS
 
-[0001] Changed the location of translations path at "localization.rb
+See CHANGELOG.
+
+![Default theme](https://dl.dropbox.com/s/e7sunyjrja63tv0/synapses-cas-theme.png)
+
 
 ## License
 

data/bin/cas_config.yml

@@ -483,6 +483,8 @@ organization: Synapses
 # if you prefer to have no extra text shown at the bottom of the login box.
 infoline: Powered by <a href="http://www.synapses.com.br/">Synapses</a>
 
+password_recovery_url: http://localhost:3000/users/password_recovery
+
 # Custom views directory. If set, this will be used instead of 'lib/casserver/views'.
 #custom_views: /path/to/custom/views
 
@@ -563,8 +565,13 @@ db_log:
 # is planned for a future release.
 
 enable_single_sign_out: true
-
-
+##### SERVICES #################################################################
+# You can restrict what services can authenticate against the CAS server.
+# By default any service can authenticate and a blank white list will also
+# allow any service to authenticate. Services are listed on a single line
+# separated by a comma.
+service_whitelist: http://localhost:3000,http://localhost:3001,http://localhost:3002
+#default_service: http://localhost:3000
 ##### OTHER ####################################################################
 
 # You can set various ticket expiry times (specify the value in seconds).

data/lib/casserver/server.rb

@@ -298,12 +298,16 @@ module CASServer
       @infoline = settings.config[:infoline]
       @custom_views = settings.config[:custom_views]
       @default_locale = settings.config[:default_locale]
+      @password_recovery_url = settings.config[:password_recovery_url]
       @template_engine = settings.config[:template_engine] || :erb
       if @template_engine != :erb
         require @template_engine
         @template_engine = @template_engine.to_sym
       end
 
+      # Synapses CAS 0.1.2 - Thanks to https://github.com/dyson/rubycas-server
+      @service_whitelist = CASServer::Utils::initialize_service_whitelist(settings.config[:service_whitelist])
+
       # Synapses CAS 0.1.1
       session[:locale] = params[:locale] || session[:locale] ||  @default_locale
 
@@ -324,7 +328,10 @@ module CASServer
       headers['Expires'] = (Time.now - 1.year).rfc2822
 
       # optional params
-      @service = clean_service_url(params['service'])
+      #@service = clean_service_url(params['service']) || settings.config[:default_service]
+
+      # Synapses CAS 0.1.2 - Whitelist
+      @service = CASServer::Utils::validate_service(clean_service_url(params['service']), @service_whitelist) || settings.config[:default_service]
       @renew = params['renew']
       @gateway = params['gateway'] == 'true' || params['gateway'] == '1'
 
@@ -414,7 +421,9 @@ module CASServer
       Utils::log_controller_action(self.class, params)
       
       # 2.2.1 (optional)
-      @service = clean_service_url(params['service'])
+
+      # Synapses CAS 0.1.2
+      @service = CASServer::Utils::validate_service(clean_service_url(params['service']), @service_whitelist) || settings.config[:default_service]
 
       # 2.2.2 (required)
       @username = params['username']
@@ -530,7 +539,10 @@ module CASServer
       # "logout" page, we take the user back to the login page with a "you have been logged out"
       # message, allowing for an opportunity to immediately log back in. This makes it
       # easier for the user to log out and log in as someone else.
-      @service = clean_service_url(params['service'] || params['destination'])
+
+      # Synapses CAS 0.1.2
+      @service = CASServer::Utils::validate_service(clean_service_url(params['service']), @service_whitelist)
+      @destination = params['destination']
       @continue_url = params['url']
 
       @gateway = params['gateway'] == 'true' || params['gateway'] == '1'
@@ -573,7 +585,10 @@ module CASServer
 
       @lt = generate_login_ticket
 
-      if @gateway && @service
+      # Synapses CAS 0.1.2
+      if @gateway && @destination
+        redirect @destination, 303
+      elsif @gateway && @service
         redirect @service, 303
       elsif @continue_url
         render @template_engine, :logout
@@ -621,7 +636,10 @@ module CASServer
 			CASServer::Utils::log_controller_action(self.class, params)
 			
 			# required
-			@service = clean_service_url(params['service'])
+			#@service = clean_service_url(params['service'])
+      # Synapses CAS 0.1.2
+      @service = CASServer::Utils::validate_service(clean_service_url(params['service']), @service_whitelist)
+
 			@ticket = params['ticket']
 			# optional
 			@renew = params['renew']
@@ -644,7 +662,9 @@ module CASServer
 			CASServer::Utils::log_controller_action(self.class, params)
 
 			# required
-			@service = clean_service_url(params['service'])
+			#@service = clean_service_url(params['service'])
+      # Synapses CAS 0.1.2
+      @service = CASServer::Utils::validate_service(clean_service_url(params['service']), @service_whitelist)
 			@ticket = params['ticket']
 			# optional
 			@pgt_url = params['pgtUrl']
@@ -675,7 +695,9 @@ module CASServer
       CASServer::Utils::log_controller_action(self.class, params)
 
       # required
-      @service = clean_service_url(params['service'])
+      #@service = clean_service_url(params['service'])
+      # Synapses CAS 0.1.2
+      @service = CASServer::Utils::validate_service(clean_service_url(params['service']), @service_whitelist)
       @ticket = params['ticket']
       # optional
       @pgt_url = params['pgtUrl']

data/lib/casserver/utils.rb

@@ -28,5 +28,29 @@ module CASServer
       $LOG.debug("Processing #{controller}::#{method} #{params2.inspect}")
     end
     module_function :log_controller_action
+
+    # Synapses CAS 0.1.2 - Thanks to https://github.com/dyson/rubycas-server
+    def initialize_service_whitelist(whitelist)
+      $LOG.debug("Initializing Service Whitelist")
+      whitelist = whitelist || ''
+      whitelist.split(',')
+    end
+    module_function :initialize_service_whitelist
+
+    # Synapses CAS 0.1.2 - Thanks to https://github.com/dyson/rubycas-server
+    def validate_service(service, whitelist)
+      $LOG.debug("Validating service \"#{service}\"")
+      if !whitelist.empty?
+        whitelist.each do |domain|
+          return service if service.to_s[0, domain.length] == domain # starts with
+        end
+      else
+        return service if whitelist.empty?
+      end
+      $LOG.warn("Service \"#{service}\" is not in service whitelist")
+      return nil
+    end
+    module_function :validate_service
   end
+
 end

data/lib/casserver/views/login.erb

@@ -24,6 +24,9 @@
             <input type="hidden" id="lt" name="lt" value="<%= escape_html @lt %>" />
             <input type="hidden" id="service" name="service" value="<%= escape_html @service %>" />
             <input type="submit" accesskey="l" value="<%= t.button.login %>" tabindex="4" id="login-submit" class="btn btn-primary"/>
+            <% if !@password_recovery_url.blank? %>
+                <a href="<%= @password_recovery_url %>" class='btn btn-danger'><%= t.button.password_recovery %></a>
+            <% end %>
           </fieldset>
         </form>
       </div>

data/locales/en.yml

@@ -24,3 +24,4 @@ label:
 
 button:
   login: "Login"
+  password_recovery: "Forgot your password?"

data/locales/pt.yml

@@ -24,3 +24,4 @@ label:
 
 button:
   login: "Entrar"
+  password_recovery: "Esqueci minha senha"

data/synapses-cas.gemspec

@@ -1,6 +1,6 @@
 $gemspec = Gem::Specification.new do |s|
   s.name     = 'synapses-cas'
-  s.version  = '0.1.1'
+  s.version  = '0.1.2'
   s.authors  = ["Synapses Group"]
   s.email    = ["tiago@synapses.com.br"]
   s.homepage = 'https://github.com/synapsesgroup/synapses-cas'
@@ -31,6 +31,9 @@ $gemspec = Gem::Specification.new do |s|
   s.add_dependency("sinatra", "~> 1.0")
   s.add_dependency("sinatra-r18n")
   s.add_dependency("crypt-isaac", "~> 0.9.1")
+  s.add_dependency("pg")
+  s.add_dependency("bcrypt-ruby")
+
 
   s.add_development_dependency("rack-test")
   s.add_development_dependency("capybara", '1.1.2')
@@ -39,6 +42,8 @@ $gemspec = Gem::Specification.new do |s|
   s.add_development_dependency("rake", "0.8.7")
   s.add_development_dependency("sqlite3", "~> 1.3.1")
 
+
+
   # for authenticator specs
   s.add_development_dependency("net-ldap", "~> 0.1.1")
   s.add_development_dependency("activeresource", ">= 2.3.12", "< 3.1")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synapses-cas
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-11 00:00:00.000000000 Z
+date: 2012-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -103,6 +103,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bcrypt-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement