trinidad 0.3.0 → 0.4.0

data/History.txt

@@ -1,3 +1,8 @@
+== 0.4.0 (2009-07-16)
+
+* support for ssl connections
+* support for ajp connections
+
 == 0.3.0 (2009-07-07)
 
 * project renamed due to tomcat legal issues

data/Rakefile

@@ -6,7 +6,7 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "trinidad"
     gem.summary = %Q{Simple library to run rails applications into an embedded Tomcat}
-    gem.email = "david.calavera@gmail.com"
+    gem.email = "calavera@apache.org"
     gem.homepage = "http://calavera.github.com/trinidad"
     gem.authors = ["David Calavera"]
     gem.rubyforge_project = 'trinidad'

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/trinidad.rb

@@ -4,6 +4,8 @@ $:.unshift(File.dirname(__FILE__)) unless
 require "java"
 require 'rubygems'
 
+require 'trinidad/core_ext'
+
 require 'trinidad/command_line_parser'
 require 'trinidad/jars'
 require 'trinidad/server'

data/lib/trinidad/command_line_parser.rb

@@ -9,7 +9,9 @@ module Trinidad
         :context_path => '/',
         :libs_dir => 'lib',
         :classes_dir => 'classes',
-        :config => 'config/tomcat.yml'
+        :config => 'config/tomcat.yml',
+        :ssl_port => 8443,
+        :ajp_port => 8009
       }
       
       parser = OptionParser.new do |opts|
@@ -41,10 +43,22 @@ module Trinidad
           default_options[:classes_dir] = v
         end        
 
+        opts.on('-s', '--ssl [SSL_PORT]', 'Enable secure socket layout',
+            "default port: #{default_options[:ssl_port]}") do |v|
+          ssl_port = v.nil? ? default_options.delete(:ssl_port) : v.to_i
+          default_options[:ssl] = {:port => ssl_port}
+        end
+        
+        opts.on('-a', '--ajp [AJP_PORT]', 'Enable ajp connections',
+            "default port: #{default_options[:ajp_port]}") do |v|
+          ajp_port = v.nil? ? default_options.delete(:ajp_port) : v.to_i
+          default_options[:ajp] = {:port => ajp_port} 
+        end
+
         opts.on('-f', '--config [CONFIG_FILE]', 'Configuration file',
             "default: #{default_options[:config]}") do |v|
           default_options[:config] = v if v
-          default_options.merge! YAML.load_file(default_options[:config])
+          default_options.deep_merge! YAML.load_file(default_options[:config])
         end
         
         opts.on('-v', '--version', 'display the current version') do

data/lib/trinidad/core_ext.rb

@@ -0,0 +1,32 @@
+Hash.class_eval do
+  # Merges self with another hash, recursively.
+  #
+  # This code was lovingly stolen from some random gem:
+  # http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html
+  #
+  # Thanks to whoever made it.
+  def deep_merge(hash)
+    target = dup
+
+    hash.keys.each do |key|
+      if hash[key].is_a? Hash and self[key].is_a? Hash
+        target[key] = target[key].deep_merge(hash[key])
+        next
+      end
+
+      target[key] = hash[key]
+    end
+
+    target
+  end
+  
+  def deep_merge!(second)
+    second.each_pair do |k,v|
+      if self[k].is_a?(Hash) and second[k].is_a?(Hash)
+        self[k].deep_merge!(second[k])
+      else
+        self[k] = second[k]
+      end
+    end
+  end
+end

data/lib/trinidad/jars.rb

@@ -17,6 +17,9 @@ module Trinidad
     include_package 'org.apache.catalina.loader'
     
     include_package 'org.apache.naming.resources'
+    
+    import 'org.apache.catalina.connector.Connector'
+    import 'sun.security.tools.KeyTool'
   end
   
   module Rack

data/lib/trinidad/server.rb

@@ -1,16 +1,24 @@
 module Trinidad
   class Server
     
-    @@defaults = {
-      :environment => 'development',
-      :context_path => '/',
-      :libs_dir => 'lib',
-      :classes_dir => 'classes',
-      :default_web_xml => 'config/web.xml',
-      :port => 3000,
-      :jruby_min_runtimes => 1,
-      :jruby_max_runtimes => 5
-    }
+    attr_reader :tomcat
+    
+    def default_options
+      {
+        :environment => 'development',
+        :context_path => '/',
+        :libs_dir => 'lib',
+        :classes_dir => 'classes',
+        :default_web_xml => 'config/web.xml',
+        :port => 3000,
+        :jruby_min_runtimes => 1,
+        :jruby_max_runtimes => 5,
+        :ssl => {
+          :keystore => 'ssl/keystore',
+          :keystorePass => 'waduswadus'
+        }
+      }
+    end
     
     def initialize(config = {})
       load_config(config)
@@ -19,13 +27,17 @@ module Trinidad
     end
     
     def load_config(config)
-      @config = @@defaults.merge!(config)
-      @config[:web_app_dir] = Dir.pwd
+      @config = {:web_app_dir => Dir.pwd}.merge(default_options).deep_merge(config)
+      
+      @config[:ssl][:keystore] = File.join(@config[:web_app_dir], @config[:ssl][:keystore])
     end
     
     def load_tomcat_server
       @tomcat = Trinidad::Tomcat::Tomcat.new
       @tomcat.setPort(@config[:port].to_i)
+      
+      add_ssl_connector if ssl_enabled?
+      add_ajp_connector if ajp_enabled?
     end
     
     def create_web_app
@@ -39,10 +51,70 @@ module Trinidad
       
       web_app.add_rack_context_listener
     end
+    
+    def add_service_connector(options, protocol = nil)
+      connector = Trinidad::Tomcat::Connector.new(protocol)
+
+      opts = options.dup
+      
+  		connector.scheme = opts.delete(:scheme) if opts[:scheme]
+  		connector.secure = opts.delete(:secure) || false
+  		connector.port = opts.delete(:port)
+  		
+  		options.each do |key, value|
+  		  connector.setProperty(key.to_s, value.to_s)
+		  end
+      
+      @tomcat.getService().addConnector(connector)
+    end
+    
+    def add_ajp_connector
+      add_service_connector(@config[:ajp], 'AJP/1.3')
+    end
+    
+    def add_ssl_connector
+  		options = @config[:ssl].merge({
+  		  :scheme => 'https', 
+  		  :secure => true,
+  		  :SSLEnabled => 'true',
+  		})
+  		add_service_connector(options)
+  		
+  		create_default_keystore unless File.exist?(@config[:ssl][:keystore])
+    end
+    
+    def ssl_enabled?
+      !@config[:ssl].nil? && !@config[:ssl][:port].nil? && @config[:ssl][:port].is_a?(Fixnum)
+    end
+    
+    def ajp_enabled?
+      !@config[:ajp].nil? && !@config[:ajp][:port].nil? && @config[:ajp][:port].is_a?(Fixnum)
+    end
+    
+    def create_default_keystore
+      keystore_file = java.io.File.new(@config[:ssl][:keystore])
+      
+      if (!keystore_file.parent_file.exists() &&
+              !keystore_file.parent_file.mkdir())
+          raise "Unable to create keystore folder: " + keystore_file.parent_file.canonical_path
+      end
+      
+      keytool_args = ["-genkey", 
+        "-alias", "localhost", 
+        "-dname", "CN=localhost, OU=Trinidad, O=Trinidad, C=ES", 
+        "-keyalg", "RSA",
+        "-validity", "365", 
+        "-storepass", "key", 
+        "-keystore", @config[:ssl][:keystore], 
+        "-storepass", @config[:ssl][:keystorePass],
+        "-keypass", @config[:ssl][:keystorePass]]
+              
+      Trinidad::Tomcat::KeyTool.main(keytool_args.to_java(:string))
+    end
 
     def start
       @tomcat.start
       @tomcat.getServer().await
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -10,4 +10,9 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 $:.unshift(File.dirname(__FILE__) + '/../trinidad-libs')
 
 require 'java'
-require 'trinidad'
+require 'trinidad'
+require 'mocha'
+
+Spec::Runner.configure do |config|
+  config.mock_with :mocha
+end

data/spec/trinidad/command_line_parser_spec.rb

@@ -29,4 +29,39 @@ describe Trinidad::CommandLineParser do
     options[:environment].should == 'production'
   end
   
+  it "should add default ssl port to options" do
+    ARGV = '--ssl'.split
+    
+    options = Trinidad::CommandLineParser.parse
+    options[:ssl].should == {:port => 8443}
+  end
+  
+  it "should add custom ssl port to options" do
+    ARGV = '--ssl 8843'.split
+    
+    options = Trinidad::CommandLineParser.parse
+    options[:ssl].should == {:port => 8843}
+  end
+  
+  it "should add ajp connection with default port to options" do
+    ARGV = '--ajp'.split
+    
+    options = Trinidad::CommandLineParser.parse
+    options[:ajp].should == {:port => 8009}
+  end
+  
+  it "should add ajp connection with coustom port to options" do
+    ARGV = '--ajp 8099'.split
+    
+    options = Trinidad::CommandLineParser.parse
+    options[:ajp].should == {:port => 8099}
+  end
+  
+  it "should merge ajp options from the config file" do
+    ARGV = "--ajp 8099 -f #{File.join(File.dirname(__FILE__), '..', 'web_app_mock', 'tomcat.yml')}".split
+    
+    options = Trinidad::CommandLineParser.parse
+    options[:ajp][:port].should == 8099
+    options[:ajp][:secure].should == true
+  end
 end

