Skip to content

Commit 3719d76

Browse files
committed
fix one can submit request to any project
1 parent 6e2d4d9 commit 3719d76

File tree

3 files changed

+24
-5
lines changed

3 files changed

+24
-5
lines changed

docker-files/base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM ubuntu:18.04
44
RUN apt-get update && apt-get install -y tzdata language-pack-zh* \
55
&& ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone \
66
&& locale-gen zh_CN.UTF-8 \
7-
&& apt-get install -y git wget tar unzip lzip vim nasm python3.8 python3-pip python3.8-dev perl graphviz openjdk-8-jdk gcc g++ build-essential m4 tcpdump net-tools gdb \
7+
&& apt-get install -y git wget tar unzip lzip vim nasm python3.8 python3-pip python3.8-dev perl graphviz openjdk-8-jdk gcc g++ build-essential m4 tcpdump net-tools gdb libkrb5-dev krb5-user pkg-config default-libmysqlclient-dev\
88
&& rm -f /usr/bin/python && ln -s /usr/bin/python3.8 /usr/bin/python \
99
&& rm -f /usr/bin/python3 && ln -s /usr/bin/python3.8 /usr/bin/python3 \
1010
&& ln -s /usr/bin/pip3 /usr/bin/pip

wedpr-components/meta/project/src/main/java/com/webank/wedpr/components/project/model/JobRequest.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@
1515

1616
package com.webank.wedpr.components.project.model;
1717

18+
import com.webank.wedpr.common.utils.Common;
1819
import com.webank.wedpr.common.utils.PageRequest;
1920
import com.webank.wedpr.common.utils.WeDPRException;
2021
import com.webank.wedpr.components.meta.resource.follower.dao.FollowerDO;
2122
import com.webank.wedpr.components.project.dao.JobDO;
23+
import com.webank.wedpr.components.project.dao.ProjectDO;
24+
import com.webank.wedpr.components.project.dao.ProjectMapper;
2225
import java.util.List;
2326
import lombok.SneakyThrows;
2427

@@ -33,6 +36,23 @@ public JobDO getJob() {
3336
return job;
3437
}
3538

39+
public void check(ProjectMapper projectMapper, String owner, String ownerAgency)
40+
throws Exception {
41+
if (job == null) {
42+
throw new WeDPRException("Must set the job information!");
43+
}
44+
Common.requireNonEmpty("projectId", job.getProjectId());
45+
ProjectDO condition = new ProjectDO(true);
46+
condition.setId(job.getProjectId());
47+
condition.setOwnerAgency(ownerAgency);
48+
condition.setOwner(owner);
49+
List<ProjectDO> result = projectMapper.queryProject(true, condition);
50+
if (result == null || result.isEmpty()) {
51+
throw new WeDPRException(
52+
"Invalid job request, " + owner + " not own project " + job.getProjectId());
53+
}
54+
}
55+
3656
public void setJob(JobDO job) {
3757
if (job == null) {
3858
return;

wedpr-components/meta/project/src/main/java/com/webank/wedpr/components/project/service/impl/ProjectServiceImpl.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,12 +269,11 @@ public void validateUserPermissionToDatasets(
269269
public WeDPRResponse submitJob(String user, JobRequest request) {
270270
WeDPRResponse response =
271271
new WeDPRResponse(Constant.WEDPR_SUCCESS, Constant.WEDPR_SUCCESS_MSG);
272-
273-
// String userName = user;
274272
String agency = WeDPRCommonConfig.getAgency();
275-
276-
List<String> datasetList = request.getDatasetList();
277273
try {
274+
request.check(
275+
projectMapperWrapper.getProjectMapper(), user, WeDPRCommonConfig.getAgency());
276+
List<String> datasetList = request.getDatasetList();
278277
request.getJob().setOwner(user);
279278
request.getJob().setOwnerAgency(agency);
280279
request.getJob().setTaskParties(request.getTaskParties());

0 commit comments

Comments
 (0)