bandlist and boundlist

tmoonlight · tmoonlight · commit f0bdef899b79 · 2019-06-02T18:39:45.000+08:00
diff --git a/src/NSmartProxy.Data/ServerBoundConfig.cs b/src/NSmartProxy.Data/ServerBoundConfig.cs
@@ -0,0 +1,22 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace NSmartProxy.Data
+{
+    /// <summary>
+    /// 服务的端口绑定配置以及用户的banlist
+    /// </summary>
+    [Serializable]
+    public class ServerBoundConfig
+    {
+        public HashSet<string> UsersBanlist;
+        public UserPortBound UserPortBoundList;
+
+        public class UserPortBound
+        {
+            public string UserName;
+            public List<int> Bound = new List<int>();
+        }
+    }
+}
diff --git a/src/NSmartProxy/Authorize/NSPServerContext.cs b/src/NSmartProxy/Authorize/NSPServerContext.cs
@@ -7,22 +7,32 @@ namespace NSmartProxy.Authorize
 {
     public class NSPServerContext
     {
-        public NSPClientCollection Clients = new NSPClientCollection();
-        public Dictionary<int, NSPApp> PortAppMap = new Dictionary<int, NSPApp>(); //端口和app的映射关系
+        public NSPClientCollection Clients;
+        public Dictionary<int, NSPApp> PortAppMap;//端口和app的映射关系
+        public ServerBoundConfig BoundConfig; 
+
         public HashSet<string> TokenCaches; //服务端会话池，登陆后的会话都在这里，每天需要做定时清理
+
         private bool supportAnonymousLogin = true;
 
         public NSPServerContext()
         {
             TokenCaches = new HashSet<string>();
+            Clients = new NSPClientCollection();
+            PortAppMap = new Dictionary<int, NSPApp>();
+            BoundConfig = new ServerBoundConfig();
         }
 
         /// <summary>
         /// 支持客户端匿名登陆
         /// </summary>
         public bool SupportAnonymousLogin { get => supportAnonymousLogin; set => supportAnonymousLogin = value; }
 
-        public void CloseAllSourceByClient(int clientId)
+        /// <summary>
+        /// 上下文中删除特定客户端
+        /// </summary>
+        /// <param name="clientId"></param>
+        public void CloseAllSourceByClient(int clientId, bool addToBanlist = false)
         {
             if (Clients.ContainsKey(clientId))
             {
diff --git a/src/NSmartProxy/Extension/HttpServer_APIs.cs b/src/NSmartProxy/Extension/HttpServer_APIs.cs
@@ -398,6 +398,7 @@ public bool ForbidClient(string clientIdStr)
             }
             //TODO QQQ 加入禁用列表
 
+            //写入数据
             return true;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -7,22 +7,32 @@ namespace NSmartProxy.Authorize`
`7`	`7`	`{`
`8`	`8`	`public class NSPServerContext`
`9`	`9`	`{`
`10`		`- public NSPClientCollection Clients = new NSPClientCollection();`
`11`		`- public Dictionary<int, NSPApp> PortAppMap = new Dictionary<int, NSPApp>(); //端口和app的映射关系`
	`10`	`+ public NSPClientCollection Clients;`
	`11`	`+ public Dictionary<int, NSPApp> PortAppMap;//端口和app的映射关系`
	`12`	`+ public ServerBoundConfig BoundConfig;`
	`13`	`+`
`12`	`14`	`public HashSet<string> TokenCaches; //服务端会话池，登陆后的会话都在这里，每天需要做定时清理`
	`15`	`+`
`13`	`16`	`private bool supportAnonymousLogin = true;`
`14`	`17`
`15`	`18`	`public NSPServerContext()`
`16`	`19`	`{`
`17`	`20`	`TokenCaches = new HashSet<string>();`
	`21`	`+ Clients = new NSPClientCollection();`
	`22`	`+ PortAppMap = new Dictionary<int, NSPApp>();`
	`23`	`+ BoundConfig = new ServerBoundConfig();`
`18`	`24`	`}`
`19`	`25`
`20`	`26`	`/// <summary>`
`21`	`27`	`/// 支持客户端匿名登陆`
`22`	`28`	`/// </summary>`
`23`	`29`	`public bool SupportAnonymousLogin { get => supportAnonymousLogin; set => supportAnonymousLogin = value; }`
`24`	`30`
`25`		`- public void CloseAllSourceByClient(int clientId)`
	`31`	`+ /// <summary>`
	`32`	`+ /// 上下文中删除特定客户端`
	`33`	`+ /// </summary>`
	`34`	`+ /// <param name="clientId"></param>`
	`35`	`+ public void CloseAllSourceByClient(int clientId, bool addToBanlist = false)`
`26`	`36`	`{`
`27`	`37`	`if (Clients.ContainsKey(clientId))`
`28`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -398,6 +398,7 @@ public bool ForbidClient(string clientIdStr)`
`398`	`398`	`}`
`399`	`399`	`//TODO QQQ 加入禁用列表`
`400`	`400`
	`401`	`+ //写入数据`
`401`	`402`	`return true;`
`402`	`403`	`}`
`403`	`404`