data/spec/trinidad/server_spec.rb

@@ -0,0 +1,42 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Trinidad::Server do
+  
+  it "should have ssl disabled when config param is nil" do
+    server = Trinidad::Server.new
+    server.ssl_enabled?.should == false
+  end
+  
+  it "should have ajp disabled when config param is nil" do
+    server = Trinidad::Server.new
+    server.ajp_enabled?.should == false
+  end
+  
+  it "should have ssl enabled when config param is a number" do
+    server = Trinidad::Server.new({:ssl => {:port => 8443},
+      :web_app_dir => File.join(File.dirname(__FILE__), '..', 'web_app_mock')})
+      
+    server.ssl_enabled?.should == true
+  end
+  
+  it "should have ajp enabled when config param is a number" do
+    server = Trinidad::Server.new({:ajp => {:port => 8009}})
+     
+    server.ajp_enabled?.should == true
+  end
+  
+  it "should have a connector with https scheme" do
+    server = Trinidad::Server.new({:ssl => {:port => 8443},
+      :web_app_dir => File.join(File.dirname(__FILE__), '..', 'web_app_mock')})
+      
+    server.tomcat.service.findConnectors().should have(1).connectors
+    server.tomcat.service.findConnectors()[0].scheme.should == 'https'
+  end
+  
+  it "should have an ajp connector enabled" do
+    server = Trinidad::Server.new({:ajp => {:port => 8009}})
+      
+    server.tomcat.service.findConnectors().should have(1).connectors
+    server.tomcat.service.findConnectors()[0].protocol.should == 'AJP/1.3'
+  end
+end

data/spec/trinidad/web_app_spec.rb

@@ -38,7 +38,7 @@ describe Trinidad::WebApp do
 
   it "should add a filter from the default web.xml" do
     start_context_with_web_xml
-    @web_app.context.findFilterDefs().size().should == 1
+    @web_app.context.findFilterDefs().should have(1).filters
   end
 
   it "shouldn't duplicate init params" do
@@ -55,12 +55,12 @@ describe Trinidad::WebApp do
 
   it "should configure rack filter" do
     @web_app.add_rack_filter
-    @web_app.context.findFilterDefs().size().should == 1
+    @web_app.context.findFilterDefs().should have(1).filters
   end
 
   it "should configure rack listener" do
     @web_app.add_rack_context_listener
-    @web_app.context.findApplicationListeners().size().should == 1
+    @web_app.context.findApplicationListeners().should have(1).listeners
   end
 
   it "should have rack filter already configured" do
@@ -68,7 +68,7 @@ describe Trinidad::WebApp do
     @web_app.rack_filter_configured?().should == true
 
     @web_app.add_rack_filter
-    @web_app.context.findFilterDefs().size().should == 0
+    @web_app.context.findFilterDefs().should have(0).filters
   end
 
   it "should have rack listener already configured" do
@@ -76,7 +76,7 @@ describe Trinidad::WebApp do
     @web_app.rack_listener_configured?().should == true
 
     @web_app.add_rack_context_listener
-    @web_app.context.findApplicationListeners().size().should == 0
+    @web_app.context.findApplicationListeners().should have(0).listeners
   end
 
   def start_context_with_web_xml

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trinidad
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - David Calavera
@@ -9,12 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-07 00:00:00 +02:00
+date: 2009-07-16 00:00:00 +02:00
 default_executable: trinidad
 dependencies: []
 
 description: 
-email: david.calavera@gmail.com
+email: calavera@apache.org
 executables: 
 - trinidad
 extensions: []
@@ -31,6 +31,7 @@ files:
 - bin/trinidad
 - lib/trinidad.rb
 - lib/trinidad/command_line_parser.rb
+- lib/trinidad/core_ext.rb
 - lib/trinidad/jars.rb
 - lib/trinidad/server.rb
 - lib/trinidad/web_app.rb
@@ -76,5 +77,6 @@ specification_version: 3
 summary: Simple library to run rails applications into an embedded Tomcat
 test_files: 
 - spec/spec_helper.rb
+- spec/trinidad/server_spec.rb
 - spec/trinidad/command_line_parser_spec.rb
 - spec/trinidad/web_app_spec.rb