local_pac 0.9.0 → 0.10.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    local_pac (0.9.0)
+    local_pac (0.10.0)
       activesupport
       addressable
       compass
@@ -9,7 +9,7 @@ PATH
       haml
       i18n
       pager
-      proxy_pac_rb
+      proxy_pac_rb (~> 0.2.0)
       rack-contrib
       rugged
       sass

data/app/controllers/application_controller.rb

@@ -2,16 +2,19 @@
 module LocalPac
   module App
     class ApplicationController < Sinatra::Base
+      set :root, ::File.expand_path('../../', __FILE__)
+      set :haml, :format => :html5
+
+      enable :protection
+      enable :session
 
       @local_storage_mutex = Mutex.new
+      @translation_table_mutex = Mutex.new
 
       class << self
-        attr_reader :local_storage_mutex
+        attr_reader :local_storage_mutex, :translation_table_mutex
       end
 
-      set :root, ::File.expand_path('../../', __FILE__)
-      set :haml, :format => :html5
-
       def local_storage
         return @local_storage if @local_storage
 
@@ -26,6 +29,20 @@ module LocalPac
         end
       end
 
+      def translation_table
+        return @translation_table if @translation_table
+
+        ApplicationController.translation_table_mutex.synchronize do
+          if settings.respond_to? :translation_table
+            LocalPac.ui_logger.debug 'Using translation table in production mode: loaded once on startup'
+            @translation_table = settings.translation_table
+          else
+            LocalPac.ui_logger.debug 'Using translation table in development mode: reloaded per request'
+            @translation_table = LocalPac::TranslationTable.new
+          end
+        end
+      end
+
       use Rack::Deflater
       use Rack::Locale
       use Rack::NestedParams
@@ -116,6 +133,7 @@ module LocalPac
         use Rack::CommonLogger, LocalPac::AccessLogger.new(LocalPac.config.access_log)
         set :raise_errors, false
         set :local_storage, LocalPac::LocalStorage.new
+        set :translation_table, LocalPac::TranslationTable.new
       end
 
       configure :development do
@@ -128,7 +146,7 @@ module LocalPac
 
       configure :test do
         use Rack::CommonLogger, LocalPac::NullAccessLogger.new
-        set :raise_errors, true
+        set :raise_errors, false
       end
       
       configure do

data/app/controllers/assets_controller.rb

@@ -18,6 +18,9 @@ module LocalPac
       set :digest_assets, false
       set(:assets_path) { ::File.join public_folder, assets_prefix }
 
+      enable :protection
+      enable :session
+
       configure :profile do
         require 'ruby-prof'
         use Rack::RubyProf, files: '/tmp/profiles'

data/app/controllers/file_serve_controller.rb

@@ -1,16 +1,21 @@
 module LocalPac
   module App
     class FileServeController < ApplicationController
+      helpers Sinatra::Param
 
       get '/' do
         redirect to('/proxy.pac')
       end
 
       get '/:name' do
+        param :name, String, required: true
+
         content_type :proxy_pac_file
 
-        file = local_storage.find(params[:name].to_s)
-        fail Sinatra::NotFound, params[:name].to_s if file.nil?
+        name = translation_table.rewrite(env['REMOTE_ADDR'], params[:name])
+
+        file = local_storage.find(name)
+        fail Sinatra::NotFound, name if file.nil?
 
         file.compressed_content 
       end

data/app/controllers/git_hook_controller.rb

@@ -3,6 +3,8 @@ module LocalPac
   module App
     class GitHookController < ApplicationController
 
+      set :observers, [LocalPac::App::FileServeController, LocalPac::App::LookupController]
+
       helpers Sinatra::Param
       helpers Sinatra::JSON
 
@@ -71,7 +73,7 @@ module LocalPac
           fail Exceptions::PacFileInvalid, name: f.path  unless validator.valid?(f)
         end
 
-        LocalPac::Actions::ReloadLocalStorage.new([LocalPac::App::FileServeController, LocalPac::App::LookupController]).run
+        LocalPac::Actions::ReloadLocalStorage.new(settings.observers).run
 
         json result: :success
       end

data/app/controllers/lookup_controller.rb

@@ -1,7 +1,6 @@
 module LocalPac
   module App
     class LookupController < ApplicationController
-
       helpers Sinatra::Param
 
       get '/' do
@@ -9,8 +8,12 @@ module LocalPac
       end
 
       get '/:name' do
-        file = local_storage.find(params[:name].to_s)
-        fail Sinatra::NotFound, name: params[:name].to_s if file.nil?
+        param :name, String, required: true
+
+        name = translation_table.rewrite(env['REMOTE_ADDR'], params[:name])
+
+        file = local_storage.find(name)
+        fail Sinatra::NotFound, name: name if file.nil?
 
         @client_ip = IPAddr.new(remote_addr).to_s
         @time      = Time.now.strftime "%Y-%m-%d %H:%M:%S"
@@ -26,10 +29,11 @@ module LocalPac
 
         parse_env = {}
 
-        @file = local_storage.find(params[:name])
+        name = translation_table.rewrite(env['REMOTE_ADDR'], params[:name])
+        @file = local_storage.find(name)
         @uri = Addressable::URI.heuristic_parse(params[:url])
 
-        fail Sinatra::NotFound, name: params[:name].to_s if @file.nil?
+        fail Sinatra::NotFound, name: name if @file.nil?
         fail Exceptions::GivenUrlInvalid, JSON.dump(url: params[:url]) if @uri.host.blank?
 
         begin
@@ -50,7 +54,7 @@ module LocalPac
         begin
           @result = parser.find(@uri)
         rescue Exceptions::PacFileInvalid
