create/delete jupyter when create/delete user

WeBankBlockchain · Aug 28, 2024 · 47eb6f2 · 47eb6f2
1 parent af2edc6
commit 47eb6f2
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 11 deletions.
diff --git a/wedpr-components/env-integration/jupyter/build.gradle b/wedpr-components/env-integration/jupyter/build.gradle
@@ -6,4 +6,5 @@ dependencies{
     compile project(":wedpr-components-mybatis")
     compile project(":wedpr-components-uuid")
     compile project(":wedpr-components-sys-config")
+    compile project(":wedpr-components-hook")
 }
diff --git a/...n/jupyter/service/impl/JupyterConfig.java → ...tegration/jupyter/core/JupyterConfig.java b/...n/jupyter/service/impl/JupyterConfig.java → ...tegration/jupyter/core/JupyterConfig.java
@@ -13,7 +13,7 @@
  *
  */
 
-package com.webank.wedpr.components.integration.jupyter.service.impl;
+package com.webank.wedpr.components.integration.jupyter.core;
 
 import com.webank.wedpr.core.config.WeDPRConfig;
 
@@ -24,6 +24,7 @@ public class JupyterConfig {
     private static String JUPYTER_HOST_CONFIGUATINON_KEY =
             WeDPRConfig.apply("wedpr.jupyter.host_configuration_key", "jupyter_entrypoints");
     private static String JUPYTER_ENTRYPOINT_SPLITTER = ";";
+    private static String JUPYTER_MODULE = "jupyter-integration";
 
     public static String getJupyterHostConfiguatinonKey() {
         return JUPYTER_HOST_CONFIGUATINON_KEY;
@@ -36,4 +37,8 @@ public static Integer getMaxJupyterPerHost() {
     public static String getJupyterEntrypointSplitter() {
         return JUPYTER_ENTRYPOINT_SPLITTER;
     }
+
+    public static String getJupyterModule() {
+        return JUPYTER_MODULE;
+    }
 }
diff --git a/.../jupyter/service/impl/JupyterManager.java → ...egration/jupyter/core/JupyterManager.java b/.../jupyter/service/impl/JupyterManager.java → ...egration/jupyter/core/JupyterManager.java
@@ -12,9 +12,8 @@
  * the License.
  *
  */
-package com.webank.wedpr.components.integration.jupyter.service.impl;
+package com.webank.wedpr.components.integration.jupyter.core;
 
-import com.webank.wedpr.components.integration.jupyter.core.JupyterStatus;
 import com.webank.wedpr.components.integration.jupyter.dao.JupyterInfoDO;
 import com.webank.wedpr.components.integration.jupyter.dao.JupyterMapper;
 import com.webank.wedpr.components.meta.sys.config.dao.SysConfigMapper;

diff --git a/...c/main/java/com/webank/wedpr/components/integration/jupyter/hook/JupyterUserCallback.java b/...c/main/java/com/webank/wedpr/components/integration/jupyter/hook/JupyterUserCallback.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2017-2025  [webank-wedpr]
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ *
+ */
+
+package com.webank.wedpr.components.integration.jupyter.hook;
+
+import com.webank.wedpr.components.hook.UserHook;
+import com.webank.wedpr.components.integration.jupyter.core.JupyterManager;
+import com.webank.wedpr.core.config.WeDPRCommonConfig;
+import com.webank.wedpr.core.utils.WeDPRException;
+import org.apache.commons.lang3.StringUtils;
+
+public class JupyterUserCallback implements UserHook.UserCallback {
+    private final JupyterManager jupyterManager;
+
+    public JupyterUserCallback(JupyterManager jupyterManager) {
+        this.jupyterManager = jupyterManager;
+    }
+
+    @Override
+    public boolean interruptOnException() {
+        return false;
+    }
+
+    @Override
+    public void onCreated(String user) throws Exception {
+        this.jupyterManager.allocateJupyter(user, WeDPRCommonConfig.getAgency());
+    }
+
+    // do nothing
+    @Override
+    public void onUpdated(String user) throws Exception {}
+
+    @Override
+    public void onDeleted(String user) throws Exception {
+        if (StringUtils.isBlank(user)) {
+            throw new WeDPRException("Delete jupyter failed, must specify the jupyter user");
+        }
+        this.jupyterManager.deleteJupyter(user, null);
+    }
+}
diff --git a/...java/com/webank/wedpr/components/integration/jupyter/service/impl/JupyterServiceImpl.java b/...java/com/webank/wedpr/components/integration/jupyter/service/impl/JupyterServiceImpl.java
@@ -15,8 +15,12 @@
 
 package com.webank.wedpr.components.integration.jupyter.service.impl;
 
+import com.webank.wedpr.components.hook.UserHook;
+import com.webank.wedpr.components.integration.jupyter.core.JupyterConfig;
+import com.webank.wedpr.components.integration.jupyter.core.JupyterManager;
 import com.webank.wedpr.components.integration.jupyter.dao.JupyterInfoDO;
 import com.webank.wedpr.components.integration.jupyter.dao.JupyterMapper;
+import com.webank.wedpr.components.integration.jupyter.hook.JupyterUserCallback;
 import com.webank.wedpr.components.integration.jupyter.service.JupyterService;
 import com.webank.wedpr.components.meta.sys.config.dao.SysConfigMapper;
 import com.webank.wedpr.core.config.WeDPRCommonConfig;
@@ -33,11 +37,14 @@ public class JupyterServiceImpl implements JupyterService {
 
     private @Autowired SysConfigMapper sysConfigMapper;
     private @Autowired JupyterMapper jupyterMapper;
+    private @Autowired UserHook userHook;
     private JupyterManager jupyterManager;
 
     @PostConstruct
     public void init() {
         this.jupyterManager = new JupyterManager(sysConfigMapper, jupyterMapper);
+        userHook.registerUserCallback(
+                JupyterConfig.getJupyterModule(), new JupyterUserCallback(this.jupyterManager));
     }
     /**
      * allocate the jupyter environment for given user

diff --git a/wedpr-components/env-integration/jupyter/src/main/resources/mapper/JupyterMapper.xml b/wedpr-components/env-integration/jupyter/src/main/resources/mapper/JupyterMapper.xml
@@ -59,8 +59,10 @@
         </if>
     </update>
     <delete id="deleteJupyterInfo" parameterType="java.lang.String">
-        public int deleteJupyterInfo(@Param("id")String id);
-        delete from `wedpr_jupyter_table` where `id` = #{id}
+        delete from `wedpr_jupyter_table` where 1 = 1
+        <if test="id != null and id !=''">
+            and `id` = #{id}
+        </if>
         <if test="owner != null and owner !=''">
             and `owner` = #{owner}
         </if>

diff --git a/.../java/com/webank/wedpr/components/meta/setting/template/model/TemplateSettingRequest.java b/.../java/com/webank/wedpr/components/meta/setting/template/model/TemplateSettingRequest.java
@@ -19,6 +19,7 @@
 import com.webank.wedpr.components.meta.setting.template.dao.SettingTemplateDO;
 import com.webank.wedpr.core.config.WeDPRCommonConfig;
 import java.util.List;
+import org.apache.commons.lang3.StringUtils;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class TemplateSettingRequest {
@@ -44,9 +45,13 @@ public void checkUpdate(String owner, Boolean admin) {
         }
     }
 
-    public void setOwnerInfo(String owner) {
+    public void setOwnerInfo(boolean admin, String owner) {
         for (SettingTemplateDO template : templateList) {
-            template.setOwner(owner);
+            // non-admin user, set owner to the login user
+            // not set the owner, set the owner to the login user
+            if (!admin || StringUtils.isBlank(template.getOwner())) {
+                template.setOwner(owner);
+            }
             template.setAgency(WeDPRCommonConfig.getAgency());
         }
     }

diff --git a/...ebank/wedpr/components/meta/setting/template/service/impl/TemplateSettingServiceImpl.java b/...ebank/wedpr/components/meta/setting/template/service/impl/TemplateSettingServiceImpl.java
@@ -37,9 +37,8 @@ public class TemplateSettingServiceImpl implements TemplateSettingService {
     public WeDPRResponse batchInsertTemplateSettings(
             Boolean admin, String user, TemplateSettingRequest settings) {
         settings.checkCreate(admin);
-        if (!admin) {
-            settings.setOwnerInfo(user);
-        }
+        settings.setOwnerInfo(admin, user);
+
         int result = this.settingTemplateMapper.insertSettings(settings.getTemplateList());
         WeDPRResponse response =
                 new WeDPRResponse(Constant.WEDPR_SUCCESS, Constant.WEDPR_SUCCESS_MSG);

diff --git a/wedpr-components/meta/setting-template/src/main/resources/mapper/SettingTemplateMapper.xml b/wedpr-components/meta/setting-template/src/main/resources/mapper/SettingTemplateMapper.xml
@@ -33,7 +33,7 @@
         values
         <foreach collection="templateList" item = "template" index = "index" separator=",">
             (#{template.id}, #{template.name}, #{template.type}, #{template.owner}, #{template.agency},
-             #{template.setting}, #{template.createTime})
+             #{template.setting}, NOW())
         </foreach>
     </insert>
     <update id="updateSettings" parameterType="java.util.List">

diff --git a/.../user/src/main/java/com/webank/wedpr/components/user/controller/WedprGroupController.java b/.../user/src/main/java/com/webank/wedpr/components/user/controller/WedprGroupController.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.webank.wedpr.components.hook.UserHook;
 import com.webank.wedpr.components.token.auth.TokenUtils;
 import com.webank.wedpr.components.token.auth.model.GroupInfo;
 import com.webank.wedpr.components.token.auth.model.UserToken;
@@ -55,6 +56,7 @@ public class WedprGroupController {
     @Autowired private WedprUserRoleService wedprUserRoleService;
 
     @Autowired private ApplicationEventPublisher applicationEventPublisher;
+    @Autowired private UserHook userHook;
 
     /**
      * 创建用户组，检查用户组名是否存在，创建用户组失败时记录警告日志
@@ -351,6 +353,10 @@ public WeDPRResponse deleteGroupUser(
             LambdaQueryWrapper<WedprGroupDetail> lambdaQueryWrapper2 = new LambdaQueryWrapper<>();
             lambdaQueryWrapper2.eq(WedprGroupDetail::getUsername, username);
             wedprGroupDetailService.remove(lambdaQueryWrapper2);
+
+            // call userHook
+            userHook.onUserDeleted(username);
+
             CreateWedprGroupResponse createWedprGroupResponse = new CreateWedprGroupResponse();
             createWedprGroupResponse.setGroupId(groupId);
             wedprResponse.setData(createWedprGroupResponse);