redirect_engine 0.0.2 → 0.0.4

data/Rakefile

@@ -1 +1,25 @@
+tool_name = 'redirect_engine'
+
 require "bundler/gem_tasks"
+require File.expand_path("../lib/#{tool_name}/version", __FILE__)
+
+# task :default => :it
+task :default => 'ctraut:qwe'
+
+namespace :ctraut do
+  desc 'Some experiments by ctraut'
+  task :qwe do
+    puts 'Hello rake world.'
+    puts "Version = #{RedirectEngine::VERSION}"
+  end
+end
+
+task :ready_for_the_day => [:turn_off_alarm, :groom_myself, :make_coffee, :walk_dog] do
+  puts 'Ready for the day!'
+end
+
+desc 'make it all'
+task :it do
+  system "gem build #{tool_name}.gemspec"
+  system "gem push #{tool_name}-#{RedirectEngine::VERSION}.gem"
+end

data/bin/deploy_caller

@@ -0,0 +1,68 @@
+#!/bin/bash -l
+# /export/home/ctraut/Projekte/tuifly/deployment_engine/bin/deploy_caller -c ctraut/entwicklungen/samba_test_recipe.rb -e ctraut
+
+VERSION_RUBY=1.9.2
+WORKSPACE=.
+DE=`dirname $0`/de
+rvm_path="$HOME/Projekte/tuifly/rvm"
+RECIPE=./recipe/deploy.rb
+CDB=../db
+
+VERSION=0.0.1
+
+usage=$(
+cat <<EOF
+$0 [OPTION]
+-b VALUE    set cdb path to VALUE
+-c VALUE    set recipe name to VALUE
+-e VALUE    set env to VALUE
+-v VALUE    set project software version to VALUE
+-r VALUE    set rvm_path to VALUE
+-d VALUE    set de executable to VALUE
+-g VALUE    set deployment engine version to VALUE
+EOF
+)
+
+while getopts "b:c:e:v:r:d:" OPTION; do
+  case "$OPTION" in
+    b)
+      CDB="$OPTARG"
+      ;;
+    c)
+      RECIPE="$OPTARG"
+      ;;
+    e)
+      ENVIRONMENT="$OPTARG"
+      ;;
+    v)
+      VERSION="$OPTARG"
+      ;;
+    r)
+      rvm_path="$OPTARG"
+      ;;
+    d)
+      DE="$OPTARG"
+      ;;
+    g)
+      VERSION_DEPENGINE="_$OPTARG_"
+      ;;
+    *)
+      echo "unrecognized option"
+      echo "$usage"
+      exit 1
+      ;;
+  esac
+done
+
+if [ "$rvm_path" = "unset" ]; then
+  echo "$usage"
+  exit 1
+fi
+
+export rvm_path
+source $rvm_path/scripts/rvm
+rvm reload
+rvm use $VERSION_RUBY
+# type "$DE"
+# echo "$DE" $VERSION_DEPENGINE --recipe "$RECIPE" --deployhome "$WORKSPACE" --env "$ENVIRONMENT" --version "$VERSION"
+exec "$DE" $VERSION_DEPENGINE --recipe "$RECIPE" --deployhome "$WORKSPACE" --env "$ENVIRONMENT" --version "$VERSION" --cdb "$CDB"

data/bin/red_eng

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+### BEGIN INIT INFO
+# Provides:          redirect_engine
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:
+# X-Start-Before:
+# Default-Start:     2 3 4 5
+# Default-Stop:
+# Short-Description: Start redirect_engine daemon
+# Description: Start redirect_engine daemon
+### END INIT INFO
+
+# source /usr/local/rvm/scripts/rvm
+# rvm use 1.9.2
+# RUBYDIR=/usr/local/rvm/gems/ruby-1.9.2-p290
+
+# Vorher
+# gem install thin
+# gem install sinatra
+
+# rvm use 1.9.3
+# RUBYDIR=/usr/local/rvm/gems/ruby-1.9.3-p194
+
+MYNAME=`basename $0`
+
+set -e
+
+TOOLROOT=/home/trautw/Projekte/redirect_engine
+
+case "$1" in
+  start)
+                # start-stop-daemon --start --quiet --user cdb --chdir /srv/cdb --exec $RUBYDIR/bin/thin -- -e production -P /var/run/$MYNAME.pid -d start
+                start-stop-daemon --start --quiet --background --chdir "$TOOLROOT" --exec "$TOOLROOT/bin/redirect_engine" -- 
+        ;;
+  stop)
+                start-stop-daemon --stop --retry=INT/10/TERM/5/KILL/2 --name redirect_engine
+        ;;
+  restart)
+		$0 stop
+		sleep 5
+		$0 start
+        ;;
+  *)
+        echo "Usage: $MYNAME {start|stop|restart}" >&2
+        exit 1
+        ;;
+esac
+
+exit 0