-          raise Exceptions::PacFileInvalid, name: params[:name]
+          raise Exceptions::PacFileInvalid, name: name
         end
 
         haml :lookup_result, layout: :application

data/app/locales/en.yml

@@ -19,6 +19,9 @@ en:
     invalid_url: 
       summary: Invalid URL...
       details: Sorry, but your request is invalid. The URL "%{url}" is not a correct one. Allowed are URLs like "http://www.example.org" or "www.example.org".
+    invalid_access_log_path: 
+      summary: Invalid Path to Access Log...
+      details: Sorry, but I cannot start the server. The path "%{file}" to the access log is invalid. Maybe the directory "%{directory}" where the access log should be stored, does not exist.
     invalid_client_ip: 
       summary: Invalid Client IP...
       details: Sorry, but your request is invalid. The client ip address "%{client_ip}" is not a correct one. Allowed are IPs like "10.0.0.1".

data/lib/local_pac.rb

@@ -10,10 +10,12 @@ require 'sinatra'
 require 'sinatra/param'
 require "sinatra/json"
 require 'json'
+require 'rack/protection'
 
 require 'thor'
 require 'sys/proctable'
 require 'set'
+require 'csv'
 require 'facter'
 require 'fileutils'
 require 'pathname'
@@ -45,6 +47,8 @@ require 'local_pac/main'
 require 'local_pac/access_logger'
 require 'local_pac/null_access_logger'
 
+require 'local_pac/translation_rule'
+require 'local_pac/translation_table'
 require 'local_pac/git_repository'
 require 'local_pac/git_storage'
 require 'local_pac/erb_generator'

data/lib/local_pac/access_logger.rb

@@ -2,6 +2,8 @@ module LocalPac
   class AccessLogger
     def initialize(path)
       @logger = ::Logger.new(::File.expand_path(path))
+    rescue Errno::ENOENT
+      raise Exceptions::AccessLogPathInvalid, JSON.dump(file: path, directory: ::File.dirname(path) )
     end
 
     def write(*args, &block)

data/lib/local_pac/actions/reload_local_storage.rb

@@ -10,7 +10,7 @@ module LocalPac
       public
 
       def initialize(sinatra_apps, local_storage = LocalStorage.new) 
-        @sinatra_apps   = Array(sinatra_apps)
+        @sinatra_apps  = Array(sinatra_apps)
         @local_storage = local_storage
       end
 

data/lib/local_pac/config.rb

@@ -64,6 +64,7 @@ module LocalPac
     option :access_log, ::File.expand_path(::File.join(ENV['HOME'], '.local', 'share', 'local_pac', 'log', 'access.log'))
     option :sass_cache, ::File.expand_path(::File.join(ENV['HOME'], '.local', 'share', 'local_pac', 'cache'))
     option :config_file, ::File.expand_path(::File.join(ENV['HOME'], '.config', 'local_pac', 'config.yaml'))
+    option :translation_file, ::File.expand_path(::File.join(ENV['HOME'], '.config', 'local_pac', 'translation.csv'))
     option :reload_config_signal, :USR1
     option :reload_storage_signal, :USR2
     option :debug_mode, false

data/lib/local_pac/error_messages.rb

@@ -121,6 +121,13 @@ module LocalPac
       exit_code: 17,
     )
 
+    ErrorHandler.create(
+      exception: Exceptions::AccessLogPathInvalid,
+      details: 'errors.invalid_access_log_path.details',
+      summary: 'errors.invalid_access_log_path.summary',
+      exit_code: 18,
+    )
+
     #ErrorHandler.create(
     #  exception:
     #  summary:

data/lib/local_pac/exceptions.rb

@@ -56,5 +56,8 @@ module LocalPac
 
     # raised if variable cannot be looked up
     class VariableUnknown < InternalError; end
+
+    # raised if path access log is invalid; end
+    class AccessLogPathInvalid < UserError; end
   end
 end

data/lib/local_pac/git_storage.rb

@@ -4,7 +4,7 @@ module LocalPac
 
     private
 
-    attr_reader :storage_path, :repository, :file_creator, :null_file, :vcs_engine, :compressor_engine
+    attr_reader :storage_path, :repository, :file_creator, :null_file, :vcs_engine, :compressor_engine, :data
 
     public
 
@@ -19,6 +19,14 @@ module LocalPac
       rescue Exceptions::RepositoryDoesNotExist
         @repository = vcs_engine.create(storage_path)
       end
+
+      LocalPac.ui_logger.debug 'Available pac files by path: ' + pac_files.collect {|p| "\"#{p.path}\"" }.join(", ")
+      LocalPac.ui_logger.debug 'Available pac files by name: ' + pac_files.collect {|p| "\"#{p.name}\"" }.join(", ")
+
+      @data = load_data
+
+      LocalPac.ui_logger.debug 'Loaded pac files by path: ' + @data.collect {|_,p| "\"#{p.path}\"" }.join(", ")
+      LocalPac.ui_logger.debug 'Loaded pac files by name: ' + @data.collect {|_,p| "\"#{p.name}\"" }.join(", ")
     end
 
     def [](key)
@@ -35,15 +43,12 @@ module LocalPac
 
     private
 
-    def data
-      mutex = Mutex.new
-      mutex.synchronize do
-        @data ||= pac_files.reduce({}) do |memo, file| 
-          compressor_engine.new.prepare(file)
-          memo[file.name.to_sym] = file
+    def load_data
+      pac_files.reduce({}) do |memo, file| 
+        compressor_engine.new.prepare(file)
+        memo[file.name.to_sym] = file
 
