smartx-dotnet version 1.5.0

Author: xianhuasu

Base/Network/Channel/KCP/KService.cs

@@ -130,7 +130,7 @@ public void Recv()
 				{
                     messageLength = this.socket.ReceiveFrom(this.cache, ref this.tempRemoteEndPoint);
 				}
-				catch (Exception e)
+				catch (Exception)
 				{
 					//Log.Error(e);
 					continue;

Base/Network/Channel/WebSocket/HttpService.cs

@@ -53,22 +53,32 @@ public override void Remove(long id)
         }
 
         public override void Update()
-        {            
+        {
+            if(httpListener==null)
+            {
+                StartAccept(this.prefix);
+            }
+
         }
 
+        TimePass timepass = new TimePass(0,5*60);
+        HttpListener httpListener = null;
         public void StartAccept(string uriPrefix)
         {
-            HttpListener httpListener = new HttpListener();
+            httpListener = new HttpListener();
             httpListener.AuthenticationSchemes = AuthenticationSchemes.Anonymous;
             httpListener.Prefixes.Add(uriPrefix);
             httpListener.Start();
             new Thread(new ThreadStart(delegate
             {
-                while (true)
+                while (!timepass.IsPassSet())
                 {
                     HttpListenerContext httpListenerContext = httpListener.GetContext();
                     Result(httpListenerContext);
                 }
+                httpListener.Abort();
+                httpListener.Close();
+                httpListener = null;
             })).Start();
         }
 
@@ -166,6 +176,11 @@ private string OnGet(HttpListenerRequest request, HttpListenerResponse response)
                     if (RawUrl.IndexOf(".html?") != -1)
                         RawUrl = RawUrl.Split('?')[0];
 
+                    // 安全检查
+                    var fileInfo = new FileInfo("./wwwroot" + RawUrl);
+                    if (fileInfo.DirectoryName.IndexOf(System.Environment.CurrentDirectory+"\\wwwroot")==-1)
+                        return "";
+
                     string RawUrlFileText = null;
                     if (File.Exists("./wwwroot" + RawUrl))
                         RawUrlFileText = File.ReadAllText( "./wwwroot" + RawUrl);
@@ -226,16 +241,16 @@ private string OnMessage(Dictionary<string, string> map, HttpListenerRequest req
             message.request  = request;
             message.response = response;
 
-            System.Threading.Monitor.Enter(Entity.Root);
-            try
+            lock (Entity.Root)
             {
-                componentNetMsg.HandleMsg(null, NetOpcodeBase.HttpMessage, message);
-            }
-            catch(Exception e)
-            {
-
+                try
+                {
+                    componentNetMsg.HandleMsg(null, NetOpcodeBase.HttpMessage, message);
+                }
+                catch (Exception)
+                {
+                }
             }
-            System.Threading.Monitor.Exit(Entity.Root);
             return message.result;
         }
 

Bin/Base.dll

@@ -6,13 +6,14 @@
   "compilationOptions": {},
   "targets": {
     ".NETCoreApp,Version=v3.1": {
-      "Core/1.0.0": {
+      "Core/1.5.0": {
         "dependencies": {
           "Base": "1.0.0",
           "LevelDB.Standard": "2.1.6.1",
           "MongoDB.Driver": "2.11.2",
           "MongoDB.Driver.Core": "2.11.2",
           "SauceControl.Blake2Fast": "2.0.0",
+          "System.Runtime.Numerics": "4.3.0",
           "Tangram.Ed25519": "1.0.0",
           "JsonFx.Json": "1.4.1003.3007"
         },
@@ -950,7 +951,7 @@
     }
   },
   "libraries": {
-    "Core/1.0.0": {
+    "Core/1.5.0": {
       "type": "project",
       "serviceable": false,
       "sha512": ""