gunark-rubycas-server 0.6.99.336 → 0.7.999.20090212

data/lib/casserver/conf.rb

@@ -1,112 +1,77 @@
-# load configuration
 
-begin
-  if $CONFIG_FILE
-    conf_file = $CONFIG_FILE
-  else
-    conf_file = etc_conf = "/etc/rubycas-server/config.yml"
-    unless File.exists? conf_file 
-      # can use local config.yml file in case we're running non-gem installation
-      conf_file = File.dirname(File.expand_path(__FILE__))+"/../../config.yml"
-    end
-  end
+conf_defaults = {
+  :expire_sessions => false,
+  :login_ticket_expiry => 5.minutes,
+  :service_ticket_expiry => 5.minutes, # CAS Protocol Spec, sec. 3.2.1 (recommended expiry time)
+  :proxy_granting_ticket_expiry => 48.hours,
+  :ticket_granting_ticket_expiry => 48.hours,
+  :log => {:file => 'casserver.log', :level => 'DEBUG'},
+  :uri_path => "/"
+}
 
-  unless File.exists? conf_file  
-    require 'fileutils'
-    
-    example_conf_file = File.expand_path(File.dirname(File.expand_path(__FILE__))+"/../../config.example.yml")
-    puts "\nCAS SERVER NOT YET CONFIGURED!!!\n"
-    puts "\nAttempting to copy sample configuration from '#{example_conf_file}' to '#{etc_conf}'...\n"
-    
-    begin
-      FileUtils.mkdir("/etc/rubycas-server") unless File.exists? "/etc/rubycas-server"
-      FileUtils.cp(example_conf_file, etc_conf)
-    rescue Errno::EACCES
-      puts "\nIt appears that you do not have permissions to create the '#{etc_conf}' file. Try running this command using sudo (as root).\n"
-      exit 2
-    rescue
-      puts "\nFor some reason the '#{etc_conf}' file could not be created. You'll have to copy the file manually." +
-        " Use '#{example_conf_file}' as a template.\n"  
-      exit 2
-    end
-    
-    puts "\nA sample configuration has been created for you in '#{etc_conf}'. Please edit this file to" +
-      " suit your needs and then run rubycas-server again.\n"
-    exit 1
+if $CONF
+  $CONF.merge_defaults(conf_defaults)
+else
+  unless $APP_NAME && $APP_ROOT
+    raise "Can't load the RubyCAS-Server configuration because $APP_NAME and/or $APP_ROOT are not defined."
   end
- 
-  loaded_conf = HashWithIndifferentAccess.new(YAML.load_file(conf_file))
-  
-  if $CONF
-    $CONF = loaded_conf.merge $CONF
+
+  require 'picnic/conf'
+  $CONF = Picnic::Conf.new(conf_defaults)
+  $CONF.load_from_file($APP_NAME, $APP_ROOT)
+end
+
+$AUTH = []
+begin
+  # attempt to instantiate the authenticator
+  if $CONF[:authenticator].instance_of? Array
+    $CONF[:authenticator].each { |authenticator| $AUTH << authenticator[:class].constantize.new}
   else
-    $CONF = loaded_conf
+    $AUTH << $CONF[:authenticator][:class].constantize.new
   end
- 
+rescue NameError
   if $CONF[:authenticator].instance_of? Array
-    $CONF[:authenticator].each_index { |auth_index| $CONF[:authenticator][auth_index] = HashWithIndifferentAccess.new($CONF[:authenticator][auth_index])}
-  end
-
-  $AUTH = []
-  begin
-    # attempt to instantiate the authenticator
-    if $CONF[:authenticator].instance_of? Array
-      $CONF[:authenticator].each { |authenticator| $AUTH << authenticator[:class].constantize.new}
-    else
-      $AUTH << $CONF[:authenticator][:class].constantize.new
-    end
-  rescue NameError
-    if $CONF[:authenticator].instance_of? Array
-      $CONF[:authenticator].each do |authenticator|
-        if !authenticator[:source].nil?
-          # config.yml explicitly names source file
-          require authenticator[:source]
-        else
-          # the authenticator class hasn't yet been loaded, so lets try to load it from the casserver/authenticators directory
-          auth_rb = authenticator[:class].underscore.gsub('cas_server/', '')
-          require 'casserver/'+auth_rb
-        end
-        $AUTH << authenticator[:class].constantize.new
-      end
-    else
-      if !$CONF[:authenticator][:source].nil?
+    $CONF[:authenticator].each do |authenticator|
+      if !authenticator[:source].nil?
         # config.yml explicitly names source file
