X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/926c7f5505456a0900e9c49f6c08efebe9a53505..270abe9a991a57084650424a0238ef4f062b0b64:/hotline/transaction_handlers.go?ds=sidebyside

diff --git a/hotline/transaction_handlers.go b/hotline/transaction_handlers.go
index 650aae0..dda2dce 100644
--- a/hotline/transaction_handlers.go
+++ b/hotline/transaction_handlers.go
@@ -634,7 +634,7 @@ func HandleSetUser(cc *ClientConn, t *Transaction) (res []Transaction, err error
 	if err != nil {
 		return res, err
 	}
-	if err := os.WriteFile(cc.Server.ConfigDir+"Users/"+login+".yaml", out, 0666); err != nil {
+	if err := os.WriteFile(filepath.Join(cc.Server.ConfigDir, "Users", login+".yaml"), out, 0666); err != nil {
 		return res, err
 	}
 
@@ -1024,12 +1024,48 @@ func HandleDisconnectUser(cc *ClientConn, t *Transaction) (res []Transaction, er
 		return res, err
 	}
 
-	if err := clientConn.Connection.Close(); err != nil {
-		return res, err
+	// If fieldOptions is set, then the client IP is banned in addition to disconnected.
+	// 00 01 = temporary ban
+	// 00 02 = permanent ban
+	if t.GetField(fieldOptions).Data != nil {
+		switch t.GetField(fieldOptions).Data[1] {
+		case 1:
+			// send message: "You are temporarily banned on this server"
+			cc.logger.Infow("Disconnect & temporarily ban " + string(clientConn.UserName))
+
+			res = append(res, *NewTransaction(
+				tranServerMsg,
+				clientConn.ID,
+				NewField(fieldData, []byte("You are temporarily banned on this server")),
+				NewField(fieldChatOptions, []byte{0, 0}),
+			))
+
+			banUntil := time.Now().Add(tempBanDuration)
+			cc.Server.banList[strings.Split(clientConn.RemoteAddr, ":")[0]] = &banUntil
+			cc.Server.writeBanList()
+		case 2:
+			// send message: "You are permanently banned on this server"
+			cc.logger.Infow("Disconnect & ban " + string(clientConn.UserName))
+
+			res = append(res, *NewTransaction(
+				tranServerMsg,
+				clientConn.ID,
+				NewField(fieldData, []byte("You are permanently banned on this server")),
+				NewField(fieldChatOptions, []byte{0, 0}),
+			))
+
+			cc.Server.banList[strings.Split(clientConn.RemoteAddr, ":")[0]] = nil
+			cc.Server.writeBanList()
+		}
 	}
 
-	res = append(res, cc.NewReply(t))
-	return res, err
+	// TODO: remove this awful hack
+	go func() {
+		time.Sleep(1 * time.Second)
+		clientConn.Disconnect()
+	}()
+
+	return append(res, cc.NewReply(t)), err
 }
 
 // HandleGetNewsCatNameList returns a list of news categories for a path