Relax public key validation for old (possibly non-conforming) keys.

Author: kubitron

Diff for: app/controllers/gitolite_public_keys_controller.rb

@@ -127,7 +127,10 @@ def find_gitolite_public_key
 
     def destroy_key
 	@gitolite_public_key[:active] = 0
-	@gitolite_public_key.save
+
+	# Since we are ultimately destroying this key, just force save (since old keys may fail new validations)
+	@gitolite_public_key.save((Rails::VERSION::STRING.split('.')[0].to_i > 2) ? { :validate => false } : false)
+
 	flash[:notice] = l(:notice_public_key_deleted, :title=>keylabel(@gitolite_public_key))
     end
 end

Diff for: app/models/gitolite_public_key.rb

@@ -98,12 +98,18 @@ def self.user_to_user_token(user)
 
     # Strip leading and trailing whitespace
     def strip_whitespace
+	# Don't mess with existing keys (since cannot change key text anyway)
+	return if !new_record?
+
 	self.title = title.strip
 	self.key = key.strip
     end
 
     # Remove control characters from key
     def remove_control_characters
+	# Don't mess with existing keys (since cannot change key text anyway)
+	return if !new_record?
+
 	# First -- let the first control char or space stand (to divide key type from key)
 	# Really, this is catching a special case in which there is a \n between type and key.
 	# Most common case turns first space back into space....
@@ -126,7 +132,7 @@ def has_not_been_changed
     end
 
     def key_format_and_uniqueness
-	return if key.blank? || !new_record?
+	return if key.blank?
 
 	# First, check that key crypto type is present and of correct form.  Also, decode base64 and see if key
 	# crypto type matches.	Note that we ignore presence of comment!
@@ -185,6 +191,7 @@ def key_format_and_uniqueness
 	allkeys += (GitolitePublicKey.active.all)
 
 	allkeys.each do |existingkey|
+	    next if existingkey.id == id
 	    existingpieces = existingkey.key.match(/^(\S+)\s+(\S+)/)
 	    if existingpieces && (existingpieces[2] == keypieces[2])
 		# Hm.... have a duplicate key!