[ZEPPELIN-6556] Personalized mode leaks a non-owner's paragraph edits into the shared master paragraph

Author: xhaktm00

zeppelin-server/src/main/java/org/apache/zeppelin/service/NotebookService.java

@@ -452,6 +452,9 @@ public boolean runParagraph(Note note,
       callback.onFailure(new IOException("paragraph is disabled."), context);
       return false;
     }
+    if (note.isPersonalizedMode()) {
+      p = p.getUserParagraph(context.getAutheInfo().getUser());
+    }
     p.setText(text);
     p.setTitle(title);
     p.setAuthenticationInfo(context.getAutheInfo());
@@ -462,19 +465,6 @@ public boolean runParagraph(Note note,
       p.mergeConfig(config);
     }
 
-    if (note.isPersonalizedMode()) {
-      p = p.getUserParagraph(context.getAutheInfo().getUser());
-      p.setText(text);
-      p.setTitle(title);
-      p.setAuthenticationInfo(context.getAutheInfo());
-      if (params != null && !params.isEmpty()) {
-        p.settings.setParams(params);
-      }
-      if (config != null && !config.isEmpty()) {
-        p.mergeConfig(config);
-      }
-    }
-
     try {
       notebook.saveNote(note, context.getAutheInfo());
       note.run(p.getId(), sessionId, blocking, context.getAutheInfo().getUser());
@@ -761,17 +751,13 @@ public void updateParagraph(String noteId,
           callback.onFailure(new ParagraphNotFoundException(paragraphId), context);
           return null;
         }
+        if (note.isPersonalizedMode()) {
+          p = p.getUserParagraph(context.getAutheInfo().getUser());
+        }
         p.settings.setParams(params);
         p.mergeConfig(config);
         p.setTitle(title);
         p.setText(text);
-        if (note.isPersonalizedMode()) {
-          p = p.getUserParagraph(context.getAutheInfo().getUser());
-          p.settings.setParams(params);
-          p.mergeConfig(config);
-          p.setTitle(title);
-          p.setText(text);
-        }
         notebook.saveNote(note, context.getAutheInfo());
         callback.onSuccess(p, context);
         return null;
@@ -1393,23 +1379,17 @@ private Paragraph setParagraphUsingMessage(Note note, Message fromMessage, Strin
                                              String text, String title, Map<String, Object> params,
                                              Map<String, Object> config) {
     Paragraph p = note.getParagraph(paragraphId);
-    p.setText(text);
-    p.setTitle(title);
     AuthenticationInfo subject =
         new AuthenticationInfo(fromMessage.principal, fromMessage.roles, fromMessage.ticket);
+    if (note.isPersonalizedMode()) {
+      p = p.getUserParagraph(subject.getUser());
+    }
+    p.setText(text);
+    p.setTitle(title);
     p.setAuthenticationInfo(subject);
     p.settings.setParams(params);
     p.setConfig(config);
 
-    if (note.isPersonalizedMode()) {
-      p = note.getParagraph(paragraphId);
-      p.setText(text);
-      p.setTitle(title);
-      p.setAuthenticationInfo(subject);
-      p.settings.setParams(params);
-      p.setConfig(config);
-    }
-
     return p;
   }
 

zeppelin-server/src/test/java/org/apache/zeppelin/service/NotebookServiceTest.java

@@ -588,6 +588,63 @@ void testParagraphOperations() throws IOException {
     verify(callback).onSuccess(p, context);
   }
 
+  @Test
+  void testRunParagraphInPersonalizedModeDoesNotPolluteMasterParagraph() throws IOException {
+    String note1Id = notebookService.createNote("/note_personalized", "test", true, context, callback);
+    Map<String, Object> masterParams = new HashMap<>();
+    masterParams.put("name", "master");
+    String paragraphId = notebook.processNote(note1Id,
+      note1 -> {
+        note1.setPersonalizedMode(true);
+        Paragraph p = note1.getParagraph(0);
+        p.setText("1+1");
+        p.settings.setParams(masterParams);
+        return p.getId();
+      });
+
+    ServiceContext user1Context =
+        new ServiceContext(new AuthenticationInfo("user1"), new HashSet<>());
+    Map<String, Object> user1Params = new HashMap<>();
+    user1Params.put("name", "user1");
+
+    reset(callback);
+    boolean runStatus = notebook.processNote(note1Id,
+      note1 -> {
+        return notebookService.runParagraph(note1, paragraphId, "user1_title", "1+1",
+          user1Params, new HashMap<>(), null, false, true, user1Context, callback);
+      });
+    assertTrue(runStatus);
+
+    notebook.processNote(note1Id,
+      note1 -> {
+        Paragraph master = note1.getParagraph(paragraphId);
+        assertEquals(masterParams, master.settings.getParams());
+        assertNull(master.getTitle());
+        Paragraph user1Paragraph = master.getUserParagraph("user1");
+        assertEquals(user1Params, user1Paragraph.settings.getParams());
+        assertEquals("user1_title", user1Paragraph.getTitle());
+        return null;
+      });
+
+    // updateParagraph must not pollute the master paragraph either
+    reset(callback);
+    Map<String, Object> user1UpdatedParams = new HashMap<>();
+    user1UpdatedParams.put("name", "user1_updated");
+    notebookService.updateParagraph(note1Id, paragraphId, "user1_updated_title", "1+1",
+        user1UpdatedParams, new HashMap<>(), user1Context, callback);
+
+    notebook.processNote(note1Id,
+      note1 -> {
+        Paragraph master = note1.getParagraph(paragraphId);
+        assertEquals(masterParams, master.settings.getParams());
+        assertNull(master.getTitle());
+        Paragraph user1Paragraph = master.getUserParagraph("user1");
+        assertEquals(user1UpdatedParams, user1Paragraph.settings.getParams());
+        assertEquals("user1_updated_title", user1Paragraph.getTitle());
+        return null;
+      });
+  }
+
   @Test
   void testNormalizeNotePath() throws IOException {
     assertEquals("/Untitled Note", notebookService.normalizeNotePath(" "));