admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3190 from LinuxSuRen/fix/artifact-download-er

Browse Source 
Fix devops artifact cannot be download due to auth checking
This commit is contained in:
KubeSphere CI Bot
2020-12-10 21:48:44 +08:00
committed by GitHub
parent 1e5fdea5f2 4d9268be3d
commit cdc03e78e6
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/kapis/devops/v1alpha2/register.go
View File

@@ -688,6 +688,9 @@ func AddJenkinsToContainer(webservice *restful.WebService, devopsClient devops.I
return err return err
} }
parse.Path = strings.Trim(parse.Path, "/") parse.Path = strings.Trim(parse.Path, "/")
// this API does not belong any kind of auth scope, it should be removed in the future version
// see also pkg/apiserver/request/requestinfo.go
// Deprecated: Please use /devops/{devops}/jenkins/{path:*} instead
webservice.Route(webservice.GET("/jenkins/{path:*}"). webservice.Route(webservice.GET("/jenkins/{path:*}").
Param(webservice.PathParameter("path", "Path stands for any suffix path.")). Param(webservice.PathParameter("path", "Path stands for any suffix path.")).
To(func(request *restful.Request, response *restful.Response) { To(func(request *restful.Request, response *restful.Response) {
@@ -701,6 +704,22 @@ func AddJenkinsToContainer(webservice *restful.WebService, devopsClient devops.I
}). }).
Returns(http.StatusOK, RespOK, nil). Returns(http.StatusOK, RespOK, nil).
Metadata(restfulspec.KeyOpenAPITags, []string{constants.DevOpsJenkinsTag})) Metadata(restfulspec.KeyOpenAPITags, []string{constants.DevOpsJenkinsTag}))
webservice.Route(webservice.GET("/devops/{devops}/jenkins/{path:*}").
Param(webservice.PathParameter("path", "Path stands for any suffix path.")).
Param(webservice.PathParameter("devops", "DevOps project's ID, e.g. project-RRRRAzLBlLEm")).
To(func(request *restful.Request, response *restful.Response) {
u := request.Request.URL
devops := request.PathParameter("devops")
u.Host = parse.Host
u.Scheme = parse.Scheme
jenkins.SetBasicBearTokenHeader(&request.Request.Header)
u.Path = strings.Replace(request.Request.URL.Path, fmt.Sprintf("/kapis/%s/%s/devops/%s/jenkins",
GroupVersion.Group, GroupVersion.Version, devops), "", 1)
httpProxy := proxy.NewUpgradeAwareHandler(u, http.DefaultTransport, false, false, &errorResponder{})
httpProxy.ServeHTTP(response, request.Request)
}).
Returns(http.StatusOK, RespOK, nil).
Metadata(restfulspec.KeyOpenAPITags, []string{constants.DevOpsJenkinsTag}))
return nil return nil
} }