-        require $CONF[:authenticator][:source]
+        require authenticator[:source]
       else
         # the authenticator class hasn't yet been loaded, so lets try to load it from the casserver/authenticators directory
-        auth_rb = $CONF[:authenticator][:class].underscore.gsub('cas_server/', '')
+        auth_rb = authenticator[:class].underscore.gsub('cas_server/', '')
         require 'casserver/'+auth_rb
       end
-
-      $AUTH << $CONF[:authenticator][:class].constantize.new
+      $AUTH << authenticator[:class].constantize.new
     end
+  else
+    if $CONF[:authenticator][:source]
+      # config.yml explicitly names source file
+      require $CONF[:authenticator][:source]
+    else
+      # the authenticator class hasn't yet been loaded, so lets try to load it from the casserver/authenticators directory
+      auth_rb = $CONF[:authenticator][:class].underscore.gsub('cas_server/', '')
+      require 'casserver/'+auth_rb
+    end
+
+    $AUTH << $CONF[:authenticator][:class].constantize.new
   end
-rescue
-    raise "Your RubyCAS-Server configuration may be invalid."+
-      " Please double-check check your config.yml file."+
-      " Make sure that you are using spaces instead of tabs for your indentation!!" +
-      "\n\nUNDERLYING EXCEPTION:\n#{$!}"
 end
 
-module CASServer
-  module Conf
-    DEFAULTS = {
-      :expire_sessions => false,
-      :login_ticket_expiry => 5.minutes,
-      :service_ticket_expiry => 5.minutes, # CAS Protocol Spec, sec. 3.2.1 (recommended expiry time)
-      :proxy_granting_ticket_expiry => 48.hours,
-      :ticket_granting_ticket_expiry => 48.hours,
-      :log => {:file => 'casserver.log', :level => 'DEBUG'},
-      :uri_path => "/"
-    }
-  
-    def [](key)
-      $CONF[key] || DEFAULTS[key]
-    end
-    module_function "[]".intern
-    
-    def self.method_missing(method, *args)
-      self[method]
-    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"
+}
+
+

data/lib/casserver/controllers.rb

@@ -1,12 +1,14 @@
 # The #.#.# comments (e.g. "2.1.3") refer to section numbers in the CAS protocol spec
 # under http://www.ja-sig.org/products/cas/overview/protocol/index.html
 
+require 'casserver/cas'
+
 module CASServer::Controllers
 
   # 2.1
   class Login < R '/', '/login'
     include CASServer::CAS
-    
+
     # 2.1.1
     def get
       CASServer::Utils::log_controller_action(self.class, @input)
@@ -27,12 +29,12 @@ module CASServer::Controllers
       
       if tgt and !tgt_error
         @message = {:type => 'notice', 
-          :message => %{You are currently logged in as "#{tgt.username}". If this is not you, please log in below.}}
+          :message => _("You are currently logged in as '%s'. If this is not you, please log in below.") % tgt.username }
       end
 
       if @input['redirection_loop_intercepted']
         @message = {:type => 'mistake', 
-          :message => %{The client and server are unable to negotiate authentication. Please try logging in again later.}}
+          :message => _("The client and server are unable to negotiate authentication. Please try logging in again later.")}
       end
       
       begin
@@ -49,12 +51,12 @@ module CASServer::Controllers
         elsif @gateway
             $LOG.error("This is a gateway request but no service parameter was given!")
             @message = {:type => 'mistake', 
-              :message => "The server cannot fulfill this gateway request because no service parameter was given."}
+              :message => _("The server cannot fulfill this gateway request because no service parameter was given.")}
         end
       rescue URI::InvalidURIError
         $LOG.error("The service '#{@service}' is not a valid URI!")
         @message = {:type => 'mistake', 
-          :message => "The target service your browser supplied appears to be invalid. Please contact your system administrator for help."}
+          :message => _("The target service your browser supplied appears to be invalid. Please contact your system administrator for help.")}
       end
       
       lt = generate_login_ticket
