Fix some api error action handling

rundeck · Feb 16, 2011 · 2a1bea6 · 2a1bea6
1 parent 1d74fc8
commit 2a1bea6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/rundeckapp/grails-app/conf/ApiRequestFilters.groovy b/rundeckapp/grails-app/conf/ApiRequestFilters.groovy
@@ -29,7 +29,7 @@ public class ApiRequestFilters {
     public final static int API_MIN_VERSION=API_CURRENT_VERSION
     public final static int API_MAX_VERSION=API_CURRENT_VERSION
 
-    def allowed_actions=["renderError","invalid"]
+    def allowed_actions=["renderError","invalid","error"]
     def filters = {
             /**
              * Require valid api version in request path /api/version/...

diff --git a/rundeckapp/grails-app/conf/UrlMappings.groovy b/rundeckapp/grails-app/conf/UrlMappings.groovy
@@ -8,7 +8,6 @@ class UrlMappings {
         /*******
         * API url paths, v1
         */
-        "/api/$api_version/$action?"(controller: 'api', action: 'invalid')
         "/api/$api_version/error"(controller: 'api', action: 'error')
         "/api/$api_version/execution/$id"(controller: 'execution', action: 'apiExecution')
         "/api/$api_version/execution/$id/abort"(controller: 'execution', action: 'apiExecutionAbort')
@@ -25,10 +24,12 @@ class UrlMappings {
         "/api/$api_version/project/$project?"(controller: 'framework', action: 'apiProject')
         "/api/$api_version/projects"(controller: 'framework', action: 'apiProjects')
         "/api/renderError"(controller: 'api', action: 'renderError')
+        "/api/error"(controller: 'api', action: 'error')
         "/api/$api_version/resources"(controller: 'framework', action: 'apiResources')
         "/api/$api_version/resource/$name"(controller: 'framework', action: 'apiResource')
         "/api/$api_version/run/command"(controller: 'scheduledExecution', action: 'apiRunCommand')
         "/api/$api_version/run/script"(controller: 'scheduledExecution', action: 'apiRunScript')
+        "/api/$api_version/$action?"(controller: 'api', action: 'invalid')
 
         //simplified url mappings for link generation
         "/run/$id?"(controller: 'framework', action: 'nodes')