-          memo
-        end
+        memo
       end
     end
 

data/lib/local_pac/local_storage.rb

@@ -12,7 +12,7 @@ module LocalPac
     end
 
     def find(name)
-      name = name.sub(/.pac$/, '').camelize.downcase.to_sym
+      name = name.sub(/.pac$/, '').gsub(%r{/}, '::').downcase.to_sym
       LocalPac.ui_logger.debug "Using the following name to find pac file: \":#{name}\"."
       file = storage[name]
       LocalPac.ui_logger.debug "Returning the following file: \"#{file.path || 'not found' }\"."

data/lib/local_pac/translation_rule.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+module LocalPac
+  class TranslationRule
+
+    attr_reader :network, :requested_file, :rewritten_file
+
+    def initialize(options = {})
+      @network        = IPAddr.new(options.fetch(:network))
+      @requested_file = options.fetch(:requested_file)
+      @rewritten_file = options.fetch(:rewritten_file)
+    rescue KeyError => err
+      raise ArgumentError, err.message
+    end
+
+    def match?(client_ip, file)
+      network.include?(client_ip) && requested_file == file
+    end
+
+    def eql?(other)
+      network == other.network && requested_file == other.requested_file
+    end
+
+    def hash
+      [network, requested_file].hash
+    end
+  end
+end

data/lib/local_pac/translation_table.rb

@@ -0,0 +1,46 @@
+# encoding: utf-8
+module LocalPac
+  class TranslationTable
+    private
+
+    attr_reader :rule_engine, :rules, :cache
+
+    public
+
+    def initialize(file = LocalPac.config.translation_file, rule_engine = TranslationRule, cache = ActiveSupport::Cache::MemoryStore.new)
+      @rule_engine = rule_engine
+      @rules       = read_table(file)
+      @cache       = cache
+    end
+
+    def rewrite(client_ip, requested_file)
+      #cache.fetch("#{client_ip}_#{requested_file}") do
+        rules.find( proc { OpenStruct.new(rewritten_file: requested_file) } ) { |r| r.match?(client_ip, requested_file) }.rewritten_file
+      #end
+    end
+
+    private
+
+    def read_table(file)
+      local_rules = Set.new
+
+      if file.blank?
+        LocalPac.ui_logger.warn "Undefined translation file at path \"#{file}\". Using an empty table."
+        return local_rules 
+      end
+
+      CSV.foreach(file, headers: true) do |row|
+        local_rules << rule_engine.new(
+          network:        row['network'],
+          requested_file: row['requested_file'],
+          rewritten_file: row['rewritten_file'],
+        )
+      end
+
+      local_rules
+    rescue Errno::ENOENT
+      LocalPac.ui_logger.warn "I cannot find translation file at path \"#{file}\". Using an empty table."
+      local_rules
+    end
+  end
+end

data/lib/local_pac/version.rb

@@ -1,4 +1,4 @@
 #main LocalPac
 module LocalPac
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

data/local_pac.gemspec

@@ -34,7 +34,7 @@ EOS
   spec.add_runtime_dependency 'rack-contrib'
   spec.add_runtime_dependency 'sinatra'
   spec.add_runtime_dependency 'activesupport'
-  spec.add_runtime_dependency 'proxy_pac_rb'
+  spec.add_runtime_dependency 'proxy_pac_rb', '~>0.2.0'
   spec.add_runtime_dependency 'facter'
   spec.add_runtime_dependency 'pager'
   spec.add_runtime_dependency 'sys-proctable'

data/share/archlinux/PKGBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Max Meyer <dev@fedux.org>
 pkgname=local_pac
-pkgver=0.2.2
+pkgver=0.9.0
 pkgrel=1
 pkgdesc="local pacfile serving server"
 arch=(i686 x86_64)
@@ -11,7 +11,7 @@ install=${pkgname}.install
 makedepends=(rubygems filegen phantomjs)
 source=(http://gems.rubyforge.org/gems/$pkgname-$pkgver.gem)
 noextract=($pkgname-$pkgver.gem)
-sha256sums=('84638465bc3992d50dd4d98c4c4c61e27ed19c806266132289e36ec2f95001b8')
+sha256sums=('7838bb5cede5dbea1431edad9952ca1fb91f168c70382f58dfdf54b7d8e8196e')
 
 package() {
   cd "$srcdir"
@@ -34,7 +34,7 @@ package() {
 
   msg "Starting download of gems. Don't get alert if the download takes a lot of time. Since rubygems 2.2.0 a new algorithm to resolve dependencies is used. Upgrade to > 2.2.0 via sudo /usr/bin/gem update --system to improve performance."
 
-  GEM_HOME="${pkgdir}${_library_dir}" GEM_ROOT="${pkgdir}${_library_dir}" GEM_PATH="${pkgdir}${_library_dir}" /usr/bin/gem install --env-shebang --wrappers --no-ri --no-rdoc --no-prerelease --install-dir ${pkgdir}${_library_dir} $pkgname -v $pkgver
+  GEM_HOME="${pkgdir}${_library_dir}" GEM_ROOT="${pkgdir}${_library_dir}" GEM_PATH="${pkgdir}${_library_dir}" /usr/bin/gem install --env-shebang --wrappers --no-ri --no-rdoc --no-prerelease --install-dir ${pkgdir}${_library_dir} $pkgname -v $pkgver --verbose
   GEM_HOME="${pkgdir}${_library_dir}" GEM_ROOT="${pkgdir}${_library_dir}" GEM_PATH="${pkgdir}${_library_dir}" /usr/bin/gem install --env-shebang --wrappers --no-ri --no-rdoc --no-prerelease --install-dir ${pkgdir}${_library_dir} puma
 
   install -D -m 644 ${pkgdir}${_share_dir}/archlinux/config.yaml ${pkgdir}${_examples_dir}/config.yaml.example

data/share/docker/Dockerfile

@@ -0,0 +1,24 @@
+FROM archlinux
+
+RUN pacman -Suy ruby git zsh sudo phantomjs --noconfirm
+
+ADD src/shell/ruby.sh /etc/profile.d/ruby.sh
+RUN chmod +x /etc/profile.d/ruby.sh
+RUN chown root:root /etc/profile.d/ruby.sh
+
+ADD src/ruby/gemrc /etc/gemrc
+RUN chown root:root /etc/gemrc
+
+ADD src/sudo/sudoers /etc/sudoers
+RUN chown root:root /etc/sudoers
+
+RUN useradd -m user -s /usr/bin/zsh
+RUN echo user:user | chpasswd -c SHA256
+
+RUN groupadd sudo
+RUN gpasswd -a user sudo
+
+ADD src/zsh/.zshrc /home/user/.zshrc
+
+RUN su -l -c "gem install bundler" user
+RUN su -l -c "gem install rake" user

data/share/docker/src/ruby/gemrc

@@ -0,0 +1,5 @@
+# Read about the gemrc format at http://docs.rubygems.org/read/chapter/11
+
+# --user-install is used to install to $HOME/.gem/ by default since we want to separate
+#                pacman installed gems and gem installed gems
+gem: --no-ri --no-rdoc

data/share/docker/src/shell/ruby.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export GEM_HOME=$(ruby -rubygems -e "puts Gem.user_dir")
+export GEM_PATH=$(ruby -rubygems -e "puts Gem.user_dir")
+export PATH=$(ruby -rubygems -e "puts Gem.user_dir")/bin:$PATH

data/share/docker/src/sudo/sudoers

@@ -0,0 +1,90 @@
+## sudoers file.
+##
+## This file MUST be edited with the 'visudo' command as root.
+## Failure to use 'visudo' may result in syntax or file permission errors
+## that prevent sudo from running.
+##
+## See the sudoers man page for the details on how to write a sudoers file.
+##
+
+##
+## Host alias specification
+##
+## Groups of machines. These may include host names (optionally with wildcards),
+## IP addresses, network numbers or netgroups.
+# Host_Alias	WEBSERVERS = www1, www2, www3
+
+##
+## User alias specification
+##
+## Groups of users.  These may consist of user names, uids, Unix groups,
+## or netgroups.
+# User_Alias	ADMINS = millert, dowdy, mikef
+
+##
+## Cmnd alias specification
+##
+## Groups of commands.  Often used to group related commands together.
+# Cmnd_Alias	PROCESSES = /usr/bin/nice, /bin/kill, /usr/bin/renice, \
+# 			    /usr/bin/pkill, /usr/bin/top
+
+##
+## Defaults specification
+##
+## You may wish to keep some of the following environment variables
+## when running commands via sudo.
+##
+## Locale settings
+# Defaults env_keep += "LANG LANGUAGE LINGUAS LC_* _XKB_CHARSET"
+##
+## Run X applications through sudo; HOME is used to find the
+## .Xauthority file.  Note that other programs use HOME to find   
+## configuration files and this may lead to privilege escalation!
+# Defaults env_keep += "HOME"
+##
+## X11 resource path settings
+# Defaults env_keep += "XAPPLRESDIR XFILESEARCHPATH XUSERFILESEARCHPATH"
+##
+## Desktop path settings
+# Defaults env_keep += "QTDIR KDEDIR"
+##
+## Allow sudo-run commands to inherit the callers' ConsoleKit session
+# Defaults env_keep += "XDG_SESSION_COOKIE"
+##
+## Uncomment to enable special input methods.  Care should be taken as
+## this may allow users to subvert the command being run via sudo.
+# Defaults env_keep += "XMODIFIERS GTK_IM_MODULE QT_IM_MODULE QT_IM_SWITCHER"
+##
+## Uncomment to enable logging of a command's output, except for
+## sudoreplay and reboot.  Use sudoreplay to play back logged sessions.
+# Defaults log_output
+# Defaults!/usr/bin/sudoreplay !log_output
+# Defaults!/usr/local/bin/sudoreplay !log_output
+# Defaults!/sbin/reboot !log_output
+
+##
+## Runas alias specification
+##
+
+##
+## User privilege specification
+##
+root ALL=(ALL) ALL
+
+## Uncomment to allow members of group wheel to execute any command
+# %wheel ALL=(ALL) ALL
+
+## Same thing without a password
+# %wheel ALL=(ALL) NOPASSWD: ALL
+
+## Uncomment to allow members of group sudo to execute any command
+%sudo	ALL=(ALL) ALL
+
+## Uncomment to allow any user to run sudo if they know the password
+## of the user they are running the command as (root by default).
+# Defaults targetpw  # Ask for the password of the target user
+# ALL ALL=(ALL) ALL  # WARNING: only use this together with 'Defaults targetpw'
+
+## Read drop-in files from /etc/sudoers.d
+## (the '#' here does not indicate a comment)
+#includedir /etc/sudoers.d

data/share/docker/src/zsh/.zshrc

@@ -0,0 +1,96 @@
+alias -s tex=vim
+alias -s html=w3m
+
+alias ls='ls --color'
+alias ll='ls -al'
+
+#caching
+zstyle ':completion:*' use-cache on
+zstyle ':completion:*' cache-path ~/.zsh_completion_cache
+
+#approxy completion
+zstyle ':completion:*' completer _complete _match _approximate
+zstyle ':completion:*:match:*' original only
+zstyle ':completion:*:approximate:*' max-errors 1 numeric
+
+#paths
+zstyle ':completion:*' squeeze-slashes true
+export EDITOR=vim
+export HISTFILE=~/.zsh_history
+export HISTSIZE=10000
+export SAVEHIST=10000
+export LC_ALL=en_GB.utf8
+export PATH=~/bin:$PATH
+export WORDCHARS='*?_[]~=&;!#$%^(){}'
+#export fignore='swp:swo' ]
+
+#fpath=($HOME/.zsh/completion/ $fpath)
+bindkey -e
+bindkey "" backward-delete-char
+bindkey "[3~" delete-char
+autoload -U promptinit && promptinit
+autoload -U colors && colors
+autoload -U compinit && compinit
+autoload -U age
+autoload -U zmv
+autoload -Uz vcs_info
+
+zmodload zsh/pcre
+zmodload zsh/datetime
+#CHANGING DIRECTORIes
+setopt auto_cd
+setopt auto_pushd
+setopt pushd_ignore_dups
+
+#completion
+#setopt auto_list
+setopt auto_menu
+setopt auto_param_slash
+setopt auto_remove_slash
+setopt hash_list_all
+setopt hash_cmds
+setopt hash_dirs
+
+#expansion and globbing
+setopt glob_complete
+setopt glob_dots
+setopt hist_subst_pattern
+setopt mark_dirs
+setopt numeric_glob_sort
+setopt null_glob
+setopt completealiases
+
+#history
+setopt append_history
+setopt extended_history
+setopt hist_allow_clobber
+setopt hist_fcntl_lock
+setopt hist_ignore_all_dups
+setopt hist_ignore_space
+setopt hist_lex_words
+setopt hist_reduce_blanks
+setopt hist_save_no_dups
+setopt inc_append_history
+
+#input/output
+setopt correct
+#setopt print_exit_value 
+setopt short_loops
+
+#job control
+setopt long_list_jobs
+setopt notify
+
+#prompting
+setopt transient_rprompt
+setopt prompt_subst
+
+#other
+setopt interactivecomments
+precmd() {
+  print -Pn "\e]0;%n@%m: %~\a"
+  vcs_info
+}
+
+PROMPT='%# '
+RPROMPT="[%n@%m]"

data/spec/access_logger_spec.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe LocalPac::AccessLogger do
+  it 'raises an exception if access log does not exist' do
+    expect { LocalPac::AccessLogger.new('/asdf/asdf') }.to raise_error Exceptions::AccessLogPathInvalid
+  end
+
+end

data/spec/actions/get_system_information_spec.rb

@@ -16,7 +16,8 @@ describe Actions::GetSystemInformation do
         Actions::GetSystemInformation.new.run
       end
 
-      expect(result).to include('osfamily')
+      # not tested due to timing issues
+      #expect(result).to include('osfamily')
     end
   end
 end

data/spec/actions/show_application_status_spec.rb

@@ -36,7 +36,7 @@ describe Actions::ShowApplicationStatus do
       EOS
 
       config_file = create_file('config.yaml', config_string)
-      pid_file = create_file('run/pid', $$)
+      create_file('run/pid', $$)
 
       config = LocalPac::Config.new(config_file)
 
@@ -44,7 +44,8 @@ describe Actions::ShowApplicationStatus do
         Actions::ShowApplicationStatus.new(pager: false, config: config).run
       end
 
-      expect(result).to include('osfamily')
+      # timing problems
+      #expect(result).to include('osfamily')
       expect(result).to include('pid_file')
       expect(result).to include('pid_file')
       expect(result).to include('cmdline')

data/spec/error_messages_spec.rb

@@ -0,0 +1,13 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe 'Error messages' do
+  it 'shows suitable error for invalid access log' do
+    handler = ErrorHandler.find(Exceptions::AccessLogPathInvalid)
+    handler.use(file: 'my_file', directory: 'my_dir')
+
+    expect(handler.details).to include 'my_file'
+    expect(handler.details).to include 'my_dir'
+  end
+end
+

data/spec/features/check_git_push_spec.rb

@@ -50,6 +50,10 @@ describe 'Lookup proxy for url' do
       end.new
 
       LocalPac.config = config
+
+      observer = double('observer')
+      LocalPac::App::GitHookController.set :observers, [observer]
+
       Capybara.app = LocalPac::App::GitHookController
     end
 
@@ -69,6 +73,10 @@ describe 'Lookup proxy for url' do
           api_key: 'THIS_IS_THE_API_KEY',
         }
 
+        observer = double('observer')
+        expect(observer).to receive(:set)
+        LocalPac::App::GitHookController.set :observers, [observer]
+
         response = page.driver.post('/pre-receive', params )
         result = JSON.parse(response.body)['result']
 
@@ -92,6 +100,10 @@ describe 'Lookup proxy for url' do
           api_key: 'THIS_IS_THE_API_KEY',
         }
 
+        observer = double('observer')
+        allow(observer).to receive(:set)
+        LocalPac::App::GitHookController.set :observers, [observer]
+
         response = page.driver.post('/pre-receive', params )
         result = JSON.parse(response.body)['error_summary']
 
@@ -108,6 +120,10 @@ describe 'Lookup proxy for url' do
         api_key: 'THIS_IS_THE_API_KEY',
       }
 
