confman 0.0.2 → 0.0.3

data/LICENSE.txt

@@ -1,22 +1,38 @@
-Copyright (c) 2013 Masahji Stewart
+All other components of this product are
+Copyright (c) 2013 Synctree, Inc.  All rights reserved.
 
-MIT License
+Certain inventions disclosed in this file may be claimed within
+patents owned or patent applications filed by Synctree, Inc. or third
+parties.
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Subject to the terms of this notice, Synctree grants you a
+nonexclusive, nontransferable license, without the right to
+sublicense, to (a) install and execute one copy of these files on any
+number of workstations owned or controlled by you and (b) distribute
+verbatim copies of these files to third parties.  As a condition to the
+foregoing grant, you must provide this notice along with each copy you
+distribute and you must not remove, alter, or obscure this notice. All
+other use, reproduction, modification, distribution, or other
+exploitation of these files is strictly prohibited, except as may be set
+forth in a separate written license agreement between you and New
+Relic.  The terms of any such license agreement will control over this
+notice.  The license stated above will be automatically terminated and
+revoked if you exceed its scope or violate any of the terms of this
+notice.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+This License does not grant permission to use the trade names,
+trademarks, service marks, or product names of Synctree, except as
+required for reasonable and customary use in describing the origin of
+this file and reproducing the content of this notice.  You may not
+mark or brand this file with any trade name, trademarks, service
+marks, or product names other than the original brand (if any)
+provided by Synctree.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Unless otherwise expressly agreed by Synctree in a separate written
+license agreement, these files are provided AS IS, WITHOUT WARRANTY OF
+ANY KIND, including without any implied warranties of MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE, or NON-INFRINGEMENT.  As a
+condition to your use of these files, you are solely responsible for
+such use. Synctree will have no liability to you for direct,
+indirect, consequential, incidental, special, or punitive damages or
+for lost profits or data.

data/confman.gemspec

@@ -11,7 +11,6 @@ Gem::Specification.new do |spec|
   spec.description   = 'Confman ruby client'
   spec.summary       = ''
   spec.homepage      = ""
-  spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -19,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rest-client", "~> 1"
+  spec.add_dependency "daemons", "~> 1"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rspec", "~> 2.6"

data/lib/confman/access.rb

@@ -9,14 +9,18 @@ class Confman::Access
   end
 
   def extract_keys(file = authorized_keys_location)
-    r = { :keys => [] } 
+    r = { :manual_keys => [], :users => {} } 
     return r unless File.exists?(file)
     File.readlines(file).each do |key|
       key.chomp!
       if key =~ /^#\sAM\s([^=]+)=(.*)$/
         r[$1.to_sym] = $2
+      elsif key =~ /^environment=\"AM_USER=([^\"]+)\"\s(.*)$/
+        r[:users][$1] ||= []
+        r[:users][$1].push($2)
+
       elsif key =~ /^ssh-/
-        r[:keys].push(key.chomp)
+        r[:manual_keys].push(key.chomp)
       end
     end
     r
@@ -54,8 +58,13 @@ class Confman::Access
     current_keys = extract_keys
     new_keys = request_new_keys 
 
-    if new_keys[:updated_at] != current_keys[:updated_at]
-      new_keys[:manual_keys] = current_keys[:keys].reject { |key| key =~ /AM_USER/ }
+    keys_changed = current_keys[:users].keys.sort != new_keys[:users].keys.sort
+    current_keys[:users].each do |user, ssh_keys|
+      keys_changed = true if ssh_keys.sort != new_keys[:users][user].sort
+    end unless keys_changed
+
+    if keys_changed
+      new_keys[:manual_keys] = current_keys[:manual_keys]
 
       new_authorized_keys_file = "#{authorized_keys_location}.#{Time.now.to_i}"
       save_keys(new_keys, new_authorized_keys_file)

data/lib/confman/cli.rb

@@ -1,5 +1,6 @@
 require 'confman'
 require 'optparse'
+require 'daemons'
 
 class Confman::CLI
   @@options = {}
@@ -25,6 +26,7 @@ class Confman::CLI
       opt.separator  "     export -n <name> -f <outputfile>: Imports conf_set named 'name' into a file."
       opt.separator  "     init -e <endpoint> -k <key>: Sets up config. Run this before querying the ConfMan server.(run as root)"
       opt.separator  "     reset_keys: Resets authorized keys for the current user."
+      opt.separator  "     keyd: Periodically Resets authorized keys for the current user"
       opt.separator  ""
       opt.separator  "Options"
 
@@ -47,7 +49,7 @@ class Confman::CLI
 
     @@opt_parser.parse!(args)
 
-    if respond_to?(command)
+    if command && respond_to?(command)
       send(command)
     else
       puts @@opt_parser
@@ -87,6 +89,15 @@ class Confman::CLI
     Confman.access.reset_keys
   end
 
+  def self.keyd
+    Daemons.run_proc('keyd') do
+      loop do
+        reset_keys
+        sleep(60)
+      end
+    end
+  end
+
   def self.exportall
     out = @@options[:outputfile] ? File.open(@@options[:outputfile], "w") : STDOUT
     out.write(Confman.api.conf_sets)

data/lib/confman/version.rb

@@ -1,3 +1,3 @@
 module Confman
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: confman
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: daemons
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,8 +116,7 @@ files:
 - spec/confman_spec.rb
 - spec/data_store_spec.rb
 homepage: ''
-licenses:
-- MIT
+licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths: