From 34a0bccd2ede6231e4cac79bc7f34149c1dd45c0 Mon Sep 17 00:00:00 2001 From: nikhiljindal Date: Tue, 16 Jun 2015 14:07:40 -0700 Subject: [PATCH] Stop supporting TRACE proxy requests --- api/swagger-spec/v1.json | 188 --------------------------------- api/swagger-spec/v1beta3.json | 188 --------------------------------- pkg/apiserver/api_installer.go | 1 - 3 files changed, 377 deletions(-) diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json index d56c46dfd8c..267d165fbfc 100644 --- a/api/swagger-spec/v1.json +++ b/api/swagger-spec/v1.json @@ -3393,36 +3393,6 @@ "consumes": [ "*/*" ] - }, - { - "type": "string", - "method": "TRACE", - "summary": "proxy TRACE requests to Node", - "nickname": "proxyTRACENode", - "parameters": [ - { - "type": "string", - "paramType": "path", - "name": "name", - "description": "name of the Node", - "required": true, - "allowMultiple": false - }, - { - "type": "string", - "paramType": "path", - "name": "path:*", - "description": "path to the resource", - "required": true, - "allowMultiple": false - } - ], - "produces": [ - "*/*" - ], - "consumes": [ - "*/*" - ] } ] }, @@ -3539,28 +3509,6 @@ "consumes": [ "*/*" ] - }, - { - "type": "string", - "method": "TRACE", - "summary": "proxy TRACE requests to Node", - "nickname": "proxyTRACENode", - "parameters": [ - { - "type": "string", - "paramType": "path", - "name": "name", - "description": "name of the Node", - "required": true, - "allowMultiple": false - } - ], - "produces": [ - "*/*" - ], - "consumes": [ - "*/*" - ] } ] }, @@ -5531,44 +5479,6 @@ "consumes": [ "*/*" ] - }, - { - "type": "string", - "method": "TRACE", - "summary": "proxy TRACE requests to Pod", - "nickname": "proxyTRACEPod", - "parameters": [ - { - "type": "string", - "paramType": "path", - "name": "namespaces", - "description": "object name and auth scope, such as for teams and projects", - "required": true, - "allowMultiple": false - }, - { - "type": "string", - "paramType": "path", - "name": "name", - "description": "name of the Pod", - "required": true, - "allowMultiple": false - }, - { - "type": "string", - "paramType": "path", - "name": "path:*", - "description": "path to the resource", - "required": true, - "allowMultiple": false - } - ], - "produces": [ - "*/*" - ], - "consumes": [ - "*/*" - ] } ] }, @@ -5725,36 +5635,6 @@ "consumes": [ "*/*" ] - }, - { - "type": "string", - "method": "TRACE", - "summary": "proxy TRACE requests to Pod", - "nickname": "proxyTRACEPod", - "parameters": [ - { - "type": "string", - "paramType": "path", - "name": "namespaces", - "description": "object name and auth scope, such as for teams and projects", - "required": true, - "allowMultiple": false - }, - { - "type": "string", - "paramType": "path", - "name": "name", - "description": "name of the Pod", - "required": true, - "allowMultiple": false - } - ], - "produces": [ - "*/*" - ], - "consumes": [ - "*/*" - ] } ] }, @@ -10416,44 +10296,6 @@ "consumes": [ "*/*" ] - }, - { - "type": "string", - "method": "TRACE", - "summary": "proxy TRACE requests to Service", - "nickname": "proxyTRACEService", - "parameters": [ - { - "type": "string", - "paramType": "path", - "name": "namespaces", - "description": "object name and auth scope, such as for teams and projects", - "required": true, - "allowMultiple": false - }, - { - "type": "string", - "paramType": "path", - "name": "name", - "description": "name of the Service", - "required": true, - "allowMultiple": false - }, - { - "type": "string", - "paramType": "path", - "name": "path:*", - "description": "path to the resource", - "required": true, - "allowMultiple": false - } - ], - "produces": [ - "*/*" - ], - "consumes": [ - "*/*" - ] } ] }, @@ -10610,36 +10452,6 @@ "consumes": [ "*/*" ] - }, - { - "type": "string", - "method": "TRACE", - "summary": "proxy TRACE requests to Service", - "nickname": "proxyTRACEService", - "parameters": [ - { - "type": "string", - "paramType": "path", - "name": "namespaces", - "description": "object name and auth scope, such as for teams and projects", - "required": true, - "allowMultiple": false - }, - { - "type": "string", - "paramType": "path", - "name": "name", - "description": "name of the Service", - "required": true, - "allowMultiple": false - } - ], - "produces": [ - "*/*" - ], - "consumes": [ - "*/*" - ] } ] }, diff --git a/api/swagger-spec/v1beta3.json b/api/swagger-spec/v1beta3.json index bf0824e5437..231ae929122 100644 --- a/api/swagger-spec/v1beta3.json +++ b/api/swagger-spec/v1beta3.json @@ -3393,36 +3393,6 @@ "consumes": [ "*/*" ] - }, - { - "type": "string", - "method": "TRACE", - "summary": "proxy TRACE requests to Node", - "nickname": "proxyTRACENode", - "parameters": [ - { - "type": "string", - "paramType": "path", - "name": "name", - "description": "name of the Node", - "required": true, - "allowMultiple": false - }, - { - "type": "string", - "paramType": "path", - "name": "path:*", - "description": "path to the resource", - "required": true, - "allowMultiple": false - } - ], - "produces": [ - "*/*" - ], - "consumes": [ - "*/*" - ] } ] }, @@ -3539,28 +3509,6 @@ "consumes": [ "*/*" ] - }, - { - "type": "string", - "method": "TRACE", - "summary": "proxy TRACE requests to Node", - "nickname": "proxyTRACENode", - "parameters": [ - { - "type": "string", - "paramType": "path", - "name": "name", - "description": "name of the Node", - "required": true, - "allowMultiple": false - } - ], - "produces": [ - "*/*" - ], - "consumes": [ - "*/*" - ] } ] }, @@ -5531,44 +5479,6 @@ "consumes": [ "*/*" ] - }, - { - "type": "string", - "method": "TRACE", - "summary": "proxy TRACE requests to Pod", - "nickname": "proxyTRACEPod", - "parameters": [ - { - "type": "string", - "paramType": "path", - "name": "namespaces", - "description": "object name and auth scope, such as for teams and projects", - "required": true, - "allowMultiple": false - }, - { - "type": "string", - "paramType": "path", - "name": "name", - "description": "name of the Pod", - "required": true, - "allowMultiple": false - }, - { - "type": "string", - "paramType": "path", - "name": "path:*", - "description": "path to the resource", - "required": true, - "allowMultiple": false - } - ], - "produces": [ - "*/*" - ], - "consumes": [ - "*/*" - ] } ] }, @@ -5725,36 +5635,6 @@ "consumes": [ "*/*" ] - }, - { - "type": "string", - "method": "TRACE", - "summary": "proxy TRACE requests to Pod", - "nickname": "proxyTRACEPod", - "parameters": [ - { - "type": "string", - "paramType": "path", - "name": "namespaces", - "description": "object name and auth scope, such as for teams and projects", - "required": true, - "allowMultiple": false - }, - { - "type": "string", - "paramType": "path", - "name": "name", - "description": "name of the Pod", - "required": true, - "allowMultiple": false - } - ], - "produces": [ - "*/*" - ], - "consumes": [ - "*/*" - ] } ] }, @@ -10416,44 +10296,6 @@ "consumes": [ "*/*" ] - }, - { - "type": "string", - "method": "TRACE", - "summary": "proxy TRACE requests to Service", - "nickname": "proxyTRACEService", - "parameters": [ - { - "type": "string", - "paramType": "path", - "name": "namespaces", - "description": "object name and auth scope, such as for teams and projects", - "required": true, - "allowMultiple": false - }, - { - "type": "string", - "paramType": "path", - "name": "name", - "description": "name of the Service", - "required": true, - "allowMultiple": false - }, - { - "type": "string", - "paramType": "path", - "name": "path:*", - "description": "path to the resource", - "required": true, - "allowMultiple": false - } - ], - "produces": [ - "*/*" - ], - "consumes": [ - "*/*" - ] } ] }, @@ -10610,36 +10452,6 @@ "consumes": [ "*/*" ] - }, - { - "type": "string", - "method": "TRACE", - "summary": "proxy TRACE requests to Service", - "nickname": "proxyTRACEService", - "parameters": [ - { - "type": "string", - "paramType": "path", - "name": "namespaces", - "description": "object name and auth scope, such as for teams and projects", - "required": true, - "allowMultiple": false - }, - { - "type": "string", - "paramType": "path", - "name": "name", - "description": "name of the Service", - "required": true, - "allowMultiple": false - } - ], - "produces": [ - "*/*" - ], - "consumes": [ - "*/*" - ] } ] }, diff --git a/pkg/apiserver/api_installer.go b/pkg/apiserver/api_installer.go index 0d94e0900c4..18fe6429add 100644 --- a/pkg/apiserver/api_installer.go +++ b/pkg/apiserver/api_installer.go @@ -589,7 +589,6 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag addProxyRoute(ws, "POST", a.prefix, action.Path, proxyHandler, kind, resource, subresource, hasSubresource, action.Params) addProxyRoute(ws, "DELETE", a.prefix, action.Path, proxyHandler, kind, resource, subresource, hasSubresource, action.Params) addProxyRoute(ws, "HEAD", a.prefix, action.Path, proxyHandler, kind, resource, subresource, hasSubresource, action.Params) - addProxyRoute(ws, "TRACE", a.prefix, action.Path, proxyHandler, kind, resource, subresource, hasSubresource, action.Params) case "CONNECT": for _, method := range connecter.ConnectMethods() { doc := "connect " + method + " requests to " + kind