@@ -71,8 +73,8 @@ module CASServer::Controllers
       # The optional 'submitToURI' parameter can be given to explicitly set the
       # action for the form, otherwise the server will try to guess this for you.
       if @input.has_key? 'onlyLoginForm'
-        if env['HTTP_HOST']
-          guessed_login_uri = "http#{env['HTTPS'] && env['HTTPS'] == 'on' ? 's' : ''}://#{env['REQUEST_URI']}#{self / '/login'}"
+        if @env['HTTP_HOST']
+          guessed_login_uri = "http#{@env['HTTPS'] && @env['HTTPS'] == 'on' ? 's' : ''}://#{@env['REQUEST_URI']}#{self / '/login'}"
         else
           guessed_login_uri = nil
         end
@@ -83,7 +85,7 @@ module CASServer::Controllers
           render :login_form
         else
           @status = 500
-          "Could not guess the CAS login URI. Please supply a submitToURI parameter with your request."
+          _("Could not guess the CAS login URI. Please supply a submitToURI parameter with your request.")
         end
       else
         render :login
@@ -122,9 +124,9 @@ module CASServer::Controllers
       @lt = generate_login_ticket.ticket
       
       if $CONF[:authenticator].instance_of? Array
-        $AUTH.each_index {|auth_index| $AUTH[auth_index].configure(CASServer::Conf.authenticator[auth_index])}
+        $AUTH.each_index {|auth_index| $AUTH[auth_index].configure($CONF.authenticator[auth_index])}
       else
-        $AUTH[0].configure(CASServer::Conf.authenticator)
+        $AUTH[0].configure($CONF.authenticator)
       end
 
       $LOG.debug("Logging in with username: #{@username}, lt: #{@lt}, service: #{@service}, auth: #{$AUTH}")
@@ -138,7 +140,7 @@ module CASServer::Controllers
             :username => @username, 
             :password => @password, 
             :service => @service,
-            :request => env
+            :request => @env
           )
           if credentials_are_valid
             extra_attributes.merge!(auth.extra_attributes) unless auth.extra_attributes.blank?
@@ -159,17 +161,17 @@ module CASServer::Controllers
         # 3.6 (ticket-granting cookie)
         tgt = generate_ticket_granting_ticket(@username, extra_attributes)
         
-        if CASServer::Conf.expire_sessions
-          expires = CASServer::Conf.ticket_granting_ticket_expiry.to_i.from_now
+        if $CONF.expire_sessions
+          expires = $CONF.ticket_granting_ticket_expiry.to_i.from_now
           expiry_info = " It will expire on #{expires}."
         else
           expiry_info = " It will not expire."
         end
         
-        if CASServer::Conf.expire_sessions
+        if $CONF.expire_sessions
           @cookies[:tgt] = {
             :value => tgt.to_s, 
-            :expires => Time.now + CASServer::Conf.ticket_granting_ticket_expiry
+            :expires => Time.now + $CONF.ticket_granting_ticket_expiry
           }
         else
           @cookies[:tgt] = tgt.to_s
@@ -179,7 +181,7 @@ module CASServer::Controllers
                 
         if @service.blank?
           $LOG.info("Successfully authenticated user '#{@username}' at '#{tgt.client_hostname}'. No service param was given, so we will not redirect.")
-          @message = {:type => 'confirmation', :message => "You have successfully logged in."}
+          @message = {:type => 'confirmation', :message => _("You have successfully logged in.")}
         else
           @st = generate_service_ticket(@service, @username, tgt)
           begin
@@ -189,12 +191,13 @@ module CASServer::Controllers
             return redirect(service_with_ticket, :status => 303) # response code 303 means "See Other" (see Appendix B in CAS Protocol spec)
           rescue URI::InvalidURIError
             $LOG.error("The service '#{@service}' is not a valid URI!")
-            @message = {:type => 'mistake', :message => "The target service your browser supplied appears to be invalid. Please contact your system administrator for help."}
+            @message = {:type => 'mistake', 
+              :message => _("The target service your browser supplied appears to be invalid. Please contact your system administrator for help.")}
           end
         end
       else
         $LOG.warn("Invalid credentials given for user '#{@username}'")
