clarity 0.9.7 → 0.9.8

data/README.rdoc

@@ -17,6 +17,13 @@ We wrote Clarity to allow our support staff to use a simple interface to look
 through the various log files in our server farm. The application was such a 
 big success internally that we decided to release it as open source. 
 
+== SECURITY:
+
+*Warning*: Clarity takes parameters from URLs and runs them in the shell. 
+This is essentially the most insecure thing imaginable. You have to make absolutley sure 
+that clarity isn't reachable by the outside world. At the very least use --username and
+--password to put some protection on it. 
+
 == USAGE:
 
   clarity --username=admin --password=secret --port=8989 /var/log

data/Rakefile

@@ -13,7 +13,7 @@ $hoe = Hoe.spec 'clarity' do
   self.developer 'Tobias Lütke', 'tobi@shopify.com'
   self.developer 'John Tajima', 'john@shopify.com'
   self.summary = 'Web interface for grep and tail -f'  
-  #self.post_install_message = 'PostInstall.txt'  
+  self.post_install_message = 'PostInstall.txt'  
   self.readme_file          = 'README.rdoc'  
   self.extra_deps           = [['eventmachine','>= 0.12.10'], ['eventmachine_httpserver','>= 0.2.0'], ["json", ">= 1.0.0"]]
   self.test_globs           = ['test/**/*_test.rb']

data/lib/clarity.rb

@@ -1,5 +1,10 @@
 $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
+begin
+  require File.join(File.dirname(__FILE__), *%w[.. vendor gems environment])
+rescue LoadError
+end
+
 require 'eventmachine'
 require 'evma_httpserver'
 require 'json'
@@ -11,7 +16,7 @@ require 'clarity/commands/tail_command_builder'
 require 'clarity/renderers/log_renderer'
 
 module Clarity
-  VERSION = '0.9.7'  
+  VERSION = '0.9.8'  
   
   Templates = File.dirname(__FILE__) + '/../views'
   Public    = File.dirname(__FILE__) + '/../public'

data/lib/clarity/cli.rb

@@ -11,7 +11,8 @@ module Clarity
         :port => 8080,
         :address => "0.0.0.0",
         :user => nil,
-        :group => nil
+        :group => nil,
+        :relative_root => nil
       }
       
       mandatory_options = %w(  )
@@ -37,6 +38,10 @@ module Clarity
           options[:address] = opt
         end  
 
+        opts.on( "-r", "--relative=ROOT", String, "Run under a relative root" ) do |opt|
+          options[:relative_root] = opt
+        end
+
         opts.on( "--include=MASK", String, "File mask of logs to add (default: **/*.log*)" ) do |opt|
           options[:log_files] ||= []
           options[:log_files] += opt

data/lib/clarity/commands/grep_command_builder.rb

@@ -39,7 +39,8 @@ class GrepCommandBuilder
 
   
   def gzip_tools
-    terms.empty? ? ['gzcat filename'] : ['zgrep options -e term filename'] + ['grep options -e term'] * (terms.size-1)
+    cat_tool = (ENV["PATH"].split(":").find{|d| File.exists?(File.join(d, "gzcat"))} ? "zcat" : "gzcat")
+    terms.empty? ? ["#{cat_tool} filename"] : ['zgrep options -e term filename'] + ['grep options -e term'] * (terms.size-1)
   end  
   
   def bzip_tools

data/lib/clarity/server.rb

@@ -15,7 +15,7 @@ module Clarity
     include Clarity::BasicAuth
     include Clarity::ChunkHttp
     
-    attr_accessor :required_username, :required_password
+    attr_accessor :required_username, :required_password, :relative_root
     attr_accessor :log_files    
     
     def self.run(options)
@@ -26,6 +26,7 @@ module Clarity
           a.log_files = options[:log_files]
           a.required_username = options[:username]
           a.required_password = options[:password]
+          a.relative_root = options[:relative_root] || ""
         end
 
         STDERR.puts "Clarity #{Clarity::VERSION} starting up."
@@ -37,7 +38,14 @@ module Clarity
         end
         
         STDERR.puts " * Log mask(s): #{options[:log_files].join(', ')}"
+        
+        if options[:username].nil? or options[:password].nil?
+          STDERR.puts " * WARNING: No username/password specified. This is VERY insecure."
+        end
+
         STDERR.puts
+        
+        
       end      
     end
 
@@ -73,7 +81,7 @@ module Clarity
         end
 
       when '/test'
-        response = init_chunk_response
+        response = respond_with_chunks
         EventMachine::add_periodic_timer(1) do 
           response.chunk "Lorem ipsum dolor sit amet<br/>"        
           response.send_chunks

data/views/_header.html.erb

@@ -1,5 +1,5 @@
 <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-<title>Clarity ~ A Log Search Tool</title>