data/lib/redirect_engine.rb

@@ -1,64 +1,9 @@
 require 'redirect_engine/version'
-require 'redirect_engine/engine'
-
-# set :public_felder, File.dirname(__FILE__) + '/public'
-
-# See http://www.sinatrarb.com/intro
-# set :environment, :development
-set :environment, :development
-set :port, 80
-# set :bind, "2001:6f8:966:ac10::106"
-# set :bind, "ubuntu.chtw.de"
-set :bind, "2001:470:1f15:5a8:20c:29ff:fe21:87aa"
-
-engine = RedirectEngine::Engine.new
-engine.start()
-
-# See http://www.sinatrarb.com/intro
-# set :environment, :development
-set :environment, :development
-set :port, 80
-# set :bind, "2001:6f8:966:ac10::106"
-# set :bind, "ubuntu.chtw.de"
-set :bind, "2001:470:1f15:5a8:20c:29ff:fe21:87aa"
-
-# ---------------------------------------------------
-before do
-  content_type :html, 'charset' => 'utf-8'
-  # See http://rack.rubyforge.org/doc/classes/Rack/Request.html
-
-  if request.env["HTTP_X_FORWARDED_HOST"]
-    request.path_info = "/redirector#{request.path_info}"
-  end
-  # write_log "Querystring = #{request.query_string}\n"
-  # write_log "Param source = #{request["source"]}\n"
-  # http://stackoverflow.com/questions/6317705/rackrequest-how-do-i-get-all-headers
-  # headers = env.select {|k,v| k.start_with? 'HTTP_'}
-  # write_log "Headers = #{headers}\n"
-  # write_log "Host = #{request.env["HTTP_HOST"]}\n"
-  # write_log "Host = #{headers["HTTP_HOST"]}\n"
-  # write_log "Original Host = #{request.env["HTTP_X_FORWARDED_HOST"]}\n"
-end
-
-after do
-  puts "Response status = #{response.status}"
-end
-
-helpers do
-  include Rack::Utils
-  alias_method :h, :escape_html
-end
-
-get '/redirector/:query' do
-  engine.redirect_for(self,  request, params)
-end
-
-get '/*' do
-  # write_log "Error: Request doesn't match a valid route!"
-  print "Error: Request #{params[:splat]} doesn't match a valid route!\n"
-  return "@@ERROR@@" + "Error: Request doesn't match a valid route!\n"
-end
+require 'redirect_engine/support'
 
 module RedirectEngine
-  # Your code goes here...
+  
+  rc_file = File.join(ENV["HOME"] , ".redirect_engine.yaml")
+  Support::ServerInitializer.new(rc_file)
+
 end

data/lib/redirect_engine/engine.rb

@@ -1,72 +1,108 @@
 require 'rubygems'
 require 'bundler/setup'
+require 'json'
+require 'yaml/store'
 
 class RedirectEngine::Engine
 
   $config = Hash.new
+  $logger = nil
 
   def start()
-    begin
-      print "Hello from Engine\n"
-    end
+    puts "puts: Hello from Engine\n"
   end
 
   def redirect_for(sina, request, params)
     original_host = request.env["HTTP_X_FORWARDED_HOST"]
-    write_log "=================== Redirecting for #{original_host} #{params[:query]}"
-    write_log "Querystring = #{request.query_string}\n"
+    $logger.info "=================== Redirecting for #{original_host} #{params[:query]}"
+    $logger.info "Querystring = #{request.query_string}\n"
 
     redirect_config = get_redirect_config(original_host)
 
-    write_log "Redirect Config = #{redirect_config}"
+    $logger.info "Redirect Config = #{redirect_config}"
     return_code  = redirect_config["default"]["return_code"]
     redirect_url = redirect_config["default"]["target"]
 
-    write_log "Redirecting #{params[:query]}\n"
+    $logger.info "Redirecting #{params[:query]}\n"
 
     request_uri = "/#{params[:query]}"
     request_params = "#{request.query_string}"
 
     redirect_config["redirect"].each do |redirect|
