knife-ec-backup 2.0.0.beta.1 → 2.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24f0f5bf6187090c18829999dd6ae339b8f97f44
-  data.tar.gz: c90dc04b94f007fb059a03021e2d951411e60d92
+  metadata.gz: 6a427844677521bea76fb22774f405ae3ed97af6
+  data.tar.gz: ac92e509e8ecee7a4e14852f99c5e43a72305306
 SHA512:
-  metadata.gz: d8f804e4a2a9bcc0486c86f618af446f3d8cea3a8ce002a39705db49652d6301ac5d68d65b1224c0f5b2db60a8eca620b50c0012a3fabff08ce40762555f1389
-  data.tar.gz: 0c5f596befa740f26deb0b7bc4bc50065333904d039ce22ded2e9bf02768e5c0475660c4a2d7723d1359901372a58b50463408b2683b6f6e9cfc56f65e469f69
+  metadata.gz: 4f27a84674dc02eaee070700efc7f8bf4e898710342d1059b3881deb6c4bd9b75b4aef109708604364a0188cf65a7c67b665460b08c47e019c3abdf77ca0a8a3
+  data.tar.gz: ad983d25da97492db691b431ac6fef6f60f468d314ea2909f74132eec633053a8a26cd88b03890703d6fa86f8bd133b7f9ca77091fccda2fdb603406682ff817

data/lib/chef/knife/ec_backup.rb

@@ -33,6 +33,25 @@ class Chef
         :long => '--only-org ORGNAME',
         :description => "Only back up objects in the named organization (default: all orgs)"
 
+      option :sql_host,
+        :long => '--sql-host HOSTNAME',
+        :description => 'Postgresql database hostname (default: localhost)',
+        :default => "localhost"
+
+      option :sql_port,
+        :long => '--sql-port PORT',
+        :description => 'Postgresql database port (default: 5432)',
+        :default => 5432
+
+      option :sql_user,
+        :long => "--sql-user USERNAME",
+        :description => 'User used to connect to the postgresql database.'
+
+      option :sql_password,
+        :long => "--sql-password PASSWORD",
+        :description => 'Password used to connect to the postgresql database'
+
+
       deps do
         require 'chef/chef_fs/config'
         require 'chef/chef_fs/file_system'
@@ -149,8 +168,10 @@ class Chef
           Chef::Knife::EcKeyExport.deps
           k = Chef::Knife::EcKeyExport.new
           k.name_args = ["#{dest_dir}/key_dump.json"]
-          k.config[:sql_host] = "localhost"
-          k.config[:sql_port] = 5432
+          k.config[:sql_host] = config[:sql_host]
+          k.config[:sql_port] = config[:sql_port]
+          k.config[:sql_user] = config[:sql_user]
+          k.config[:sql_password] = config[:sql_password]
           k.run
         end
 

data/lib/chef/knife/ec_key_export.rb

@@ -37,7 +37,7 @@ class Chef
       end
 
       def export(path)
-        users = db.select(:username, :id, :public_key, :pubkey_version, :hashed_password, :salt, :hash_type).from(:users)
+        users = db.select.from(:users)
         File.open(path, 'w') { |file| file.write(users.all.to_json) }
       end
     end

data/lib/chef/knife/ec_key_import.rb

@@ -52,32 +52,31 @@ class Chef
       def import(path)
         key_data = JSON.parse(File.read(path))
         key_data.each do |d|
-          id = d['id']
-          username = d['username']
-          key = d['public_key']
-          version = d['pubkey_version']
-          hashed_password = d['hashed_password']
-          hash_type = d['hash_type']
-          salt = d['salt']
-
-          if username == 'pivotal' && config[:skip_pivotal]
+          if d['username'] == 'pivotal' && config[:skip_pivotal]
             ui.warn "Skipping pivotal user."
             next
           end
 
-          ui.msg "Updating key for #{username}"
-          users_to_update = db[:users].where(:username => username)
+          ui.msg "Updating key for #{d['username']}"
+          users_to_update = db[:users].where(:username => d['username'])
+
           if users_to_update.count != 1
-            ui.warn "Wrong number of users to update for #{username}. Skipping"
+            ui.warn "Wrong number of users to update for #{d['username']}. Skipping"
           else
-            data = { :public_key => key,
-              :pubkey_version => version,
-              :salt => salt,
-              :hashed_password => hashed_password,
-              :hash_type => hash_type
-            }
-            data[:id] = id unless config[:skip_ids]
-            users_to_update.update(data)
+            # Remove authz id from import since this will no longer
+            # be valid.
+            d.delete('authz_id')
+            d.delete('id') if config[:skip_ids]
+            # If the hash_type in the export,
+            # we are dealing with a record where the password is still in the
+            # serialized_obejct.  Explictly setting these to nil ensures that the
+            # password set in the restore is wiped out.
+            unless d.has_key?('hash_type')
+              d['hash_type'] = nil
+              d['hashed_password'] = nil
+              d['salt'] = nil
+            end
+            users_to_update.update(d)
           end
         end
       end

data/lib/chef/knife/ec_restore.rb

@@ -43,6 +43,24 @@ class Chef
         :long => "--with-user-sql",
         :description => "Restore user id's, passwords, and keys from sql export"
 
+      option :sql_host,
+        :long => '--sql-host HOSTNAME',
+        :description => 'Postgresql database hostname (default: localhost)',
+        :default => "localhost"
+
+      option :sql_port,
+        :long => '--sql-port PORT',
+        :description => 'Postgresql database port (default: 5432)',
+        :default => 5432
+
+      option :sql_user,
+        :long => "--sql-user USERNAME",
+        :description => 'User used to connect to the postgresql database.'
+
+      option :sql_password,
+        :long => "--sql-password PASSWORD",
+        :description => 'Password used to connect to the postgresql database'
+
       deps do
         require 'chef/json_compat'
         require 'chef/chef_fs/config'
@@ -218,7 +236,7 @@ class Chef
             ui.warn("Skipping pivotal update.  To overwrite pivotal, pass --overwrite-pivotal.")
             next
           end
-          
+
           # Update user object
           user = JSONCompat.from_json(IO.read("#{dest_dir}/users/#{name}.json"))
           begin
@@ -242,8 +260,10 @@ class Chef
         k.name_args = ["#{dest_dir}/key_dump.json"]
         k.config[:skip_pivotal] = true
         k.config[:skip_ids] = false
-        k.config[:sql_host] = "localhost"
-        k.config[:sql_port] = 5432
+        k.config[:sql_host] = config[:sql_host]
+        k.config[:sql_port] = config[:sql_port]
+        k.config[:sql_user] = config[:sql_user]
+        k.config[:sql_password] = config[:sql_password]
         k.run
       end
 
@@ -307,8 +327,8 @@ class Chef
             Chef::ChefFS::FileSystem.copy_to(Chef::ChefFS::FilePattern.new(path), chef_fs_config.local_fs, chef_fs_config.chef_fs, nil, config, ui, proc { |entry| chef_fs_config.format_path(entry) })
           end
           # restore clients to groups, using the pivotal key again
-          Chef::Config[:node_name] = old_config['node_name']
-          Chef::Config[:client_key] = old_config['client_key']
+          Chef::Config[:node_name] = old_config[:node_name]
+          Chef::Config[:client_key] = old_config[:client_key]
           Chef::Config.custom_http_headers = {}
           ['admins', 'billing-admins'].each do |group|
             restore_group(Chef::ChefFS::Config.new, group)

data/lib/knife_ec_backup/version.rb

@@ -1,3 +1,3 @@
 module KnifeECBackup
-  VERSION = '2.0.0.beta.1'
+  VERSION = '2.0.0.beta.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-ec-backup
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.1
+  version: 2.0.0.beta.2
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Backup and Restore of Enterprise Chef