-<link rel="stylesheet" href="/stylesheets/app.css" type="text/css" media="screen"> 
+<title>Clarity ~ A Log Search Tool<%= relative_root %></title>
+<link rel="stylesheet" href="<%= relative_root %>/stylesheets/app.css" type="text/css" media="screen"> 
 <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js" type="text/javascript"></script>
-<script src="/javascripts/app.js" type="text/javascript"></script>
+<script src="<%= relative_root %>/javascripts/app.js" type="text/javascript"></script>

data/views/_toolbar.html.erb

@@ -3,7 +3,7 @@
         <h1><a href="/">Clarity</a>  <span class='small' style='color:#aaa'>Log Search Tool</span></h1>
       </div>
 
-      <form id='search' method='get' action='/perform'>
+      <form id='search' method='get' action='<%= relative_root %>/perform'>
       <table class='actions'>
         <tr>
           <th>Action</th>
@@ -55,6 +55,7 @@
     </div>
     
     <script>
+        Search.url = "<%= relative_root %>" + Search.url;
         Search.init({ 'grep': <%= logfiles.map {|f| f }.to_json %>, 
                       'tail': <%= logfiles.map {|f| f if f =~ /log$/ }.compact.to_json %> },
                       <%= params.empty? ? 'null' : params.to_json %> );

metadata

@@ -1,37 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: clarity
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - "Tobias L\xC3\xBCtke"
 - John Tajima
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDMDCCAhigAwIBAgIBADANBgkqhkiG9w0BAQUFADA+MQ0wCwYDVQQDDAR0b2Jp
-  MRgwFgYKCZImiZPyLGQBGRYIbGVldHNvZnQxEzARBgoJkiaJk/IsZAEZFgNjb20w
-  HhcNMDkwNjA4MDAyMjE2WhcNMTAwNjA4MDAyMjE2WjA+MQ0wCwYDVQQDDAR0b2Jp
-  MRgwFgYKCZImiZPyLGQBGRYIbGVldHNvZnQxEzARBgoJkiaJk/IsZAEZFgNjb20w
-  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9eY669CSPwqcWqdZR28wy
-  LE6lF1RRS9KX2MEwiQML81UiY/yXz53Z082ISzUEcfzMUfVBwBO7y3NJF2th1/zt
-  MoEl24Me7ToU1wYfH0TOO6+gT++FmQyaGSuXWgXxEXyvnOP3k2wJ3IIgHvF8AUyW
-  i8GKFJKDmV/crocqOKu0A82Ugz0QGJbH+3gRk/BG926VffQUwQhcMV3c8+IWh/Ye
-  mx5mc1Wtykj945+G3XuCQFHcOUi4JKfDp5i/tce39ePNiXk74sn7X04O8aPrYRju
-  TPJC7yuwM1vOiR2yKutB+cjIG8srZiKN5IgqyECviHIpAOy7nDK5L5CexOYWEFxj
-  AgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQkWqDl
-  Oe9BDb/KLIhD4wMtnv8zkDANBgkqhkiG9w0BAQUFAAOCAQEAA6xfeq0PIZtUoz5i
-  Kr2bYQqgongNY/Mw4NMWN7cYYmIh1BUjWDnuOVffC3w3vnsUGOUUPeeBtQye4Dyy
-  zleZjlzOiOA4vFOnItldoElAo+gc5xoEmiE/P8AnCaIHEdgroeW+bZj3U3ReY7iu
-  z6rSwN5jLOnP2BmCdP/AgbAV3rW7hhgaz6nGx7O4hehQ/F1SbYhl115B6RpYF+tN
-  p9h9ap2kONwGQwBlo6oGQmuatzbfiVQRxhDj7JzyNaYQM4DR0+4vbu59vYFVSFHf
-  oz7Ippbls3jwI136whTuoiGZi/LDBc1Hw6iw99GGDR0vDGCLmPHyiJLfD6TbzzNo
-  oB0pMQ==
-  -----END CERTIFICATE-----
+cert_chain: []
 
-date: 2009-12-05 00:00:00 -05:00
+date: 2009-12-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -133,7 +112,7 @@ has_rdoc: true
 homepage: http://github.com/tobi/clarity
 licenses: []
 
-post_install_message: 
+post_install_message: PostInstall.txt
 rdoc_options: 
 - --main
 - README.rdoc

metadata.gz.sig

@@ -1 +0,0 @@
-�#�3��koh���P k0�����u�*ضC�8E��o�tLZJҩ%PՌBh]׋��C��|8�a�/�LA0�t��\�
��ơ�HBR~�����Ii֖4#P�t��hw��';�:���Q��ͭz�n�9��jn��\��k��؂3��:7��&/ޛ 䤆�ވ?d�np��07�F C��;�<���h��Vٟ����Yq��|�vC�<#9��T�\j�����N�����G<��.eCaN�o�ޏ