从clientId调整为用户名+密码的登录方式

codingmiao · codingmiao · commit ca2ead7fa2e4 · 2024-07-28T19:18:00.000+08:00
diff --git a/common/src/main/java/org/wowtools/hppt/common/server/LoginClientService.java b/common/src/main/java/org/wowtools/hppt/common/server/LoginClientService.java
@@ -16,6 +16,18 @@
  */
 public class LoginClientService {
 
+    public static final class Config {
+        /**
+         * 每行一条用户名和密码
+         */
+        public ArrayList<String[]> users = new ArrayList<>();
+
+        /**
+         * 密码重试次数
+         */
+        public int passwordRetryNum;
+    }
+
 
     public static final class Client {
         public final String clientId;
@@ -164,39 +176,58 @@ public interface ClientActiveWatcher {
     }
 
 
-    private final String[] allowClientIds;
+    private static final class ClientInfo {
+        private final String user;
+        private final String password;
+
+        public ClientInfo(String user, String password) {
+            this.user = user;
+            this.password = password;
+        }
 
-    public LoginClientService(String[] allowClientIds) {
-        this.allowClientIds = allowClientIds;
+        private int passwordErrorNum;
     }
 
-    /**
-     * @param allowClientIds 允许的clientId
-     */
-    public LoginClientService(Collection<String> allowClientIds) {
-        this.allowClientIds = new String[allowClientIds.size()];
-        allowClientIds.toArray(this.allowClientIds);
+    private final Map<String, ClientInfo> users;
+    private final int passwordRetryNum;
+
+    public LoginClientService(Config config) {
+        Map<String, ClientInfo> _users = new HashMap<>();
+        for (String[] u : config.users) {
+            _users.put(u[0], new ClientInfo(u[0], u[1]));
+        }
+        users = Map.copyOf(_users);
+        passwordRetryNum = config.passwordRetryNum;
     }
 
     /**
      * 传入的code能解密出客户端id，则登录成功
      *
      * @param code                loginCode
      * @param clientActiveWatcher 用以观察客户端活跃状态的变化
-     * @return 登录成功则返回Client对象，否则返回null
+     * @return 登录成功则返回Client对象，否则抛出异常
      */
     public Client login(String code, ClientActiveWatcher clientActiveWatcher) {
-        byte[] bytesCode = BytesUtil.base642bytes(code);
-        for (String clientId : allowClientIds) {
-            AesCipherUtil aesCipherUtil = new AesCipherUtil(clientId, System.currentTimeMillis());
-            try {
-                if (new String(aesCipherUtil.descriptor.decrypt(bytesCode), StandardCharsets.UTF_8).equals(clientId)) {
-                    return new Client(clientId, aesCipherUtil, clientActiveWatcher);
-                }
-            } catch (Exception e) {
+        String[] strs = code.split(" ", 2);
+        String user = strs[0];
+        String pwdCode = strs[1];
+        ClientInfo clientInfo = users.get(user);
+        if (null == clientInfo) {
+            throw new RuntimeException("用户名不存在");
+        }
+        if (clientInfo.passwordErrorNum > passwordRetryNum) {
+            throw new RuntimeException("多次登录失败，用户已锁定");
+        }
+        AesCipherUtil aesCipherUtil = new AesCipherUtil(clientInfo.password, System.currentTimeMillis());
+        try {
+            if (new String(aesCipherUtil.descriptor.decrypt(BytesUtil.base642bytes(pwdCode)), StandardCharsets.UTF_8).equals(clientInfo.password)) {
+                clientInfo.passwordErrorNum = 0;
+                return new Client(user, aesCipherUtil, clientActiveWatcher);
             }
+        } catch (Exception ignored) {
         }
-        return null;
+        clientInfo.passwordErrorNum++;//理论上会有并发导致次数不准，可忽略
+        throw new RuntimeException("密码不正确或对时时差过长");
     }
 
 }
diff --git a/kafkademo/src/main/java/org/wowtools/hppt/kafkademo/ClientDemo.java b/kafkademo/src/main/java/org/wowtools/hppt/kafkademo/ClientDemo.java
@@ -47,7 +47,8 @@ protected void sendBytesToServer(byte[] bytes) {
 
     public static void main(String[] args) throws Exception{
         ScConfig cfg = new ScConfig();
-        cfg.clientId = "user1";
+        cfg.clientUser = "user1";
+        cfg.clientPassword = "12345";
         ScConfig.Forward forward = new ScConfig.Forward();
         forward.localPort = 10022;
         forward.remoteHost = "wsl";
diff --git a/kafkademo/src/main/java/org/wowtools/hppt/kafkademo/ServerDemo.java b/kafkademo/src/main/java/org/wowtools/hppt/kafkademo/ServerDemo.java
@@ -57,8 +57,11 @@ protected void doClose() throws Exception {
 
     public static void main(String[] args) throws Exception{
         SsConfig cfg = new SsConfig();
-        cfg.clientIds = new ArrayList<>();
-        cfg.clientIds.add("user1");
+        SsConfig.Client client = new SsConfig.Client();
+        client.user = "user1";
+        client.password = "12345";
+        cfg.clients = new ArrayList<>(1);
+        cfg.clients.add(client);
         ServerDemo server = new ServerDemo(cfg);
         server.init(cfg);
         server.sync();
diff --git a/run/src/main/java/org/wowtools/hppt/run/sc/common/ClientSessionService.java b/run/src/main/java/org/wowtools/hppt/run/sc/common/ClientSessionService.java
@@ -38,7 +38,6 @@ public abstract class ClientSessionService {
 
     protected volatile boolean running = true;
 
-    private String reConnectCode;
 
     /**
      * 当一个事件结束时发起的回调
@@ -139,17 +138,16 @@ protected void receiveServerBytes(byte[] bytes) throws Exception {
                     break;
                 case "login":
                     String code = cmd[1];
-                    if (!"0".equals(code)) {
+                    if ("0".equals(code)) {
                         noLogin = false;
-                        reConnectCode = new String(aesCipherUtil.descriptor.decrypt(BytesUtil.base642bytes(code)), StandardCharsets.UTF_8);
                         log.info("登录成功");
                     } else if (firstLoginErr) {
                         firstLoginErr = false;
-                        log.warn("第一次登录失败 重试");
+                        log.warn("第一次登录失败 {} ，重试", code);
                         Thread.sleep(10000);
                         sendLoginCommand();
                     } else {
-                        log.error("登录失败");
+                        log.error("登录失败 {}", code);
                         System.exit(0);
                     }
                     break;
@@ -222,19 +220,9 @@ private Thread buildSendThread() {
 
 
     private void sendLoginCommand() {
-        aesCipherUtil = new AesCipherUtil(config.clientId, System.currentTimeMillis() + dt);
-        String loginCode = BytesUtil.bytes2base64(aesCipherUtil.encryptor.encrypt(config.clientId.getBytes(StandardCharsets.UTF_8)));
-        sendBytesToServer(GridAesCipherUtil.encrypt(("login " + loginCode).getBytes(StandardCharsets.UTF_8)));
-    }
-
-    /**
-     * 发送重连接命令给服务端,当出现连接断开等问题时，可考虑重新建立连接后调用用此方法使得服务端知晓新旧CTX间的关系从而完成重连
-     */
-    protected void sendReConnectCommand() {
-        noLogin = true;
-        long st = System.currentTimeMillis() + dt;
-        String code = BytesUtil.bytes2base64(aesCipherUtil.encryptor.encrypt((reConnectCode + " " + st).getBytes(StandardCharsets.UTF_8)));
-        sendBytesToServer(GridAesCipherUtil.encrypt(("reConnect " + code).getBytes(StandardCharsets.UTF_8)));
+        aesCipherUtil = new AesCipherUtil(config.clientPassword, System.currentTimeMillis() + dt);
+        String loginCode = BytesUtil.bytes2base64(aesCipherUtil.encryptor.encrypt(config.clientPassword.getBytes(StandardCharsets.UTF_8)));
+        sendBytesToServer(GridAesCipherUtil.encrypt(("login " + config.clientUser + " " + loginCode).getBytes(StandardCharsets.UTF_8)));
     }
 
 
diff --git a/run/src/main/java/org/wowtools/hppt/run/sc/pojo/ScConfig.java b/run/src/main/java/org/wowtools/hppt/run/sc/pojo/ScConfig.java
@@ -122,10 +122,13 @@ public static final class FileConfig {
     public String type;
 
     /**
-     * 客户端id，每个sc.jar用一个，不要重复
+     * 客户端用户名，每个sc进程用一个，不要重复
      */
-    public String clientId;
-
+    public String clientUser;
+    /**
+     * 客户端密码
+     */
+    public String clientPassword;
 
     /**
      * 向服务端发数据请求体的字节数最大值
diff --git a/run/src/main/java/org/wowtools/hppt/run/ss/common/ServerSessionService.java b/run/src/main/java/org/wowtools/hppt/run/ss/common/ServerSessionService.java
@@ -53,7 +53,12 @@ public void toActivity() {
 
     public ServerSessionService(SsConfig ssConfig) {
         this.ssConfig = ssConfig;
-        loginClientService = new LoginClientService(ssConfig.clientIds);
+        LoginClientService.Config lConfig = new LoginClientService.Config();
+        for (SsConfig.Client client : ssConfig.clients) {
+            lConfig.users.add(new String[]{client.user, client.password});
+        }
+        lConfig.passwordRetryNum = ssConfig.passwordRetryNum;
+        loginClientService = new LoginClientService(lConfig);
         serverSessionManager = SsUtil.createServerSessionManagerBuilder(ssConfig).build();
     }
 
@@ -102,31 +107,31 @@ public void receiveClientBytes(CTX ctx, byte[] bytes) {
                     LoginClientService.Client client;
                     String loginCode = cmd[1];
                     log.debug("请求login {}", loginCode);
-                    client = loginClientService.login(loginCode, clientCell.clientActiveWatcher);
-                    if (client == null) {
-                        log.warn("登录失败 {}", loginCode);
-                        byte[] login = ("login 0").getBytes(StandardCharsets.UTF_8);
-                        login = GridAesCipherUtil.encrypt(login);
-                        sendBytesToClient(ctx, login);
-                    } else {
-                        clientCell.client = client;
-                        clientCell.ctx = ctx;
-                        synchronized (ctxClientCellMap) {
-                            ctxClientCellMap.forEach((oldCtx, oldCell) -> {
-                                if (oldCell.client.clientId.equals(client.clientId)) {
-                                    log.info("重复登录，移除旧client {} {}", oldCell.client.clientId, ctx);
-                                    removeCtx(oldCtx);
-                                }
-                            });
-                            ctxClientCellMap.put(ctx, clientCell);
-                        }
-                        log.info("客户端接入成功 {}", clientCell.client.clientId);
-                        startSendThread(clientCell);
-                        String code = BytesUtil.bytes2base64(client.aesCipherUtil.encryptor.encrypt(clientCell.reConnectToken.getBytes(StandardCharsets.UTF_8)));
-                        byte[] login = ("login " + code).getBytes(StandardCharsets.UTF_8);
+                    try {
+                        client = loginClientService.login(loginCode, clientCell.clientActiveWatcher);
+                    } catch (Exception e) {
+                        log.warn("登录失败 {} {}", loginCode, e.getMessage());
+                        byte[] login = ("login " + e.getMessage()).getBytes(StandardCharsets.UTF_8);
                         login = GridAesCipherUtil.encrypt(login);
                         sendBytesToClient(ctx, login);
+                        break;
+                    }
+                    clientCell.client = client;
+                    clientCell.ctx = ctx;
+                    synchronized (ctxClientCellMap) {
+                        ctxClientCellMap.forEach((oldCtx, oldCell) -> {
+                            if (oldCell.client.clientId.equals(client.clientId)) {
+                                log.info("重复登录，移除旧client {} {}", oldCell.client.clientId, ctx);
+                                removeCtx(oldCtx);
+                            }
+                        });
+                        ctxClientCellMap.put(ctx, clientCell);
                     }
+                    log.info("客户端接入成功 {}", clientCell.client.clientId);
+                    startSendThread(clientCell);
+                    byte[] login = ("login 0").getBytes(StandardCharsets.UTF_8);
+                    login = GridAesCipherUtil.encrypt(login);
+                    sendBytesToClient(ctx, login);
                     break;
                 case "reConnect":
                     byte[] base64Bytes = BytesUtil.base642bytes(cmd[1]);
diff --git a/run/src/main/java/org/wowtools/hppt/run/ss/pojo/SsConfig.java b/run/src/main/java/org/wowtools/hppt/run/ss/pojo/SsConfig.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.wowtools.hppt.common.util.CommonConfig;
-import org.wowtools.hppt.run.sc.pojo.ScConfig;
 
 import java.util.ArrayList;
 
@@ -41,8 +40,24 @@ public class SsConfig extends CommonConfig {
     /**
      * 允许的客户端
      */
-    public ArrayList<String> clientIds;
+    public ArrayList<Client> clients;
 
+    /**
+     * 密码最大尝试次数，超过次数没输入对会锁定账号直至重启
+     */
+    public int passwordRetryNum = 5;
+
+    public static final class Client {
+        /**
+         * 用户名
+         */
+        public String user;
+
+        /**
+         * 密码
+         */
+        public String password;
+    }
 
     public static final class PostConfig {
         /**
@@ -100,7 +115,7 @@ public static final class RHpptConfig {
 
     public RHpptConfig rhppt = new RHpptConfig();
 
-    public static final class RPostConfig{
+    public static final class RPostConfig {
         /**
          * 服务端http地址，可以填nginx转发过的地址
          */
diff --git a/run/src/main/java/org/wowtools/hppt/run/ss/post/PostServerSessionService.java b/run/src/main/java/org/wowtools/hppt/run/ss/post/PostServerSessionService.java
@@ -27,7 +27,7 @@ public class PostServerSessionService extends ServerSessionService<PostCtx> {
 
     public PostServerSessionService(SsConfig ssConfig) throws Exception {
         super(ssConfig);
-        ctxMap = LruCache.buildCache(ssConfig.clientIds.size() * 2, ssConfig.clientIds.size() * 2);
+        ctxMap = LruCache.buildCache(ssConfig.clients.size() * 2, ssConfig.clients.size() * 2);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public class PostServerSessionService extends ServerSessionService<PostCtx> {`
`27`	`27`
`28`	`28`	`public PostServerSessionService(SsConfig ssConfig) throws Exception {`
`29`	`29`	`super(ssConfig);`
`30`		`- ctxMap = LruCache.buildCache(ssConfig.clientIds.size() * 2, ssConfig.clientIds.size() * 2);`
	`30`	`+ ctxMap = LruCache.buildCache(ssConfig.clients.size() * 2, ssConfig.clients.size() * 2);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`@Override`