-      write_log "Checking regexp #{redirect['source']}"
-      write_log "Request URI = #{request_uri}"
+      $logger.info "Checking regexp #{redirect['source']}"
+      $logger.info "Request URI = #{request_uri}"
       if request_uri.match(redirect['source'])
-        write_log "Hit!!"
+        $logger.info "Hit!!"
         redirect_url = "http://#{original_host}#{redirect['target']}"
         return_code  = redirect["return_code"] if redirect["return_code"]
       end
     end
 
-    write_log "Redirect to #{redirect_url}"
+    $logger.info "Redirect to #{redirect_url}"
     sina.redirect redirect_url, return_code
     # return "Danke"
   end
 
+  def get_config(logger, host)
+    $logger = logger
+    get_redirect_config(host).to_json
+  end
+
+  def set_config(host, configuration)
+    $logger.info "Setting config for host #{host} to \n#{configuration.to_json}"
+    $logger.info "TODO: VALIDATION!!"
+    put_redirect_config(host, configuration)
+    $config[host] = nil
+    configuration.to_json
+  end
+
 # --- private functions ---
 private
 
   def get_redirect_config(host)
     if ! $config[host]
-      write_log "LOADING #{host}.yaml"
+      $logger.info "LOADING #{host}.yaml"
       $config[host] = load_yaml "#{host}.yaml"
     end
     $config[host]
   end
 
+  def put_redirect_config(host, data)
+    begin
+      filename = "#{host}.yaml"
+      store = YAML::Store.new( filename, :Indent => 2)
+      $logger.info "Updating: #{File.expand_path(filename)}"
+      store.transaction do
+        data.each_pair do |key, value|
+          if store.nil?
+            $logger.error "Error: no valid yaml #{File.expand_path(filename)}"
+          else
+            store[key] = value
+          end
+        end
+      end
+      true
+    rescue Exception => e
+      $logger.error "Error: while writing back yaml file #{filename}"
+      $logger.error e.message
+      false
+    end
+  end
+
   def load_yaml(filename)
     if File.file? filename
         begin
           YAML::load_file(filename)
         rescue StringIndexOutOfBoundsException => e
-          puts "Error: YAML parsing in #{filename}"
-          write_log "Error: YAML parsing in #{filename}"
-          write_log e.message
+          $logger.error "Error: YAML parsing in #{filename}"
+          $logger.error "Error: YAML parsing in #{filename}"
+          $logger.error e.message
           raise "YAML not parsable"
           false
         rescue Exception => e
           puts "Error: YAML parsing in #{filename}"
-          write_log "Error: YAML parsing in #{filename}"
-          write_log e.message
+          $logger.error "Error: YAML parsing in #{filename}"
+          $logger.error e.message
           raise "YAML not parsable"
           false
         end
@@ -75,8 +111,8 @@ private
     end
   end
 
-  def write_log(message)
-    puts message
+  def write_log_disabled(message)
+    $logger.info message
   end
 
 end

data/lib/redirect_engine/support.rb

@@ -0,0 +1,142 @@
+require 'redirect_engine/engine'
+
+require 'webrick'
+require 'webrick/https'
+
+use Rack::Logger
+
+set :run, false
+
+module Support
+
+  $engine = nil
+  $engine_config = nil
+  $logger = nil
+
+  class MyServer  < Sinatra::Base
+    configure :production, :development do
+      enable :logging
+    end
+
+    # --- private functions ---
+    private
+
+    # ---------------------------------------------------
+    before do
+      content_type :html, 'charset' => 'utf-8'
+      # See http://rack.rubyforge.org/doc/classes/Rack/Request.html
+
+      if request.env["HTTP_X_FORWARDED_HOST"]
+        request.path_info = "/redirector#{request.path_info}"
+      end
+      # write_log "Querystring = #{request.query_string}\n"
+      # write_log "Param source = #{request["source"]}\n"
+      # http://stackoverflow.com/questions/6317705/rackrequest-how-do-i-get-all-headers
+      # headers = env.select {|k,v| k.start_with? 'HTTP_'}
+      # write_log "Headers = #{headers}\n"
+      # write_log "Host = #{request.env["HTTP_HOST"]}\n"
+      # write_log "Host = #{headers["HTTP_HOST"]}\n"
+      # write_log "Original Host = #{request.env["HTTP_X_FORWARDED_HOST"]}\n"
+    end
+
+    after do
+      # puts "Response status = #{response.status}"
+    end
+
+    helpers do
+      include Rack::Utils
+      alias_method :h, :escape_html
+    end
+
+    get '/redirector/:query' do
+      $engine.redirect_for(self,  request, params)
+    end
+
+    # e.g. http://ubutu.chtw.de/config/trautwein.homeip.net
+    get '/config/:host' do
+      headers "Access-Control-Allow-Origin" => $engine_config["allow_origin"]
+      # $logger.info("KHJKHJKHKJHKJH")
+      # $logger.error("cwmbmnbmnbmnbmnbmbmnb")
+      # $logger.debug("GGGGGGGGGGGGGGGGGGGG")
+      $engine.get_config($logger,params[:host])
+    end
+    
+    # e.g. http://ubutu.chtw.de/config/trautwein.hoeip.net
+    post '/config/:host' do
+      headers "Access-Control-Allow-Origin" => "http://ubuntu.chtw.de:4567"
+      $engine.set_config(params[:host], params[:json])
+    end
+    
+    get '/*' do
+      # write_log "Error: Request doesn't match a valid route!"
+      $logger.error "Error: Request #{params[:splat]} doesn't match a valid route!\n"
+      return "@@ERROR@@" + "Error: Request doesn't match a valid route!\n"
+    end
+    
+  end
+
+
+  class ServerInitializer
+    def initialize(config_file)
+      puts "Initializing Server from #{config_file}"
+      $engine_config = load_yaml(config_file)
+      $logger = WEBrick::Log::new($engine_config["logfile"], WEBrick::Log::DEBUG)
+
+      $engine = RedirectEngine::Engine.new
+      $engine.start()
+
+      access_log_stream = File.open($engine_config["access_log"], 'w')
+      access_log = [ [ access_log_stream, WEBrick::AccessLog::COMBINED_LOG_FORMAT ] ]
+
+      webrick_options = {
+        :Port               => $engine_config["port"] || 8443,
+        :Host               => $engine_config["ip"] || "127.0.0.1",
+      #  :Logger             => WEBrick::Log::new($stderr, WEBrick::Log::DEBUG),
+        :Logger             => $logger,
+        :AccessLog          => access_log,
+        :DocumentRoot       => File.dirname(__FILE__) + '/../public',
+        :SSLEnable          => true,
+        :SSLVerifyClient    => OpenSSL::SSL::VERIFY_NONE,
+        :SSLCertificate     => OpenSSL::X509::Certificate.new(  File.open(File.join($engine_config["cert_path"], $engine_config["hostname"] + ".cert")).read),
+        :SSLPrivateKey      => OpenSSL::PKey::RSA.new(          File.open(File.join($engine_config["cert_path"], $engine_config["hostname"] + ".key")).read),
+        :SSLCertName        => [ [ "CN",WEBrick::Utils::getservername ] ],
+        :app                => MyServer
+      }
+
+      Rack::Server.start webrick_options
+
+    end
+
+    private
+    def load_yaml(filename)
+      if File.file? filename
+          begin
+            YAML::load_file(filename)
+          rescue StringIndexOutOfBoundsException => e
+            puts "Error: YAML parsing in #{filename}"
+            write_log "Error: YAML parsing in #{filename}"
+            write_log e.message
+            raise "YAML not parsable"
+            false
+          rescue Exception => e
+            puts "Error: YAML parsing in #{filename}"
+            write_log "Error: YAML parsing in #{filename}"
+            write_log e.message
+            raise "YAML not parsable"
+            false
+          end
+      else
+        raise "File not found: #{filename}"
+      end
+    end
+
+    def write_log_disabled(message)
+      # logger.info(message)
+      # puts message
+      $logger.info(message)
+    end
+
+  end
+
+end
+

data/lib/redirect_engine/version.rb

@@ -1,3 +1,3 @@
 module RedirectEngine
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redirect_engine
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -31,7 +31,8 @@ description: Generates http redirects
 email:
 - trautwein@scienitst.com
 executables:
-- .redirect_engine.swp
+- deploy_caller
+- red_eng
 - redirect_engine
 extensions: []
 extra_rdoc_files: []
@@ -41,10 +42,12 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/.redirect_engine.swp
+- bin/deploy_caller
+- bin/red_eng
 - bin/redirect_engine
 - lib/redirect_engine.rb
 - lib/redirect_engine/engine.rb
+- lib/redirect_engine/support.rb
 - lib/redirect_engine/version.rb
 - redirect_engine.gemspec
 homepage: http://chtw.de/redirector