Fix plugins; updated readme; fix workflow

teplofizik · teplofizik · commit f9cb1f743a38 · 2022-11-17T14:07:50.000+03:00
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        dotnet-version: [ '3.1.x', '5.0.x' ]
+        dotnet-version: [ '3.1.x', '6.0.x' ]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/NyaImageTool.sln b/NyaImageTool.sln
@@ -23,7 +23,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NyaImageTool", "NyaImageToo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NyaLZO", "NyaLZO\NyaLZO.csproj", "{B47A5DEA-D7A4-4A3D-9735-33D9FAF37D36}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7DE93B12-1E74-4204-A550-DDC4F3550AF9}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{7DE93B12-1E74-4204-A550-DDC4F3550AF9}"
 	ProjectSection(SolutionItems) = preProject
 		readme.md = readme.md
 		todo.md = todo.md
@@ -42,6 +42,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NyaFsLinux", "Plugins\NyaFs
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NyaFsTftp", "Plugins\NyaFsTftp\NyaFsTftp.csproj", "{2FFD947D-8EF4-417A-BE85-CDD8A456BDFD}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workflow", "Workflow", "{D877671C-2F73-4572-A9C6-8798614526E0}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/Plugins/NyaFsLinux/Commands/FindPasswd.cs b/Plugins/NyaFsLinux/Commands/FindPasswd.cs
@@ -60,6 +60,11 @@ public override ScriptStepResult Exec(ImageProcessor Processor)
                     {
                         if(U.NoPassword)
                             return new ScriptStepResult(ScriptStepStatus.Error, $"User '{User}' has no password.");
+                        else if (U.Hash == "")
+                        {
+                            NyaFs.Log.Ok(0, $"Password for '{User}' is '' (empty string)");
+                            return new ScriptStepResult(ScriptStepStatus.Ok, null);
+                        }
                         else if (U.Hash != null)
                         {
                             var Passwords = System.IO.File.ReadAllLines(PasswordsFile);
diff --git a/Plugins/NyaFsLinux/Commands/LsHashes.cs b/Plugins/NyaFsLinux/Commands/LsHashes.cs
@@ -50,7 +50,9 @@ public override ScriptStepResult Exec(ImageProcessor Processor)
                 {
                     var UidGid = $"{U.UID}:{U.GID}";
 
-                    if ((U.Hash != null) && !U.NoPassword)
+                    if((U.Hash == ""))
+                        NyaFs.Log.Write(0, $"{U.Name.PadRight(12)} {"no".PadRight(8)} {"-".PadRight(18)} {"no password".PadRight(25)}");
+                    else if ((U.Hash != null) && !U.NoPassword)
                         NyaFs.Log.Write(0, $"{U.Name.PadRight(12)} {U.HashType.PadRight(8)} {U.Salt.PadRight(18)} {U.HashValue.PadRight(25)}");
                 }
 
diff --git a/Plugins/NyaFsLinux/Commands/LsUsers.cs b/Plugins/NyaFsLinux/Commands/LsUsers.cs
@@ -54,12 +54,14 @@ public override ScriptStepResult Exec(ImageProcessor Processor)
                     if (U.Hash != null)
                     {
                         if (U.NoPassword)
-                            Info += "no password";
+                            NyaFs.Log.Ok(0, Info + "no password enabled");
+                        else if (U.Hash == "")
+                            NyaFs.Log.Warning(0, Info + "no password (unrestricted access)");
                         else
-                            Info += $"hash {U.HashType} with salt '{U.Salt}'";
+                            NyaFs.Log.Ok(0, Info + $"hash {U.HashType} with salt '{U.Salt}'");
                     }
-                    
-                    NyaFs.Log.Write(0, Info);
+                    else
+                        NyaFs.Log.Warning(0, Info + "no hash info!");
                 }
 
                 return new ScriptStepResult(ScriptStepStatus.Ok, null);
diff --git a/Plugins/NyaFsLinux/Commands/Passwd.cs b/Plugins/NyaFsLinux/Commands/Passwd.cs
@@ -11,15 +11,21 @@ class Passwd : ScriptStepGenerator
 
         public Passwd() : base("passwd")
         {
-            AddConfig(new ScriptArgsConfig(0, new ScriptArgsParam[] {
+            AddConfig(new ScriptArgsConfig(1, new ScriptArgsParam[] {
                 new NyaFs.Processor.Scripting.Params.StringScriptArgsParam("user"),
                 new NyaFs.Processor.Scripting.Params.StringScriptArgsParam("password")
             }));
+            AddConfig(new ScriptArgsConfig(0, new ScriptArgsParam[] {
+                new NyaFs.Processor.Scripting.Params.StringScriptArgsParam("user")
+            }));
         }
 
         public override ScriptStep Get(ScriptArgs Args)
         {
-            return new PasswdScriptStep(Args.RawArgs[0], Args.RawArgs[1]);
+            if(Args.ArgConfig == 1)
+                return new PasswdScriptStep(Args.RawArgs[0], Args.RawArgs[1]);
+            else
+                return new PasswdScriptStep(Args.RawArgs[0], "");
         }
 
         public class PasswdScriptStep : ScriptStep
@@ -57,6 +63,14 @@ public override ScriptStepResult Exec(ImageProcessor Processor)
                     {
                         if(U.NoPassword)
                             return new ScriptStepResult(ScriptStepStatus.Error, $"User '{User}' has no password.");
+                        else if (U.Hash == "")
+                        {
+                            if (Password == "")
+                            {
+                                NyaFs.Log.Ok(0, $"Password is correct");
+                                return new ScriptStepResult(ScriptStepStatus.Ok, null);
+                            }
+                        }
                         else if (U.Hash != null)
                         {
                             if (U.CheckPassword(Password))
diff --git a/Plugins/NyaFsSftp/FreeSFtpSharp/SftpSubsystem.cs b/Plugins/NyaFsSftp/FreeSFtpSharp/SftpSubsystem.cs
@@ -32,7 +32,7 @@ public class SftpSubsystem
 
         private string ActivePath = "/";
 
-        private uint channel;
+        private readonly uint channel;
         internal EventHandler<ICollection<byte>> OnOutput;
 
         Dictionary<string, string> HandleToPathDictionary;
@@ -489,7 +489,7 @@ private void HandleWriteFile(SshDataWorker reader)
                     else
                         SendStatus(requestId, SftpStatusType.SSH_FX_OP_UNSUPPORTED);
                 }
-                catch(Exception E)
+                catch(Exception)
                 {
                     SendStatus(requestId, SftpStatusType.SSH_FX_BAD_MESSAGE);
                 }
diff --git a/Plugins/NyaFsSftp/FxSsh/Session.cs b/Plugins/NyaFsSftp/FxSsh/Session.cs
@@ -114,7 +114,15 @@ public Session(Socket socket, Dictionary<string, string> hostKeys, string server
         public event EventHandler<SshService> ServiceRegistered;
 
         public event EventHandler<KeyExchangeArgs> KeysExchanged;
-                
+
+        public event EventHandler<SshService> Check;
+
+        internal void CheckService()
+        {
+            if(_socket.Connected)
+                SendMessage(new Messages.Connection.ShouldIgnoreMessage());
+        }
+
         internal void EstablishConnection()
         {
             if (!_socket.Connected)
@@ -218,7 +226,7 @@ private string SocketReadProtocolVersion()
 
                 if (len == 0)
                 {
-                    throw new SshConnectionException("Could't read the protocal version", DisconnectReason.ProtocolError);
+                    throw new SshConnectionException("Could't read the protocol version", DisconnectReason.ProtocolError);
                 }
 
                 for (var i = 0; i < len; i++, pos++)
diff --git a/Plugins/NyaFsSftp/FxSsh/SshServer.cs b/Plugins/NyaFsSftp/FxSsh/SshServer.cs
@@ -15,6 +15,7 @@ public class SshServer : IDisposable
         private bool _isDisposed;
         private bool _started;
         private TcpListener _listener = null;
+        private System.Timers.Timer checkTimer = new System.Timers.Timer(5000);
 
         public SshServer()
             : this(new SshServerSettings())
@@ -49,10 +50,34 @@ public void Start()
                 _listener.Start();
                 BeginAcceptSocket();
 
+                checkTimer.Elapsed += CheckTimer_Elapsed;
+                checkTimer.Start();
+
                 _started = true;
             }
         }
 
+        private void CheckTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
+        {
+            try
+            { 
+                foreach (var session in sessions)
+                {
+                    try
+                    {
+                        session.CheckService();
+                    }
+                    catch
+                    {
+                    }
+                }
+            }
+            catch
+            {
+            }
+        }
+
+
         public void Stop()
         {
             lock (_lock)
@@ -63,6 +88,7 @@ public void Stop()
 
                 _listener.Stop();
 
+                checkTimer.Stop();
                 _isDisposed = true;
                 _started = false;
 
diff --git a/Plugins/NyaFsSftp/SftpPlugin.cs b/Plugins/NyaFsSftp/SftpPlugin.cs
@@ -3,11 +3,16 @@
 
 namespace NyaFsSftp
 {
-    
     public class SftpPlugin : NyaFs.ImageFormat.Plugins.Base.ServicePlugin
     {
-        private int Port = 1234;
+        /// <summary>
+        /// SSH port. Default is 22
+        /// </summary>
+        private int Port = 22;
 
+        /// <summary>
+        ///  SSH server class
+        /// </summary>
         NyaSshService ssh;
 
         public SftpPlugin() : base("sftp", "SFTP service")
@@ -27,7 +32,7 @@ protected override void OnStop()
         {
             ssh.Stop();
             ssh = null;
-            NyaFs.Log.Ok(0, $"Sftp is stopped");
+            NyaFs.Log.Ok(0, $"SFTP server is stopped");
         }
 
         /// <summary>
diff --git a/Plugins/NyaFsSftp/Ssh/NyaSshService.cs b/Plugins/NyaFsSftp/Ssh/NyaSshService.cs
@@ -26,6 +26,7 @@ public NyaSshService(int Port, NyaFs.Processor.ImageProcessor Processor)
 
             Server.ConnectionAccepted += Server_ConnectionAccepted;
             Server.ExceptionRaised += Server_ExceptionRaised;
+
         }
 
         private void Server_ExceptionRaised(object sender, Exception e)
diff --git a/Plugins/NyaFsTftp/Commands/TTFtpGet.cs b/Plugins/NyaFsTftp/Commands/TTFtpGet.cs
@@ -59,12 +59,16 @@ public override ScriptStepResult Exec(ImageProcessor Processor)
                 transfer.OnFinished += Transfer_OnFinished;
                 transfer.OnError += Transfer_OnError;
 
-                Stream stream = new MemoryStream();
+                MemoryStream stream = new MemoryStream();
                 transfer.Start(stream);
 
                 TransferFinishedEvent.WaitOne();
-                if(Result)
+                if (Result)
+                {
+                    var data = stream.ToArray();
+                    File.WriteAllBytes(Filename, data);
                     return new ScriptStepResult(ScriptStepStatus.Ok, null);
+                }
                 else
                     return new ScriptStepResult(ScriptStepStatus.Error, ErrorText);
             }
diff --git a/Plugins/NyaFsTftp/TFtpClientPlugin.cs b/Plugins/NyaFsTftp/TFtpClientPlugin.cs
@@ -3,9 +3,9 @@
 
 namespace NyaFsTftp
 {
-    public class TFtpClient : NyaFs.Processor.Scripting.Plugins.CommandPlugin
+    public class TFtpClientPlugin : NyaFs.Processor.Scripting.Plugins.CommandPlugin
     {
-        public TFtpClient() : base("tftp")
+        public TFtpClientPlugin() : base("tftpclient")
         {
 
         }
diff --git a/Plugins/NyaFsTftp/TFtpServerPlugin.cs b/Plugins/NyaFsTftp/TFtpServerPlugin.cs
@@ -0,0 +1,114 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+using Tftp.Net;
+
+namespace NyaFsTftp
+{
+    class TFtpServerPlugin : NyaFs.ImageFormat.Plugins.Base.ServicePlugin
+    {
+        /// <summary>
+        /// TFTP port. Default is 69
+        /// </summary>
+        int Port = 69;
+        
+        /// <summary>
+        /// TFTP server class
+        /// </summary>
+        TftpServer server;
+
+        /// <summary>
+        /// Default server directory
+        /// </summary>
+        string ServerDirectory = "./";
+
+        public TFtpServerPlugin() : base("tftp", "TFTP service")
+        {
+
+        }
+
+        protected override void OnStart()
+        {
+            server = new TftpServer(Port);
+            server.OnReadRequest += Server_OnReadRequest;
+            server.OnWriteRequest += Server_OnWriteRequest;
+            NyaFs.Log.Ok(3, $"TFTP server is running on 0.0.0.0:{Port}");
+
+            server.Start();
+        }
+
+        private void Server_OnWriteRequest(ITftpTransfer transfer, System.Net.EndPoint client)
+        {
+            String file = System.IO.Path.Combine(ServerDirectory, transfer.Filename);
+            transfer.Start(new System.IO.FileStream(file, System.IO.FileMode.CreateNew));
+        }
+
+        private void Server_OnReadRequest(ITftpTransfer transfer, System.Net.EndPoint client)
+        {
+            String file = System.IO.Path.Combine(ServerDirectory, transfer.Filename);
+            transfer.Start(new System.IO.FileStream(file, System.IO.FileMode.Open, System.IO.FileAccess.Read));
+        }
+
+        protected override void OnStop()
+        {
+            server.Dispose();
+            server = null;
+            NyaFs.Log.Ok(0, $"TFTP server is stopped");
+        }
+
+        /// <summary>
+        /// Information about service
+        /// </summary>
+        public override void Info()
+        {
+            NyaFs.Log.Write(0, "TFTP server");
+            NyaFs.Log.Write(0, $"    port: {Port}");
+            NyaFs.Log.Write(0, $"     dir: {ServerDirectory}");
+            NyaFs.Log.Write(0, $" running: {((server != null) ? "yes" : "no")}");
+        }
+
+        /// <summary>
+        /// Print sservice usage
+        /// </summary>
+        public override void Usage()
+        {
+            base.Usage();
+
+            NyaFs.Log.Write(0, $"  set port <portnumber> (at now portnumber is {Port})");
+            NyaFs.Log.Write(0, $"  set dir  <directory>  (at now directory is '{ServerDirectory}')");
+        }
+
+        /// <summary>
+        /// Set service options
+        /// </summary>
+        public override void SetOption(string Param, string Value)
+        {
+            switch (Param)
+            {
+                case "port":
+                    {
+                        int Res;
+                        if (Int32.TryParse(Value, out Res))
+                        {
+                            if ((Res > 0) && (Res < 64000))
+                            {
+                                Port = Res;
+                                return;
+                            }
+                        }
+                        NyaFs.Log.Error(0, $"Invalid value {Value} for param {Param}.");
+                    }
+                    break;
+                case "dir":
+                    if(System.IO.Directory.Exists(Value))
+                        ServerDirectory = Value;
+                    else
+                        NyaFs.Log.Error(0, $"Invalid path {Value} for param {Param}. Such directory is not found.");
+                    break;
+                default:
+                    NyaFs.Log.Error(0, $"Unknown option {Param}");
+                    break;
+            }
+        }
+    }
+}
diff --git a/docs/images/plugins/linux_lsusr.png b/docs/images/plugins/linux_lsusr.png
diff --git a/readme.md b/readme.md

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,11 @@ public override ScriptStepResult Exec(ImageProcessor Processor)`
`60`	`60`	`{`
`61`	`61`	`if(U.NoPassword)`
`62`	`62`	`return new ScriptStepResult(ScriptStepStatus.Error, $"User '{User}' has no password.");`
	`63`	`+ else if (U.Hash == "")`
	`64`	`+ {`
	`65`	`+ NyaFs.Log.Ok(0, $"Password for '{User}' is '' (empty string)");`
	`66`	`+ return new ScriptStepResult(ScriptStepStatus.Ok, null);`
	`67`	`+ }`
`63`	`68`	`else if (U.Hash != null)`
`64`	`69`	`{`
`65`	`70`	`var Passwords = System.IO.File.ReadAllLines(PasswordsFile);`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,9 @@ public override ScriptStepResult Exec(ImageProcessor Processor)`
`50`	`50`	`{`
`51`	`51`	`var UidGid = $"{U.UID}:{U.GID}";`
`52`	`52`
`53`		`- if ((U.Hash != null) && !U.NoPassword)`
	`53`	`+ if((U.Hash == ""))`
	`54`	`+ NyaFs.Log.Write(0, $"{U.Name.PadRight(12)} {"no".PadRight(8)} {"-".PadRight(18)} {"no password".PadRight(25)}");`
	`55`	`+ else if ((U.Hash != null) && !U.NoPassword)`
`54`	`56`	`NyaFs.Log.Write(0, $"{U.Name.PadRight(12)} {U.HashType.PadRight(8)} {U.Salt.PadRight(18)} {U.HashValue.PadRight(25)}");`
`55`	`57`	`}`
`56`	`58`
Original file line number	Diff line number	Diff line change
`@@ -54,12 +54,14 @@ public override ScriptStepResult Exec(ImageProcessor Processor)`
`54`	`54`	`if (U.Hash != null)`
`55`	`55`	`{`
`56`	`56`	`if (U.NoPassword)`
`57`		`- Info += "no password";`
	`57`	`+ NyaFs.Log.Ok(0, Info + "no password enabled");`
	`58`	`+ else if (U.Hash == "")`
	`59`	`+ NyaFs.Log.Warning(0, Info + "no password (unrestricted access)");`
`58`	`60`	`else`
`59`		`- Info += $"hash {U.HashType} with salt '{U.Salt}'";`
	`61`	`+ NyaFs.Log.Ok(0, Info + $"hash {U.HashType} with salt '{U.Salt}'");`
`60`	`62`	`}`
`61`		`-`
`62`		`- NyaFs.Log.Write(0, Info);`
	`63`	`+ else`
	`64`	`+ NyaFs.Log.Warning(0, Info + "no hash info!");`
`63`	`65`	`}`
`64`	`66`
`65`	`67`	`return new ScriptStepResult(ScriptStepStatus.Ok, null);`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public class SftpSubsystem`
`32`	`32`
`33`	`33`	`private string ActivePath = "/";`
`34`	`34`
`35`		`- private uint channel;`
	`35`	`+ private readonly uint channel;`
`36`	`36`	`internal EventHandler<ICollection<byte>> OnOutput;`
`37`	`37`
`38`	`38`	`Dictionary<string, string> HandleToPathDictionary;`
`@@ -489,7 +489,7 @@ private void HandleWriteFile(SshDataWorker reader)`
`489`	`489`	`else`
`490`	`490`	`SendStatus(requestId, SftpStatusType.SSH_FX_OP_UNSUPPORTED);`
`491`	`491`	`}`
`492`		`- catch(Exception E)`
	`492`	`+ catch(Exception)`
`493`	`493`	`{`
`494`	`494`	`SendStatus(requestId, SftpStatusType.SSH_FX_BAD_MESSAGE);`
`495`	`495`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,16 @@`
`3`	`3`
`4`	`4`	`namespace NyaFsSftp`
`5`	`5`	`{`
`6`		`-`
`7`	`6`	`public class SftpPlugin : NyaFs.ImageFormat.Plugins.Base.ServicePlugin`
`8`	`7`	`{`
`9`		`- private int Port = 1234;`
	`8`	`+ /// <summary>`
	`9`	`+ /// SSH port. Default is 22`
	`10`	`+ /// </summary>`
	`11`	`+ private int Port = 22;`
`10`	`12`
	`13`	`+ /// <summary>`
	`14`	`+ /// SSH server class`
	`15`	`+ /// </summary>`
`11`	`16`	`NyaSshService ssh;`
`12`	`17`
`13`	`18`	`public SftpPlugin() : base("sftp", "SFTP service")`
`@@ -27,7 +32,7 @@ protected override void OnStop()`
`27`	`32`	`{`
`28`	`33`	`ssh.Stop();`
`29`	`34`	`ssh = null;`
`30`		`- NyaFs.Log.Ok(0, $"Sftp is stopped");`
	`35`	`+ NyaFs.Log.Ok(0, $"SFTP server is stopped");`
`31`	`36`	`}`
`32`	`37`
`33`	`38`	`/// <summary>`