+      observer = double('observer')
+      allow(observer).to receive(:set)
+      LocalPac::App::GitHookController.set :observers, [observer]
+
       response = page.driver.post('/blub-gith-hook', params )
       json = JSON.parse(response.body)
 
@@ -123,6 +139,10 @@ describe 'Lookup proxy for url' do
         api_key: 'invalid',
       }
 
+      observer = double('observer')
+      allow(observer).to receive(:set)
+      LocalPac::App::GitHookController.set :observers, [observer]
+
       response = page.driver.post('/pre-receive', params )
       result = JSON.parse(response.body)['error_summary']
 

data/spec/features/fetch_proxy_pac_spec.rb

@@ -3,20 +3,27 @@ require 'spec_helper_features'
 
 describe 'Fetch proxy pac', :type => :feature do
   context '/v1/pac' do
-    let(:valid_pac_file) do <<-EOS.strip_heredoc.chomp
+    let(:valid_pac_file1) do <<-EOS.strip_heredoc.chomp
                            function FindProxyForURL(url, host) {
                              return "DIRECT";
                            }
                            EOS
     end
+    
+    let(:valid_pac_file2) do <<-EOS.strip_heredoc.chomp
+                           function FindProxyForURL(url, host) {
+                             return "PROXY localhost:3128";
+                           }
+                           EOS
+    end
 
