Changeset 7725

Timestamp:

Jun 11, 2019, 4:10:52 PM (2 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2184: Marking a job as ended fails with PermissionDeniedException?

The internal code should now work with data-layer objects directly to avoid permission problems.

Location:

branches/3.15-stable/src/core/net/sf/basedb/core

Files:

• Job.java (modified) (1 diff)
• Message.java (modified) (6 diffs)

branches/3.15-stable/src/core/net/sf/basedb/core/Job.java

@@ -1851 +1851 @@
   {
     DbControl dc = getDbControl();
-    Message m = Message.getNewSystemMessage(dc, getOwner(), "SYSTEM", null, this);
+    Message m = Message.getNewSystemMessage(dc, getData().getOwner(), "SYSTEM", null, getData());
     m.setDescription(getStatusMessage());
     String jobName = net.sf.basedb.util.Values.trim(getName(), Message.MAX_NAME_LENGTH - 20);

branches/3.15-stable/src/core/net/sf/basedb/core/Message.java

@@ -23 +23 @@
 package net.sf.basedb.core;
 
+import net.sf.basedb.core.data.JobData;
 import net.sf.basedb.core.data.MessageData;
 import net.sf.basedb.core.data.UserData;
@@ -73 +74 @@
     Message m = dc.newItem(Message.class);
     m.setName("New message");
-    m.setTo(to);
+    m.setTo(to == null ? null : to.getData());
     m.setFrom(fromName);
-    m.setSender(fromUser);
+    m.setSender(fromUser == null ? null : fromUser.getData());
     m.getData().setTimeSent(new Date());
-    m.setJob(job);
+    m.setJob(job == null ? null : job.getData());
     return m;
   }
@@ -94 +95 @@
     @throws BaseException If there is an error
   */
-  static Message getNewSystemMessage(DbControl dc, User to, String fromName, User fromUser, Job job)
+  static Message getNewSystemMessage(DbControl dc, UserData to, String fromName, UserData fromUser, JobData job)
   {
     Message m = dc.newItem(Message.class);
@@ -325 +326 @@
     @throws InvalidDataException If the user is null
   */
-  private void setTo(User to)
+  private void setTo(UserData to)
     throws InvalidDataException
   {
     if (to == null) throw new InvalidUseOfNullException("to");
-    getData().setTo(to.getData());
-    sendAsEmail = EmailUtil.isEnabled(to);
+    getData().setTo(to);
+    sendAsEmail = EmailUtil.isEnabled() && to.getSendMessagesAsEmail() && EmailUtil.isValidEmail(to.getEmail());
   }
   
@@ -385 +386 @@
   }
   
-  private void setSender(User sender)
+  private void setSender(UserData sender)
   {
     getData().setFromId(sender == null ? 0 : sender.getId());
@@ -402 +403 @@
     return getDbControl().getItem(Job.class, getData().getJob());
   }
-  private void setJob(Job job)
+  private void setJob(JobData job)
     throws PermissionDeniedException
   {
-    if (job != null) job.checkPermission(Permission.READ);
-    getData().setJob(job == null ? null : job.getData());
+    getData().setJob(job == null ? null : job);
   }