dtk-common 0.5.11 → 0.5.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTc5NTVkYjZlM2Y2MTRlYjE1YzY0YmQ4OTdlMmRlZDUwN2VmYmE3MQ==
+    ZGU3ZDY1NjdiMmQ2ZGY0ZGQ4NDIxMWJmZGUwNGRlODMxMTcwMzBmNw==
   data.tar.gz: !binary |-
-    YjVjZGNmYWEwZWZhN2JhZjAyODA2MDU3Yjg3YWQyYWE3MzYxYTIwYw==
+    MTI5OTVkZDM5YWRlNTcxMjViODA0NzdiN2FhOWNlNTdmMTRmMmY3MQ==
 SHA512:
   metadata.gz: !binary |-
-    MjM5ZjVhZDAzNjZjN2Q1YWY3NjY3ZmQ1Y2Q1ZTIyM2Q1NjE5YTdhODBiNTY2
-    OTlkMmQ3MWM2MTZlNzRkMzQwYTFjNGVmZmRhNmYxYTEzZmUxZWY3MDU5NTk5
-    N2ZiMTE3ZjcyMTAyYjkzNGM0OWUyZGRkYWU5MjQ3NGUxYTk5OWY=
+    ZTMyNzJmNjE5ZTUzMWFhY2IwMTQ2YzZhMDBhNGM4N2Q3NzU4NWY5MGUzMTRj
+    ZGYyM2E2Y2VkZTM4MDYyNjIyMmI5Y2QwZWM3MWRhOWQxOTQyMGEyYjU4ZjMy
+    MGFjZDQ0ZWEzNWEwMDQ0ZTJlYjdmNGVhODVhMzEzNWMzMDM5NGY=
   data.tar.gz: !binary |-
-    YmQ4YTA3MzU4MDI0M2YyZjE2YTIwNjkxMzQzZGQ3ZDZhNjZhNjZkNWFmN2Jj
-    YTQ1MmRkZGExZGIyZDk5ZjI1ZDJhM2I1MTZjZjVmNmM1NDdmMGRlM2I0NjQ0
-    ZDNkMDNiNWVhODVjYTFiNDQ4MjFkMDVkZmIwODMyNzI3ODU5OWM=
+    OTJlNmY0Y2Q3YzFmOGE1Zjc0MTczMWQ2YTdkOTQxNTRkNDU3M2IzNDUzNzQ2
+    N2IwYmMxMGE2MmY2OTg4YzEwNzAyYjVhMzE0YzZiZjQ5ZGQyZjhmNmZjNGIy
+    NTEyNjI3ZjUzYWRiZWIwOTY5YzNhMjYzZmY1YjQzNzcxMTM5NzA=

data/lib/dtk-common/version.rb

@@ -1,3 +1,3 @@
 module DtkCommon
-  VERSION = "0.5.11"
+  VERSION = "0.5.12"
 end

data/lib/gitolite/init.rb

@@ -1,8 +1,7 @@
 # use to require all needed files needed for running dtk-common gitolite lib
 require 'grit'; require 'erubis'
 
-Grit.debug = true
-
+Grit.debug = false
 
 require File.expand_path('manager.rb', File.dirname(__FILE__))
 require File.expand_path('configuration.rb', File.dirname(__FILE__))

data/lib/gitolite/manager.rb

@@ -37,14 +37,16 @@ module Gitolite
       group_conf
     end
 
-    def create_user(username, rsa_pub_key, opts={})
-      key_path = @configuration.user_key_path(username)
+    # this should be depracated
+    def create_user(username, rsa_pub_key, rsa_pub_key_name)
+      key_name = "#{username}@#{rsa_pub_key_name}"
+      key_path = @configuration.user_key_path(key_name)
 
       if users_public_keys().include?(key_path)
-        raise ::Gitolite::Duplicate, "Trying to create a user (#{username}) that exists already on gitolite server"
+        raise ::Gitolite::Duplicate, "Public key (#{rsa_pub_key_name}) already exists for user (#{username}) on gitolite server"
       end
 
-      add_commit_file(key_path,rsa_pub_key, "Added RSA public key for user '#{username}'")
+      add_commit_file(key_path,rsa_pub_key, "Added public key (#{rsa_pub_key_name}) for user (#{username}) ")
 
       key_path
     end
@@ -52,15 +54,40 @@ module Gitolite
     def delete_user(username)
       key_path = @configuration.user_key_path(username)
 
-      unless users_public_keys().include?(key_path)
+      has_there_been_deletion = remove_public_keys_for_user!(username)
+
+      unless has_there_been_deletion
         raise ::Gitolite::NotFound, "User (#{username}) not found on gitolite server"
       end
 
-      remove_file(key_path, "Removing RSA public key for user '#{username}'")
       username
     end
 
-    def remove_user_group(group_name)
+    def add_pub_key!(username, rsa_pub_key_name, rsa_pub_key)
+      file_name = "#{username}@#{rsa_pub_key_name}"
+      key_path  = @configuration.user_key_path(file_name)
+
+      if users_public_keys().include?(key_path)
+        raise ::Gitolite::Duplicate, "Duplicate public key (#{rsa_pub_key_name}) for user (#{username})"
+      end
+
+      add_commit_file(key_path, rsa_pub_key, "Added RSA public key (#{file_name}) for user (#{username})")
+      file_name
+    end
+
+    def remove_pub_key!(username, rsa_pub_key_name)
+      file_name = "#{username}@#{rsa_pub_key_name}"
+      key_path  = @configuration.user_key_path(file_name)
+
+      unless users_public_keys().include?(key_path)
+        raise ::Gitolite::NotFound, "Public key (#{rsa_pub_key_name}) for user (#{username}) not found"
+      end
+
+      remove_file(key_path, "Remove public key (#{rsa_pub_key_name}) for user (#{username})")
+      true
+    end
+
+    def delete_user_group!(group_name)
       group_path = @configuration.user_group_path(group_name)
 
       unless user_group_list.include?(group_path)
@@ -94,6 +121,31 @@ module Gitolite
       end
     end
 
+    # only to help with migration, to be deleted later TODO: Delete
+    def migrate_to_multiple_pub_keys()
+      all_pub_keys = users_public_keys()
+      base_path    = @configuration.keydir_path
+
+      puts "Starting migration of PUB keys from old format to new! (This can take a while)"
+      all_pub_keys.each do |pub_key_path|
+        # skip git pub or already migrated key
+        unless pub_key_path.match(/.*git.pub$/) || pub_key_path.include?('@')
+          file_name = extract_file_name(pub_key_path,base_path,:pub)
+          pub_content = gitolite_admin_repo().file_content(pub_key_path)
+
+          # delete_user
+          remove_file(pub_key_path, "Migrating user ('#{file_name}') to new annotation, temporary removing user")
+
+          # create user
+          create_user(file_name, pub_content)
+        end
+      end
+      puts "End migration of pub keys"
+      require 'pp'
+      pp users_public_keys
+      puts "--------------- END ---------------"
+    end
+
   private
 
     def gitolite_admin_repo()
@@ -128,20 +180,8 @@ module Gitolite
       @commit_messages << commit_msg
     end
 
-
-    class << self
-
-      def repo_name_from_file_name(file_name, repo_file_path)
-        if file_name =~ Regexp.new("^#{repo_file_path}/(.+)\.conf")
-          $1
-        else
-          raise Error.new("File name not properly formed for repo config file name (#{file_name})")
-        end
-      end
-    end
-
     def extract_file_name(full_path_name, file_path, file_extension)
-      if file_name =~ Regexp.new("^#{full_path_name}/(.+)\.#{file_extension}")
+      if full_path_name =~ Regexp.new("^#{file_path}/(.+)\.#{file_extension}")
         $1
       else
         raise ::Gitolite::ParseError.new("File name not properly formed (#{full_path_name}), expected match based on '#{file_path}/*.#{file_extension}'")
@@ -154,5 +194,38 @@ module Gitolite
       paths.select{ |p| p =~ match_regexp }
     end
 
+    def remove_public_keys_for_user!(username)
+      all_pub_keys = users_public_keys()
+      base_path    = @configuration.keydir_path
+      is_deleted   = false
+
+      all_pub_keys.each do |pub_key_path|
+        file_name = extract_file_name(pub_key_path,base_path,:pub)
+
+        # looking only at pub keys will '@' in their names
+        if file_name.include?('@')
+          files_username, files_pub_name = file_name.split('@')
+
+          # e.g. for user 'haris' we remove haris@home.pub, haris@work.pub
+          if files_username && files_username.eql?(username)
+            remove_file(pub_key_path, "Remove public key (#{files_pub_name}) for user (#{username})")
+            is_deleted = true
+          end
+        end
+      end
+      
+      is_deleted
+    end
+
+    def number_of_public_keys_for_user(username)
+      all_pub_keys = users_public_keys()
+      base_path    = @configuration.keydir_path
+
+      return all_pub_keys.count do |pub_key_path|
+        file_name = extract_file_name(pub_key_path,base_path,:pub)
+        (file_name.eql?(username) || file_name.match(/^#{username}@/))
+      end
+    end
+
   end
 end

data/lib/grit_adapter/file_access.rb

@@ -6,6 +6,7 @@ module DTK; module Common; class GritAdapter
     require File.expand_path('file_access/diff', File.dirname(__FILE__))
     include StatusMixin
     include DiffMixin
+    
     def add_file(file_rel_path, content=nil)
       content ||= String.new
       file_path = qualified_path(file_rel_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-common
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.12
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Common libraries used for DTK CLI client.