| |   |
| 3 | 3 | require "yaml" |
| 4 | 4 | if File.symlink?(__FILE__) |
| 5 | 5 | $:.unshift File.dirname(File.readlink(__FILE__)) + "/../lib/gitorious/ssh" |
| 6 | | conf_file = File.dirname(File.readlink(__FILE__)) + "/../config/gitorious.yml" |
| 6 | BASE_DIR = File.dirname(File.readlink(__FILE__)) + "/../" |
| 7 | conf_file = File.join(BASE_DIR, "config/gitorious.yml") |
| 7 | 8 | else |
| 8 | 9 | $:.unshift File.dirname(__FILE__) + "/../lib/gitorious/ssh" |
| 9 | | conf_file = File.dirname(__FILE__) + "/../config/gitorious.yml" |
| 10 | BASE_DIR = File.dirname(__FILE__) + "/../" |
| 11 | conf_file = File.join(BASE_DIR, "config/gitorious.yml") |
| 10 | 12 | end |
| 11 | 13 | |
| 12 | 14 | GitoriousConfig = YAML.load_file(conf_file) |
| 13 | 15 | |
| 14 | 16 | ENV["PATH"] = "/usr/local/bin/:/opt/local/bin:#{ENV["PATH"]}" |
| 15 | 17 | |
| 18 | require "logger" |
| 16 | 19 | require "strainer" |
| 17 | 20 | require "client" |
| 18 | 21 | |
| 19 | 22 | File.umask(0022) |
| 20 | | |
| 21 | 23 | original_command = ENV["SSH_ORIGINAL_COMMAND"] |
| 24 | user = ARGV[0] |
| 25 | |
| 26 | logger = Logger.new(File.join(BASE_DIR, "log", "gitorious_auth.log")) |
| 27 | logger.formatter = Logger::Formatter.new |
| 28 | logger.level = Logger::INFO |
| 29 | logger.formatter.datetime_format = "%Y-%m-%d %H:%M:%S" |
| 30 | logger.info("Connection from #{ENV['SSH_CLIENT'].inspect} (#{user || nil}): #{original_command || nil}") |
| 31 | |
| 22 | 32 | $stderr.puts "original_command: #{original_command.inspect}" if $DEBUG |
| 23 | 33 | if original_command.nil? || original_command.strip.empty? |
| 24 | 34 | $stderr.puts "Need SSH_ORIGINAL_COMMAND" |
| 25 | 35 | exit!(1) |
| 26 | 36 | end |
| 27 | 37 | |
| 28 | | user = ARGV[0] |
| 29 | 38 | $stderr.puts "user: #{user.inspect}" if $DEBUG |
| 30 | 39 | if user.nil? || user.strip.empty? |
| 31 | 40 | $stderr.puts "Need user arg" |
| toggle raw diff |
--- a/script/gitorious
+++ b/script/gitorious
@@ -3,29 +3,38 @@
require "yaml"
if File.symlink?(__FILE__)
$:.unshift File.dirname(File.readlink(__FILE__)) + "/../lib/gitorious/ssh"
- conf_file = File.dirname(File.readlink(__FILE__)) + "/../config/gitorious.yml"
+ BASE_DIR = File.dirname(File.readlink(__FILE__)) + "/../"
+ conf_file = File.join(BASE_DIR, "config/gitorious.yml")
else
$:.unshift File.dirname(__FILE__) + "/../lib/gitorious/ssh"
- conf_file = File.dirname(__FILE__) + "/../config/gitorious.yml"
+ BASE_DIR = File.dirname(__FILE__) + "/../"
+ conf_file = File.join(BASE_DIR, "config/gitorious.yml")
end
GitoriousConfig = YAML.load_file(conf_file)
ENV["PATH"] = "/usr/local/bin/:/opt/local/bin:#{ENV["PATH"]}"
+require "logger"
require "strainer"
require "client"
File.umask(0022)
-
original_command = ENV["SSH_ORIGINAL_COMMAND"]
+user = ARGV[0]
+
+logger = Logger.new(File.join(BASE_DIR, "log", "gitorious_auth.log"))
+logger.formatter = Logger::Formatter.new
+logger.level = Logger::INFO
+logger.formatter.datetime_format = "%Y-%m-%d %H:%M:%S"
+logger.info("Connection from #{ENV['SSH_CLIENT'].inspect} (#{user || nil}): #{original_command || nil}")
+
$stderr.puts "original_command: #{original_command.inspect}" if $DEBUG
if original_command.nil? || original_command.strip.empty?
$stderr.puts "Need SSH_ORIGINAL_COMMAND"
exit!(1)
end
-user = ARGV[0]
$stderr.puts "user: #{user.inspect}" if $DEBUG
if user.nil? || user.strip.empty?
$stderr.puts "Need user arg" |