ts-admin 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3068ade8215ebae2e713dd66121329a63d3e1450
-  data.tar.gz: 574a719ab77ecf0c8cd59a5ada99834a4d730c5e
+  metadata.gz: 528db841c6ef8e98947079034726aa5a4ce3214b
+  data.tar.gz: 5fe471e105e13a03729202b24991bd301c357825
 SHA512:
-  metadata.gz: 76a48e77f48113002c5ae98f7e3b053c971b41795b8cb20757a5a8bb06fe5f2de9b58c125eb73efcc2706a051a07aab9b5be4c1ed9d37985ffef02db39ba7bdb
-  data.tar.gz: 1bd74737065d1146b5c6eea3930fc6e32f3f9ccceb3eb55b0378d421c6bd7c98e220091602e6be5b79892c7bdf3c02dd530eabc0c60c024160996392e0e85f09
+  metadata.gz: 68fd21ece886a89189657474545b41a7098164e946bae268d82a6a848f8d32884186b368e6118bf1481979dbce20257bdfef2ae96d958454a4dd32a89ff2b037
+  data.tar.gz: c1ad67697964dc72e52e1c0d558f203fef5d92c001e9b6a69e8218034c1a57dfcad6dbf136f0004768b352dfaeb9cfd50a9859ec810ad085b3ae76cfba473564

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ts-admin (0.2.2)
+    ts-admin (0.2.3)
       ramaze (>= 2.0.0)
 
 GEM

data/app.yml.example

@@ -1,8 +1,9 @@
 port: 7000
 
 auth:
-  username: admin
-  password: d033e22ae348aeb5660fc2140aec35850c4da997 # SHA1 hash
+  -
+    username: admin
+    password: d033e22ae348aeb5660fc2140aec35850c4da997 # SHA1 hash
 
 traffic_server:
   config_path: /etc/trafficserver

data/bin/ts-admin

@@ -10,6 +10,9 @@ OptionParser.new do |opts|
   opts.on("-c", "--config [path]", "Port") do |config|
     OPTIONS[:config] = config
   end
+  opts.on("--ip [ip]", "IP") do |ip|
+    OPTIONS[:ip] = ip
+  end
   opts.on("-p", "--port [port]", "Port") do |port|
     OPTIONS[:port] = port.to_i
   end
@@ -20,6 +23,7 @@ require File.expand_path('../../app', __FILE__)
 
 Ramaze.start(
   :adapter => :webrick,
+  :host    => OPTIONS[:ip] || APP_CONFIG['ip'] || nil,
   :port    => OPTIONS[:port] || APP_CONFIG['port'] || 7000,
   :file    => __FILE__,
   :root    => Ramaze.options.roots

data/controller/init.rb

@@ -30,11 +30,18 @@ class Controller < Ramaze::Controller
     return unless username and password
     return if username.empty? or password.empty?
 
-    return unless APP_CONFIG['auth']['username'].downcase == username.downcase
-    return unless APP_CONFIG['auth']['password'] == Digest::SHA1.hexdigest(password)
+    authenticated = false
+    auth = APP_CONFIG['auth'].is_a?(Array) ? APP_CONFIG['auth'] : [APP_CONFIG['auth']]
+    auth.each do |a|
+      next unless a['username'].downcase == username.downcase
+      next unless a['password'] == Digest::SHA1.hexdigest(password)
+      authenticated = true
+    end
+
+    return unless authenticated
 
     session[:logged_in] = true
-    session[:username] = APP_CONFIG['auth']['username']
+    session[:username] = username.downcase
   end
 
   def login_required

data/lib/ts-admin/version.rb

@@ -1,3 +1,3 @@
 module TSAdmin
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ts-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2013-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler