From d615b39c1097af7ccc3b554705a8d5f4b0a7d2f5 Mon Sep 17 00:00:00 2001 From: Abraham Elmahrek Date: Mon, 23 Mar 2015 23:34:25 -0700 Subject: [PATCH] SQOOP-2220: Sqoop2: Fix the privilege check on job using the link id not the connector id (Guoquan Shen via Abraham Elmahrek) --- common/src/main/java/org/apache/sqoop/model/MJob.java | 8 ++++++++ .../java/org/apache/sqoop/handler/JobRequestHandler.java | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/org/apache/sqoop/model/MJob.java b/common/src/main/java/org/apache/sqoop/model/MJob.java index 4b5c896f..1c241038 100644 --- a/common/src/main/java/org/apache/sqoop/model/MJob.java +++ b/common/src/main/java/org/apache/sqoop/model/MJob.java @@ -130,6 +130,14 @@ public long getLinkId(Direction type) { } } + public long getFromLinkId() { + return fromLinkId; + } + + public long getToLinkId() { + return toLinkId; + } + public long getConnectorId(Direction type) { switch(type) { case FROM: diff --git a/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java index 70108f64..0c5f1f21 100644 --- a/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java +++ b/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java @@ -185,11 +185,11 @@ private JsonBean createUpdateJob(RequestContext ctx, boolean create) { // Authorization check if (create) { - AuthorizationEngine.createJob(String.valueOf(postedJob.getFromConnectorId()), - String.valueOf(postedJob.getToConnectorId())); + AuthorizationEngine.createJob(String.valueOf(postedJob.getFromLinkId()), + String.valueOf(postedJob.getToLinkId())); } else { - AuthorizationEngine.updateJob(String.valueOf(postedJob.getFromConnectorId()), - String.valueOf(postedJob.getToConnectorId()), + AuthorizationEngine.updateJob(String.valueOf(postedJob.getFromLinkId()), + String.valueOf(postedJob.getToLinkId()), String.valueOf(postedJob.getPersistenceId())); }