#3157

fix bug

routers/api/v1/repo/cloudbrain.go

@@ -634,7 +634,7 @@ func CloudbrainGetLog(ctx *context.APIContext) {
 				endLine += 1
 			}
 		}
-		
+
 		result = getLogFromModelDir(job.JobName, startLine, endLine, resultPath)
 		if result == nil {
 			log.Error("GetJobLog failed: %v", err, ctx.Data["MsgID"])
@@ -649,14 +649,21 @@ func CloudbrainGetLog(ctx *context.APIContext) {
 	if ctx.Data["existStr"] != nil && result["Lines"].(int) < 50 {
 		content = content + ctx.Data["existStr"].(string)
 	}
+	logFileName := result["FileName"]
+
+	//Logs can only be downloaded if the file exists
+	//and the current user is an administrator or the creator of the task
+	canLogDownload := logFileName != nil && logFileName != "" &&
+		(ctx.IsSigned && (ctx.IsUserSiteAdmin() || ctx.User.ID == job.UserID))
+
 	re := map[string]interface{}{
 		"JobID":          ID,
-		"LogFileName":    result["FileName"],
+		"LogFileName":    logFileName,
 		"StartLine":      result["StartLine"],
 		"EndLine":        result["EndLine"],
 		"Content":        content,
 		"Lines":          result["Lines"],
-		"CanLogDownload": result["FileName"] != "",
+		"CanLogDownload": canLogDownload,
 		"StartTime":      job.StartTime,
 	}
 	//result := CloudbrainGetLogByJobId(job.JobID, job.JobName)

routers/api/v1/repo/modelarts.go

@@ -281,15 +281,6 @@ func TrainJobGetLog(ctx *context.APIContext) {
 		return
 	}
 
-	prefix := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, task.JobName, modelarts.LogPath, versionName), "/") + "/job"
-	_, err = storage.GetObsLogFileName(prefix)
-	var canLogDownload bool
-	if err != nil {
-		canLogDownload = false
-	} else {
-		canLogDownload = true
-	}
-
 	ctx.Data["log_file_name"] = resultLogFile.LogFileList[0]
 
 	ctx.JSON(http.StatusOK, map[string]interface{}{
@@ -299,11 +290,26 @@ func TrainJobGetLog(ctx *context.APIContext) {
 		"EndLine":        result.EndLine,
 		"Content":        result.Content,
 		"Lines":          result.Lines,
-		"CanLogDownload": canLogDownload,
+		"CanLogDownload": canLogDownload(ctx.User, task),
 		"StartTime":      task.StartTime,
 	})
 }
 
+func canLogDownload(user *models.User, task *models.Cloudbrain) bool {
+	if user == nil {
+		return false
+	}
+	if !user.IsAdmin && user.ID != task.UserID {
+		return false
+	}
+	prefix := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, task.JobName, modelarts.LogPath, task.VersionName), "/") + "/job"
+	_, err := storage.GetObsLogFileName(prefix)
+	if err != nil {
+		return false
+	}
+	return true
+}
+
 func trainJobGetLogContent(jobID string, versionID int64, baseLine string, order string, lines int) (*models.GetTrainJobLogFileNamesResult, *models.GetTrainJobLogResult, error) {
 
 	resultLogFile, err := modelarts.GetTrainJobLogFileNames(jobID, strconv.FormatInt(versionID, 10))