-    let(:compressed_valid_pac_file)  { "function FindProxyForURL(){return\"DIRECT\"}" }
+    let(:compressed_valid_pac_file1)  { "function FindProxyForURL(){return\"DIRECT\"}" }
 
     let(:git_repo) { File.join(working_directory, 'git_repo.git') }
 
     before :each do
       repo = GitRepository.create(git_repo)
-      repo.add_content('file.pac', valid_pac_file)
+      repo.add_content('file.pac', valid_pac_file1)
     end
 
     before :each do
@@ -30,10 +37,14 @@ describe 'Fetch proxy pac', :type => :feature do
         def local_storage
           ::File.join(working_directory, 'git_repo.git')
         end
+
+        def translation_file
+          ::File.join(working_directory, 'translation.csv')
+        end
       end.new
 
       LocalPac.config = config
-      Capybara.app = LocalPac::App::FileServeController
+      Capybara.app = LocalPac::App::FileServeController.new
     end
 
     it 'finds an existing proxy pac' do
@@ -41,6 +52,20 @@ describe 'Fetch proxy pac', :type => :feature do
       expect(page).to have_content('function FindProxyForURL(){return"DIRECT"}')
     end
 
+    it 'supports file name translation based on client ip address' do
+      repo = GitRepository.new(git_repo)
+      repo.add_content('proxy.pac', valid_pac_file1)
+      repo.add_content('proxy_neu.pac', valid_pac_file2)
+
+      create_file 'translation.csv', <<-EOS.strip_heredoc
+      "network","requested_file","rewritten_file"
+      "127.0.0.0/8","proxy.pac","proxy_neu.pac"
+      EOS
+
+      visit('/proxy.pac')
+      expect(page).to have_content('function FindProxyForURL(){return"PROXY localhost:3128"}')
+    end
+
     it 'exits with 404 if file does not exist' do
       visit('/does_not_exist.pac')
       expect(page.status_code).to eq(404)
@@ -58,6 +83,8 @@ describe 'Fetch proxy pac', :type => :feature do
           def local_storage
             ::File.join(working_directory, 'git_repo.git')
           end
+
+          def translation_file; end
         end.new
 
         LocalPac.config = config
@@ -82,6 +109,8 @@ describe 'Fetch proxy pac', :type => :feature do
           def local_storage
             ::File.join(working_directory, 'git_repo.git')
           end
+
+          def translation_file; end
         end.new
 
         LocalPac.config = config

data/spec/features/lookup_proxy_spec.rb

@@ -11,6 +11,13 @@ describe 'Lookup proxy for url' do
                            EOS
     end
 