-        @message = {:type => 'mistake', :message => "Incorrect username or password."}
+        @message = {:type => 'mistake', :message => _("Incorrect username or password.")}
         @status = 401
       end
       
@@ -233,18 +236,18 @@ module CASServer::Controllers
             pgt.destroy
           end
           
-          if CASServer::Conf.enable_single_sign_out
+          if $CONF.enable_single_sign_out
             $LOG.debug("Deleting Service/Proxy Tickets for '#{tgt}' for user '#{tgt.username}'")
             tgt.service_tickets.each do |st|
               send_logout_notification_for_service_ticket(st)
               # TODO: Maybe we should do some special handling if send_logout_notification_for_service_ticket fails? 
-              #       Note that the method returns false if the POST results in a non-200 HTTP response.
-              $LOG.debug "Deleting #{st.class} #{st.ticket.inspect}."
+              #       (the above method returns false if the POST results in a non-200 HTTP response).
+              $LOG.debug "Deleting #{st.class.name.demodulize} #{st.ticket.inspect}."
               st.destroy
             end
           end
           
-          $LOG.debug("Deleting Ticket-Granting Ticket '#{tgt}' for user '#{tgt.username}'")
+          $LOG.debug("Deleting #{tgt.class.name.demodulize} '#{tgt}' for user '#{tgt.username}'")
           tgt.destroy
         end  
         
@@ -253,10 +256,10 @@ module CASServer::Controllers
         $LOG.warn("User tried to log out without a valid ticket-granting ticket.")
       end
       
-      @message = {:type => 'confirmation', :message => "You have successfully logged out."}
+      @message = {:type => 'confirmation', :message => _("You have successfully logged out.")}
       
       @message[:message] << 
-        " Please click on the following link to continue:" if @continue_url
+        _(" Please click on the following link to continue:") if @continue_url
       
       @lt = generate_login_ticket
       
@@ -363,7 +366,7 @@ module CASServer::Controllers
         
         @extra_attributes = t.ticket_granting_ticket.extra_attributes || {}
       end
-      $LOG.error @error
+      
       @status = response_status_from_error(@error) if @error
 
      render :proxy_validate
@@ -406,7 +409,7 @@ module CASServer::Controllers
       CASServer::Utils::log_controller_action(self.class, @input)
       $LOG.error("Tried to use login ticket dispenser with get method!")
       @status = 422
-      "To generate a login ticket, you must make a POST request."
+      _("To generate a login ticket, you must make a POST request.")
     end
     
     # Renders a page with a login ticket (and only the login ticket)
@@ -415,7 +418,7 @@ module CASServer::Controllers
       CASServer::Utils::log_controller_action(self.class, @input)
       lt = generate_login_ticket
       
-      $LOG.debug("Dispensing login ticket #{lt} to host #{(env['HTTP_X_FORWARDED_FOR'] || env['REMOTE_HOST'] || env['REMOTE_ADDR']).inspect}")
+      $LOG.debug("Dispensing login ticket #{lt} to host #{(@env['HTTP_X_FORWARDED_FOR'] || @env['REMOTE_HOST'] || @env['REMOTE_ADDR']).inspect}")
       
       @lt = lt.ticket
       
@@ -426,13 +429,17 @@ module CASServer::Controllers
   class Themes < R '/themes/(.+)'         
     MIME_TYPES = {'.css' => 'text/css', '.js' => 'text/javascript', 
                   '.jpg' => 'image/jpeg'}
-    PATH = CASServer::Conf.themes_dir || File.expand_path(File.dirname(__FILE__))+'/../themes'
+    PATH = $CONF.themes_dir || File.expand_path(File.dirname(__FILE__))+'/../themes'
 
-    def get(path)@headers['Content-Type'] = MIME_TYPES[path[/\.\w+$/, 0]] || "text/plain"
+    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}"
+        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"
+        status = "403"
         "403 - Invalid path"
       end
     end

data/lib/casserver/environment.rb

@@ -1,26 +1,31 @@
 $: << File.dirname(File.expand_path(__FILE__))
 
 # Try to load local version of Picnic if possible (for development purposes)
