Return a consistent not found message

This prevents leakage of project names on an endpoint which is
unauthenticated and thus open to the world.

2 files changed, 5 insertions, 4 deletions

diff --git a/lib/api/services.rb b/lib/api/services.rb
index e3c6a998631..4d23499aa39 100644
--- a/lib/api/services.rb
+++ b/lib/api/services.rb
@@ -67,7 +67,8 @@ module API
       post ':id/services/:service_slug/trigger' do
         project = Project.find_with_namespace(params[:id]) || Project.find_by(id: params[:id])
 
-        not_found! unless project
+        # This is not accurate, but done to prevent leakage of the project names
+        not_found!('Service') unless project
 
         service = project_service(project)
 
@@ -77,7 +78,7 @@ module API
           status result[:status] || 200
           present result
         else
-          not_found!
+          not_found!('Service')
         end
       end
     end
diff --git a/lib/mattermost/presenter.rb b/lib/mattermost/presenter.rb
index b4e7358770f..f76d0376a98 100644
--- a/lib/mattermost/presenter.rb
+++ b/lib/mattermost/presenter.rb
@@ -14,8 +14,8 @@ module Mattermost
       end
 
       def help(commands, trigger)
-        if commands.empty?
-          ephemeral_response("No commands configured") unless messages.count > 1
+        if commands.zero?
+          ephemeral_response("No commands configured")
         else
           message = header_with_list("Available commands", commands)