Skip to content

fix: panic issue in get/ download pod logs api #5342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 25, 2024
Merged

fix: panic issue in get/ download pod logs api #5342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
832fadb
fix: panic issue in get/ download pod logs api
Ash-exp Jun 21, 2024
4bfc65b
Merge branch 'main' into fix-panic-pod-log-api
Ash-exp Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 6 additions & 24 deletions api/k8s/application/k8sApplicationRestHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,7 @@ func (handler *K8sApplicationRestHandlerImpl) GetResource(w http.ResponseWriter,
request.AppIdentifier = appIdentifier
request.ClusterId = request.AppIdentifier.ClusterId
if request.DeploymentType == bean2.HelmInstalledType {
valid, err := handler.k8sApplicationService.ValidateResourceRequest(r.Context(), request.AppIdentifier, request.K8sRequest)
if err != nil || !valid {
handler.logger.Errorw("error in validating resource request", "err", err)
if err := handler.k8sApplicationService.ValidateResourceRequest(r.Context(), request.AppIdentifier, request.K8sRequest); err != nil {
common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
return
}
Expand Down Expand Up @@ -388,9 +386,7 @@ func (handler *K8sApplicationRestHandlerImpl) UpdateResource(w http.ResponseWrit
request.AppIdentifier = appIdentifier
request.ClusterId = appIdentifier.ClusterId
if request.DeploymentType == bean2.HelmAppType {
valid, err := handler.k8sApplicationService.ValidateResourceRequest(r.Context(), request.AppIdentifier, request.K8sRequest)
if err != nil || !valid {
handler.logger.Errorw("error in validating resource request", "err", err)
if err := handler.k8sApplicationService.ValidateResourceRequest(r.Context(), request.AppIdentifier, request.K8sRequest); err != nil {
common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
return
}
Expand Down Expand Up @@ -490,9 +486,7 @@ func (handler *K8sApplicationRestHandlerImpl) DeleteResource(w http.ResponseWrit
request.AppIdentifier = appIdentifier
request.ClusterId = appIdentifier.ClusterId
if request.DeploymentType == bean2.HelmInstalledType {
valid, err := handler.k8sApplicationService.ValidateResourceRequest(r.Context(), request.AppIdentifier, request.K8sRequest)
if err != nil || !valid {
handler.logger.Errorw("error in validating resource request", "err", err)
if err := handler.k8sApplicationService.ValidateResourceRequest(r.Context(), request.AppIdentifier, request.K8sRequest); err != nil {
common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
return
}
Expand Down Expand Up @@ -586,9 +580,7 @@ func (handler *K8sApplicationRestHandlerImpl) ListEvents(w http.ResponseWriter,
request.AppIdentifier = appIdentifier
request.ClusterId = appIdentifier.ClusterId
if request.DeploymentType == bean2.HelmInstalledType {
valid, err := handler.k8sApplicationService.ValidateResourceRequest(r.Context(), request.AppIdentifier, request.K8sRequest)
if err != nil || !valid {
handler.logger.Errorw("error in validating resource request", "err", err)
if err := handler.k8sApplicationService.ValidateResourceRequest(r.Context(), request.AppIdentifier, request.K8sRequest); err != nil {
common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
return
}
Expand Down Expand Up @@ -771,18 +763,8 @@ func generatePodLogsFilename(filename string) string {
func (handler *K8sApplicationRestHandlerImpl) requestValidationAndRBAC(w http.ResponseWriter, r *http.Request, token string, request *k8s.ResourceRequestBean) {
if request.AppIdentifier != nil {
if request.DeploymentType == bean2.HelmInstalledType {
valid, err := handler.k8sApplicationService.ValidateResourceRequest(r.Context(), request.AppIdentifier, request.K8sRequest)
if err != nil || !valid {
handler.logger.Errorw("error in validating resource request", "err", err, "request.AppIdentifier", request.AppIdentifier, "request.K8sRequest", request.K8sRequest)
apiError := util2.ApiError{
InternalMessage: "failed to validate the resource with error " + err.Error(),
UserMessage: "Failed to validate resource",
}
if !valid {
apiError.InternalMessage = "failed to validate the resource"
apiError.UserMessage = "requested Pod or Container doesn't exist"
}
common.WriteJsonResp(w, &apiError, nil, http.StatusBadRequest)
if err := handler.k8sApplicationService.ValidateResourceRequest(r.Context(), request.AppIdentifier, request.K8sRequest); err != nil {
common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
return
}
} else if request.DeploymentType == bean2.ArgoInstalledType {
Expand Down
21 changes: 19 additions & 2 deletions pkg/k8s/application/k8sApplicationService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ type K8sApplicationService interface {
ValidateTerminalRequestQuery(r *http.Request) (*terminal.TerminalSessionRequest, *k8s.ResourceRequestBean, error)
DecodeDevtronAppId(applicationId string) (*bean3.DevtronAppIdentifier, error)
GetPodLogs(ctx context.Context, request *k8s.ResourceRequestBean) (io.ReadCloser, error)
ValidateResourceRequest(ctx context.Context, appIdentifier *bean.AppIdentifier, request *k8s2.K8sRequestBean) (bool, error)
ValidateResourceRequest(ctx context.Context, appIdentifier *bean.AppIdentifier, request *k8s2.K8sRequestBean) error
ValidateClusterResourceRequest(ctx context.Context, clusterResourceRequest *k8s.ResourceRequestBean,
rbacCallback func(clusterName string, resourceIdentifier k8s2.ResourceIdentifier) bool) (bool, error)
ValidateClusterResourceBean(ctx context.Context, clusterId int, manifest unstructured.Unstructured, gvk schema.GroupVersionKind, rbacCallback func(clusterName string, resourceIdentifier k8s2.ResourceIdentifier) bool) bool
Expand Down Expand Up @@ -442,7 +442,24 @@ func (impl *K8sApplicationServiceImpl) ValidateClusterResourceBean(ctx context.C
return impl.validateResourceManifest(clusterBean.ClusterName, manifest, gvk, rbacCallback)
}

func (impl *K8sApplicationServiceImpl) ValidateResourceRequest(ctx context.Context, appIdentifier *bean.AppIdentifier, request *k8s2.K8sRequestBean) (bool, error) {
func (impl *K8sApplicationServiceImpl) ValidateResourceRequest(ctx context.Context, appIdentifier *bean.AppIdentifier, request *k8s2.K8sRequestBean) error {
if valid, err := impl.validateResourceRequest(ctx, appIdentifier, request); err != nil || !valid {
if !valid {
impl.logger.Errorw("validation error in resource request", "request.AppIdentifier", appIdentifier, "request.K8sRequest", request)
err = &util.ApiError{
HttpStatusCode: http.StatusBadRequest,
InternalMessage: "validation failed for the requested resource",
UserMessage: fmt.Sprintf("resource %s: \"%s\" doesn't exist", request.ResourceIdentifier.GroupVersionKind.Kind, request.ResourceIdentifier.Name),
}
} else if err != nil {
impl.logger.Errorw("error in validating resource request", "err", err, "request.AppIdentifier", appIdentifier, "request.K8sRequest", request)
}
return err
}
return nil
}

func (impl *K8sApplicationServiceImpl) validateResourceRequest(ctx context.Context, appIdentifier *bean.AppIdentifier, request *k8s2.K8sRequestBean) (bool, error) {
app, err := impl.helmAppService.GetApplicationDetail(ctx, appIdentifier)
if err != nil {
impl.logger.Errorw("error in getting app detail", "err", err, "appDetails", appIdentifier)
Expand Down