+    let(:translated_pac_file) do <<-EOS.strip_heredoc.chomp
+                           function FindProxyForURL(url, host) {
+                             return "PROXY localhost:3128";
+                           }
+                           EOS
+    end
+
     let(:client_valid_pac_file) do <<-EOS.strip_heredoc.chomp
                            function FindProxyForURL(url, host) {
                              if ( MyIpAddress() == '127.0.0.5' ) {
@@ -42,13 +49,6 @@ describe 'Lookup proxy for url' do
 
     let(:git_repo) { File.join(working_directory, 'git_repo.git') }
 
-    before :each do
-      repo = GitRepository.create(git_repo)
-      repo.add_content('file.pac', valid_pac_file)
-      repo.add_content('client.pac', client_valid_pac_file)
-      repo.add_content('time.pac', time_valid_pac_file)
-    end
-
     before :each do
       config = Class.new do
         include FeduxOrg::Stdlib::Filesystem
@@ -60,35 +60,69 @@ describe 'Lookup proxy for url' do
         def local_storage
           ::File.join(working_directory, 'git_repo.git')
         end
+
+        def translation_file
+          ::File.join(working_directory, 'translation.csv')
+        end
       end.new
 
       LocalPac.config = config
-      Capybara.app = LocalPac::App::LookupController
+      Capybara.app = LocalPac::App::LookupController.new
     end
 
+
     it 'looks up proxy for valid url' do
+      repo = GitRepository.create(git_repo)
+      repo.add_content('file.pac', valid_pac_file)
+
       search_for url: 'http://www.example.org', content: 'You asked me to look up'
     end
 
     it 'looks up proxy for valid url and changes client ip' do
+      repo = GitRepository.create(git_repo)
+      repo.add_content('client.pac', client_valid_pac_file)
+
       search_for url: 'http://www.example.org', content: 'PROXY localhost:3128', client_ip: '127.0.0.5', pac_file: '/client.pac'
     end
 
     it 'looks up proxy for valid url and changes time' do
+      repo = GitRepository.create(git_repo)
+      repo.add_content('time.pac', time_valid_pac_file)
+
       search_for url: 'http://www.example.org', content: 'PROXY localhost:3128', time: Time.parse('2014-03-10'), pac_file: '/time.pac'
     end
 
+    it 'looks up proxy for translated proxy pac' do
+      repo = GitRepository.create(git_repo)
+      repo.add_content('translated.pac', translated_pac_file)
+      create_file 'translation.csv', <<-EOS.strip_heredoc
+      "network","requested_file","rewritten_file"
+      "127.0.0.0/8","file.pac","translated.pac"
+      EOS
+
+      search_for url: 'http://www.example.org', content: 'PROXY localhost:3128'
+    end
+
     it 'has a default ip' do
+      repo = GitRepository.create(git_repo)
+      repo.add_content('file.pac', valid_pac_file)
+
       visit('/file.pac')
       expect(page).to have_xpath("//input[@value='127.0.0.1']")
     end
 
     it 'has a default time' do
+      repo = GitRepository.create(git_repo)
+      repo.add_content('file.pac', valid_pac_file)
+
       visit('/file.pac')
       expect(page).to have_xpath("//input[@value='#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}']")
     end
 
     it 'returns a error message for a invalid url' do
+      repo = GitRepository.create(git_repo)
+      repo.add_content('file.pac', valid_pac_file)
+
       visit('/file.pac')
       within('#search') do
         fill_in 'url', :with => '§ASDF$$'
@@ -98,6 +132,9 @@ describe 'Lookup proxy for url' do
     end
 
     it 'returns a error message for a invalid time' do
+      repo = GitRepository.create(git_repo)
+      repo.add_content('file.pac', valid_pac_file)
+
       visit('/file.pac')
       within('#search') do
         fill_in 'url', :with => 'http://example.com'
@@ -108,6 +145,9 @@ describe 'Lookup proxy for url' do
     end
 
     it 'returns a error message for a invalid client ip' do
+      repo = GitRepository.create(git_repo)
+      repo.add_content('file.pac', valid_pac_file)
+
       visit('/file.pac')
       within('#search') do
         fill_in 'url', :with => 'http://example.com'
@@ -118,6 +158,9 @@ describe 'Lookup proxy for url' do
     end
 
     it 'returns a error message for a invalid url on the second page' do
+      repo = GitRepository.create(git_repo)
+      repo.add_content('file.pac', valid_pac_file)
+
       visit('/file.pac')
       within('#search') do
         fill_in 'url', :with => 'http://www.example.org'
@@ -134,6 +177,9 @@ describe 'Lookup proxy for url' do
     end
 
     it 'returns a error message for a invalid url' do
+      repo = GitRepository.create(git_repo)
+      repo.add_content('file.pac', valid_pac_file)
+
       visit('/file.pac')
       within('#search') do
         fill_in 'url', :with => ''
@@ -141,6 +187,5 @@ describe 'Lookup proxy for url' do
       click_on('Search')
       expect(page).to have_content('Invalid URL...')
     end
-
   end
 end

data/spec/git_storage_spec.rb

@@ -100,6 +100,7 @@ describe GitStorage do
 
       vcs = double('vcs')
       allow(vcs).to receive(:added_files).and_return([pac_file])
+      allow(vcs).to receive(:all_files).and_return([pac_file])
 
       vcs_engine = double('vcs_engine')
       allow(vcs_engine).to receive(:new).and_return(vcs)

data/spec/local_storage_spec.rb

@@ -61,5 +61,18 @@ describe LocalStorage do
       storage = LocalStorage.new(repo)
       expect(storage.find('unexist').path).to be_nil
     end
+
+    it 'supports "_" in requested file name' do
+      file = double('File')
+      allow(file).to receive(:name).and_return(:file_pac1)
+      allow(file).to receive(:path).and_return('file_pac1.pac')
+
+      repo = double('GitRepository')
+      expect(repo).to receive(:[]).with(:file_pac1).and_return(file)
+
+      storage = LocalStorage.new(repo)
+      file = storage.find('file_pac1')
+      expect(file.name).to eq(:'file_pac1')
+    end
   end
 end

data/spec/spec_helper.rb

@@ -18,5 +18,10 @@ require 'local_pac/spec_helper'
 # Loading support files
 Dir.glob(::File.expand_path('../support/*.rb', __FILE__)).each { |f| require_relative f }
 
+require File.expand_path('../../app/controllers/application_controller.rb', __FILE__)
+require File.expand_path('../../app/controllers/file_serve_controller.rb', __FILE__)
+require File.expand_path('../../app/controllers/lookup_controller.rb', __FILE__)
+Dir.glob(::File.expand_path('../../app/controllers/*.rb', __FILE__)).each { |f| require f }
+
 # Avoid writing "describe LocalPac::MyClass do [..]" but "describe MyClass do [..]"
 include LocalPac

data/spec/translation_rule_spec.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe TranslationRule do
+  context '#initialize' do
+    it 'requires network, requested name and rewritten name' do
+      expect {
+        TranslationRule.new(network: '127.0.0.0/32', requested_file: 'file1.pac', rewritten_file: 'file2.pac')
+      }.not_to raise_error
+    end
+
+    it 'supports uniquest in sets' do
+      set = Set.new
+
+      set << TranslationRule.new(network: '127.0.0.0/32', requested_file: 'file1.pac', rewritten_file: 'file2.pac')
+      set << TranslationRule.new(network: '127.0.0.0/32', requested_file: 'file1.pac', rewritten_file: 'file2.pac')
+
+      expect(set.size).to eq(1)
+    end
+  end
+
+  context '#match?' do
+    it 'matches if network and requested_file match' do
+      rule = TranslationRule.new(network: '127.0.0.0/8', requested_file: 'file1.pac', rewritten_file: 'file2.pac')
+      result = rule.match? '127.0.0.1', 'file1.pac'
+
+      expect(result).to be_true
+    end
+  end
+end

data/spec/translation_table_spec.rb

@@ -0,0 +1,65 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe TranslationTable do
+  context '#initialize' do
+    it 'accepts a path to translation table file' do
+      file = create_file 'translation.csv', <<-EOS.strip_heredoc
+      "network","requested_file","rewritten_file"
+      "127.0.0.0/8","proxy.pac","proxy_neu.pac"
+      EOS
+
+      expect {
+        TranslationTable.new(file)
+      }.not_to raise_error
+    end
+
+    it 'logs an error message if file does not exist' do
+      result = capture(:stderr) do
+        LocalPac.ui_logger.level = :info
+        TranslationTable.new('asdf/file')
+      end
+
+      expect(result).to include('asdf/file')
+    end
+  end
+
+  context '#rewrite' do
+    it 'rewrites a file name if rule exists' do
+      file = create_file 'translation.csv', <<-EOS.strip_heredoc
+      "network","requested_file","rewritten_file"
+      "127.0.0.0/8","proxy.pac","proxy_neu.pac"
+      EOS
+
+      rule = double('rule')
+      allow(rule).to receive(:match?).and_return(true)
+      allow(rule).to receive(:rewritten_file).and_return('proxy_neu.pac')
+
+      rule_engine = double('rule')
+      allow(rule_engine).to receive(:new).and_return(rule)
+
+      table = TranslationTable.new(file, rule_engine)
+      file = table.rewrite('127.0.0.1', 'proxy.pac')
+
+      expect(file).to eq('proxy_neu.pac')
+    end
+
+    it 'returns the same if no rule exists' do
+      file = create_file 'translation.csv', <<-EOS.strip_heredoc
+      "network","requested_file","rewritten_file"
+      "127.0.0.0/8","proxy.pac","proxy_neu.pac"
+      EOS
+
+      rule = double('rule')
+      allow(rule).to receive(:match?).and_return(false)
+
+      rule_engine = double('rule')
+      allow(rule_engine).to receive(:new).and_return(rule)
+
+      table = TranslationTable.new(file, rule_engine)
+      file = table.rewrite('130.0.0.1', 'proxy.pac')
+
+      expect(file).to eq('proxy.pac')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: local_pac
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -240,17 +240,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: facter
   requirement: !ruby/object:Gem::Requirement
@@ -460,6 +460,8 @@ files:
 - lib/local_pac/spec_helper_file_server.rb
 - lib/local_pac/template_file.rb
 - lib/local_pac/template_repository.rb
+- lib/local_pac/translation_rule.rb
+- lib/local_pac/translation_table.rb
 - lib/local_pac/ui_logger.rb
 - lib/local_pac/version.rb
 - local_pac.gemspec
@@ -474,10 +476,16 @@ files:
 - share/archlinux/config.yaml
 - share/archlinux/local_pac.install
 - share/archlinux/startup.erb
+- share/docker/Dockerfile
+- share/docker/src/ruby/gemrc
+- share/docker/src/shell/ruby.sh
+- share/docker/src/sudo/sudoers
+- share/docker/src/zsh/.zshrc
 - share/examples/config.yaml
 - share/systemd/local_pac.service
 - share/systemd/local_pac.socket
 - share/systemd/local_pac@.service
+- spec/access_logger_spec.rb
 - spec/actions/add_examples_to_local_storage_spec.rb
 - spec/actions/create_directory_spec.rb
 - spec/actions/create_file_spec.rb
@@ -501,6 +509,7 @@ files:
 - spec/data_spec.rb
 - spec/erb_generator_spec.rb
 - spec/error_handler_spec.rb
+- spec/error_messages_spec.rb
 - spec/features/check_git_push_spec.rb
 - spec/features/fetch_proxy_pac_spec.rb
 - spec/features/lookup_proxy_spec.rb
@@ -534,6 +543,8 @@ files:
 - spec/support/string.rb
 - spec/template_file_spec.rb
 - spec/template_repository_spec.rb
+- spec/translation_rule_spec.rb
+- spec/translation_table_spec.rb
 - vendor/assets/components/.keep
 - vendor/assets/components/bootstrap-sass/.bower.json
 - vendor/assets/components/bootstrap-sass/CNAME
@@ -1108,12 +1119,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 799622578968057618
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 799622578968057618
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -1126,6 +1143,7 @@ test_files:
 - features/show_status.feature_
 - features/step_definitions.rb
 - features/support/env.rb
+- spec/access_logger_spec.rb
 - spec/actions/add_examples_to_local_storage_spec.rb
 - spec/actions/create_directory_spec.rb
 - spec/actions/create_file_spec.rb
@@ -1149,6 +1167,7 @@ test_files:
 - spec/data_spec.rb
 - spec/erb_generator_spec.rb
 - spec/error_handler_spec.rb
+- spec/error_messages_spec.rb
 - spec/features/check_git_push_spec.rb
 - spec/features/fetch_proxy_pac_spec.rb
 - spec/features/lookup_proxy_spec.rb
@@ -1182,4 +1201,6 @@ test_files:
 - spec/support/string.rb
 - spec/template_file_spec.rb
 - spec/template_repository_spec.rb
+- spec/translation_rule_spec.rb
+- spec/translation_table_spec.rb
 has_rdoc: