[api] Don't infloop in delete_project_pubkey

openSUSE · Nov 20, 2013 · b444bfe · b444bfe
1 parent 775b9c4
commit b444bfe
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/api/app/controllers/source_controller.rb b/src/api/app/controllers/source_controller.rb
@@ -631,6 +631,9 @@ def delete_project_pubkey
         pass_to_backend path
         return
       end
+      if not upperProject.include? ':'
+        break
+      end
       upperProject = upperProject.gsub(/:[^:]*$/, '')
     end
 

diff --git a/src/api/test/functional/source_controller_test.rb b/src/api/test/functional/source_controller_test.rb
@@ -1883,6 +1883,19 @@ def test_public_keys
     delete '/source/kde4/_pubkey'
     assert_response 403
 
+    login_king
+    subprojectmeta="<project name='DoesNotExist:subproject'><title></title><description/></project>"
+    put url_for(:controller => :source, :action => :update_project_meta, :project => 'DoesNotExist:subproject'), subprojectmeta
+    assert_response :success
+
+    delete '/source/DoesNotExist:subproject/_pubkey'
+    assert_response :success
+
+    delete '/source/DoesNotExist:subproject'
+    assert_response :success
+
+    login_tom
+
     # FIXME: make a successful deletion of a key
 
     # via new _project route