-$: << File.dirname(File.expand_path(__FILE__))+"/../../../picnic/lib"
-$: << File.dirname(File.expand_path(__FILE__))+"/../../vendor/picnic/lib"
+alt_picic_paths = []
+alt_picic_paths << File.dirname(File.expand_path(__FILE__))+"/../../../picnic/lib"
+alt_picic_paths << File.dirname(File.expand_path(__FILE__))+"/../../vendor/picnic/lib"
 
 begin
+  require 'active_record'
+rescue LoadError
+  require 'rubygems'
+  require 'active_record'
+end
+
+if alt_picic_paths.any?{|path| File.exists? "#{path}/picnic.rb" }
+  alt_picic_paths.each{|path| $: << path}
   require 'picnic'
-rescue LoadError => e
-  # make sure that the LoadError was about picnic and not something else
-  raise e unless e.to_s =~ /picnic/
-  
+else
   require 'rubygems'
   
   # make things backwards-compatible for rubygems < 0.9.0
-  unless Object.method_defined? :gem
+  if respond_to?(:require_gem)
+    puts "WARNING: aliasing gem to require_gem in #{__FILE__} -- you should update your RubyGems system!"
     alias gem require_gem
   end
-  
-  gem 'picnic'
-  
+ 
   require 'picnic'
 end
 
 # used for serializing user extra_attributes (see #service_validate in views.rb)
-require 'yaml'
+require 'yaml'

data/lib/casserver/localization.rb

@@ -0,0 +1,62 @@
+require "gettext"
+require "gettext/cgi"
+
+module CASServer
+  include GetText
+  bindtextdomain("rubycas-server", :path => File.join(File.dirname(File.expand_path(__FILE__)), "../locale"))
+  
+  def service(*a)
+    GetText.locale = determine_locale
+    #puts GetText.locale.inspect
+    super(*a)
+  end
+  
+  def determine_locale
+    lang = ($CONF[:default_locale] || "en")
+    lang = @input['lang'] unless @input['lang'].blank? 
+    lang ||= @cookies['lang'] unless @cookies['lang'].blank? 
+    lang ||= @env.HTTP_ACCEPT_LANGUAGE unless @env.HTTP_ACCEPT_LANGUAGE.blank?
+    lang ||= @env.HTTP_USER_AGENT =~ /[^a-z]([a-z]{2}(-[a-z]{2})?)[^a-z]/i && 
+              lang = $~[1] unless @env.HTTP_USER_AGENT.blank?
+    @cookies['lang'] = lang
+    
+    lang.gsub!('_','-')
+    
+    # TODO: Need to confirm that this method of splitting the accepted
+    #       language string is correct.
+    if lang =~ /[,;\|]/
+      langs = lang.split(/[,;\|]/)
+    else
+      langs = [lang]
+    end
+    
+    # TODO: This method of selecting the desired language might not be
+    #       standards-compliant. For example, http://www.w3.org/TR/ltli/
+    #       suggests that de-de and de-*-DE might be acceptable identifiers
+    #       for selecting various wildcards. The algorithm below does not
+    #       currently support anything like this.
+    
+    available = available_locales
+    
+    # Try to pick a locale exactly matching the desired identifier, otherwise
+    # fall back to locale without region (i.e. given "en-US; de-DE", we would
+    # first look for "en-US", then "en", then "de-DE", then "de").
+    
+    chosen_lang = nil
+    langs.each do |l| 
+      a = available.find{|a| a == l || a =~ Regexp.new("#{l}-\w*")}
+      if a
+        chosen_lang = a
+        break
+      end
+    end
+    
+    chosen_lang = "en" if chosen_lang.blank?
+    
+    return chosen_lang
+  end
+  
+  def available_locales
+    (Dir.glob(File.join(File.dirname(File.expand_path(__FILE__)), "../locale/[a-z]*")).map{|path| File.basename(path)} << "en").uniq.collect{|l| l.gsub('_','-')}
+  end
+end

data/lib/casserver/models.rb

@@ -1,4 +1,4 @@
-require 'camping/db'
+require 'camping/ar'
 
 module CASServer::Models
   
@@ -215,4 +215,4 @@ module CASServer::Models
       remove_column :casserver_tgt, :extra_attributes
     end
   end
-end
+end

data/lib/casserver/postambles.rb

@@ -9,11 +9,11 @@ module CASServer
       # TODO: verify the certificate's validity
       # example of how to do this is here: http://pablotron.org/download/ruri-20050331.rb
       
-      cert_path = CASServer::Conf.ssl_cert
-      key_path = CASServer::Conf.ssl_key || CASServer::Conf.ssl_cert
+      cert_path = $CONF.ssl_cert
+      key_path = $CONF.ssl_key || $CONF.ssl_cert
         # look for the key in the ssl_cert if no ssl_key is specified
       
-      webrick_options = {:BindAddress => "0.0.0.0", :Port => CASServer::Conf.port}
+      webrick_options = {:BindAddress => "0.0.0.0", :Port => $CONF.port}
       
       unless cert_path.nil? && key_path.nil?
         raise "'#{cert_path}' is not a valid ssl certificate. Your 'ssl_cert' configuration" +
@@ -41,9 +41,9 @@ module CASServer
       end
       
       CASServer.create
-      s.mount "#{CASServer::Conf.uri_path}", WEBrick::CampingHandler, CASServer
+      s.mount "#{$CONF.uri_path}", WEBrick::CampingHandler, CASServer
       
-      puts "\n** CASServer is running at http#{webrick_options[:SSLEnable] ? 's' : ''}://#{Socket.gethostname}:#{CASServer::Conf.port}#{CASServer::Conf.uri_path} and logging to '#{CASServer::Conf.log[:file]}'\n\n"
+      puts "\n** CASServer is running at http#{webrick_options[:SSLEnable] ? 's' : ''}://#{Socket.gethostname}:#{$CONF.port}#{$CONF.uri_path} and logging to '#{$CONF.log[:file]}'\n\n"
     
       # This lets Ctrl+C shut down your server
       trap(:INT) do
@@ -79,19 +79,19 @@ module CASServer
       
       CASServer.create
       
-      puts "\n** CASServer is starting. Look in '#{CASServer::Conf.log[:file]}' for further notices."
+      puts "\n** CASServer is starting. Look in '#{$CONF.log[:file]}' for further notices."
       
-      settings = {:host => "0.0.0.0", :log_file => CASServer::Conf.log[:file], :cwd => $CASSERVER_HOME}
+      settings = {:host => "0.0.0.0", :log_file => $CONF.log[:file], :cwd => $CASSERVER_HOME}
       
       # need to close all IOs before daemonizing
       $LOG.close if $DAEMONIZE
       
       begin
         config = Mongrel::Configurator.new settings  do
-          daemonize :log_file => CASServer::Conf.log[:file], :cwd => $CASSERVER_HOME if $DAEMONIZE
+          daemonize :log_file => $CONF.log[:file], :cwd => $CASSERVER_HOME if $DAEMONIZE
           
-          listener :port => CASServer::Conf.port do
-            uri CASServer::Conf.uri_path, :handler => Mongrel::Camping::CampingHandler.new(CASServer)
+          listener :port => $CONF.port do
+            uri $CONF.uri_path, :handler => Mongrel::Camping::CampingHandler.new(CASServer)
             setup_signals
           end
         end
@@ -112,7 +112,7 @@ module CASServer
         end
       end
       
-      puts "\n** CASServer is running at http://localhost:#{CASServer::Conf.port}#{CASServer::Conf.uri_path} and logging to '#{CASServer::Conf.log[:file]}'"
+      puts "\n** CASServer is running at http://localhost:#{$CONF.port}#{$CONF.uri_path} and logging to '#{$CONF.log[:file]}'"
       config.join
 
       clear_pid_file
@@ -137,7 +137,7 @@ module CASServer
     
     private
     def check_log_writable
-      log_file = CASServer::Conf.log['file']
+      log_file = $CONF.log['file']
       begin
         f = open(log_file, 'w')
       rescue

data/lib/casserver/version.rb

@@ -1,8 +1,8 @@
 module CASServer
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 6
-    TINY  = 99
+    MINOR = 7
+    TINY  = 999
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end