gunark-rubycas-server 0.8.0.20090427 → 0.8.0.20090430

data/config.ru

@@ -3,17 +3,25 @@ require 'rack'
 
 $APP_NAME = 'rubycas-server'
 $APP_ROOT = File.dirname(File.expand_path(__FILE__))
-$: << $APP_ROOT + "/lib"
 
-require File.dirname(File.expand_path(__FILE__)) + '/lib/casserver'
+if File.exists?("#{$APP_ROOT}/tmp/debug.txt")
+  require 'ruby-debug'
+  Debugger.wait_connection = true
+  Debugger.start_remote
+end
+
+$: << $APP_ROOT + "/lib"
 
-$LOG = Logger.new("casserver.log")
-$LOG.level = Logger::DEBUG
+require 'casserver/load_picnic'
+require 'picnic'
+require 'casserver'
 
 CASServer.create
 
 if $CONF.uri_path
 	map($CONF.uri_path) do
+    # FIXME: this probably isn't the smartest way of remapping the themes dir to uri_path/themes
+    use Rack::Static, $CONF[:static] if $CONF[:static]
 		run CASServer
 	end
 else

data/config/hoe.rb

@@ -11,7 +11,7 @@ EXTRA_DEPENDENCIES = [
   'activesupport',
   'activerecord',
   'gettext',
-  ['picnic', '>= 0.7.999']
+  ['picnic', '>= 0.8.0.20090430']
 ]    # An array of rubygem dependencies [name, version]
 
 @config_file = "~/.rubyforge/user-config.yml"

data/lib/casserver/conf.rb

@@ -22,6 +22,20 @@ else
 end
 
 $AUTH = []
+
+unless $CONF[:authenticator]
+  err =  "
+  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+    You have not yet defined an authenticator for your CAS server!
+    Please consult the documentation and make the necessary changes to
+    your config file.
+
+  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+	"
+  raise Picnic::Config::Error, err
+end
+
 begin
   # attempt to instantiate the authenticator
   if $CONF[:authenticator].instance_of? Array
@@ -56,22 +70,9 @@ rescue NameError
   end
 end
 
-unless $CONF[:authenticator]
-  $stderr.puts
-  $stderr.puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-  $stderr.puts
-  $stderr.puts "You have not yet defined an authenticator for your CAS server!"
-  $stderr.puts "Please consult your config file for details (most likely in"
-  $stderr.puts "/etc/rubycas-server/config.yml)."
-  $stderr.puts
-  $stderr.puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-  exit 1
-end
 
-
-$CONF[:public_dir] = {
-  :path => "/themes",
-  :dir  => File.expand_path(File.dirname(__FILE__))+"/themes"
+$CONF[:static] = {
+  :urls => "/themes",
+  :root  => "#{$APP_ROOT}/public"
 }
 
-

data/lib/casserver/controllers.rb

@@ -426,24 +426,24 @@ module CASServer::Controllers
     end
   end
   
-  class Themes < R '/themes/(.+)'         
-    MIME_TYPES = {'.css' => 'text/css', '.js' => 'text/javascript', 
-                  '.jpg' => 'image/jpeg'}
-    PATH = $CONF.themes_dir || File.expand_path(File.dirname(__FILE__))+'/../themes'
-
-    def get(path)
-      headers['Content-Type'] = MIME_TYPES[path[/\.\w+$/, 0]] || "text/plain"
-      unless path.include? ".." # prevent directory traversal attacks
-        headers['X-Sendfile'] = "#{PATH}/#{path}"
-        data = File.read(headers['X-Sendfile']) 
-        headers['Content-Length'] = data.size.to_s # Rack Camping adapter chokes without this
-        return data
-      else
-        status = "403"
-        "403 - Invalid path"
-      end
-    end
-  end
+#  class Themes < R '/themes/(.+)'
+#    MIME_TYPES = {'.css' => 'text/css', '.js' => 'text/javascript',
+#                  '.jpg' => 'image/jpeg'}
+#    PATH = $CONF.themes_dir || File.expand_path(File.dirname(__FILE__))+'/../themes'
+#
+#    def get(path)
+#      headers['Content-Type'] = MIME_TYPES[path[/\.\w+$/, 0]] || "text/plain"
+#      unless path.include? ".." # prevent directory traversal attacks
+#        headers['X-Sendfile'] = "#{PATH}/#{path}"
+#        data = File.read(headers['X-Sendfile'])
+#        headers['Content-Length'] = data.size.to_s # Rack Camping adapter chokes without this
+#        return data
+#      else
+#        status = "403"
+#        "403 - Invalid path"
+#      end
+#    end
+#  end
   
   def response_status_from_error(error)
     case error.code.to_s

data/lib/casserver/models.rb

@@ -198,7 +198,12 @@ module CASServer::Models
   
   class ChangeServiceToText < V 0.71
     def self.up
-      change_column :casserver_st, :service, :text
+      # using change_column to change the column type from :string to :text
+      # doesn't seem to work, at least under MySQL, so we drop and re-create
+      # the column instead
+      remove_column :casserver_st, :service
+      say "WARNING: All existing service tickets are being deleted."
+      add_column :casserver_st, :service, :text
     end
     
     def self.down

data/lib/casserver/views.rb

@@ -17,6 +17,8 @@ module CASServer::Views
           title { "#{organization} #{_(' Central Login')}" }
           link(:rel => "stylesheet", :type => "text/css", :href => "/themes/cas.css")
           link(:rel => "stylesheet", :type => "text/css", :href => "/themes/#{current_theme}/theme.css")
+          link(:rel => "icon", :type => "image/png", :href => "/themes/#{current_theme}/favicon.png") if
+            File.exists?("#{$APP_ROOT}/public/themes/#{current_theme}/favicon.png")
         end
         body(:onload => "if (document.getElementById('username')) document.getElementById('username').focus()") do
           self << yield 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gunark-rubycas-server
 version: !ruby/object:Gem::Version 
-  version: 0.8.0.20090427
+  version: 0.8.0.20090430
 platform: ruby
 authors: 
 - Matt Zukowski
@@ -117,18 +117,18 @@ files:
 - lib/casserver/views.rb
 - lib/rubycas-server.rb
 - lib/rubycas-server/version.rb
-- lib/themes/cas.css
-- lib/themes/notice.png
-- lib/themes/ok.png
-- lib/themes/simple/bg.png
-- lib/themes/simple/login_box_bg.png
-- lib/themes/simple/logo.png
-- lib/themes/simple/theme.css
-- lib/themes/urbacon/bg.png
-- lib/themes/urbacon/login_box_bg.png
-- lib/themes/urbacon/logo.png
-- lib/themes/urbacon/theme.css
-- lib/themes/warning.png
+- public/themes/cas.css
+- public/themes/notice.png
+- public/themes/ok.png
+- public/themes/simple/bg.png
+- public/themes/simple/login_box_bg.png
+- public/themes/simple/logo.png
+- public/themes/simple/theme.css
+- public/themes/urbacon/bg.png
+- public/themes/urbacon/login_box_bg.png
+- public/themes/urbacon/logo.png
+- public/themes/urbacon/theme.css
+- public/themes/warning.png
 - po/de_DE/rubycas-server.po
 - po/es_ES/rubycas-server.po
 - po/fr_FR/rubycas-server.po