Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Initial PortScan context menu import

Browse Source 
Need to fix the event implementation because it's a total hack right
now.
Also, want to put the code for detecting selected hosts into it's own
method.
This commit is contained in:
Sean Kaim
2016-08-19 17:41:48 -04:00
parent aa1ce22ada
commit 72623281c4
3 changed files with 146 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
mRemoteV1/UI/Window/PortScanWindow.Designer.cs generated
View File

@@ -35,6 +35,7 @@ namespace mRemoteNG.UI.Window
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PortScanWindow));
this.ipStart = new mRemoteNG.UI.Controls.IPTextBox();
this.ipEnd = new mRemoteNG.UI.Controls.IPTextBox();
@@ -42,6 +43,14 @@ namespace mRemoteNG.UI.Window
this.lblEndIP = new System.Windows.Forms.Label();
this.btnScan = new System.Windows.Forms.Button();
this.lvHosts = new System.Windows.Forms.ListView();
this.resultsMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
this.importHTTPToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.importHTTPSToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.importRDPToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.importRloginToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.importSSH2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.importTelnetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.importVNCToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.btnImport = new System.Windows.Forms.Button();
this.cbProtocol = new System.Windows.Forms.ComboBox();
this.lblOnlyImport = new System.Windows.Forms.Label();
@@ -62,6 +71,7 @@ namespace mRemoteNG.UI.Window
this.Label2 = new System.Windows.Forms.Label();
this.Label1 = new System.Windows.Forms.Label();
this.pnlImport = new System.Windows.Forms.Panel();
this.resultsMenuStrip.SuspendLayout();
this.pnlPorts.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.portEnd)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.portStart)).BeginInit();
@@ -121,6 +131,7 @@ namespace mRemoteNG.UI.Window
this.lvHosts.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lvHosts.ContextMenuStrip = this.resultsMenuStrip;
this.lvHosts.FullRowSelect = true;
this.lvHosts.GridLines = true;
this.lvHosts.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
@@ -131,6 +142,69 @@ namespace mRemoteNG.UI.Window
this.lvHosts.TabIndex = 26;
this.lvHosts.UseCompatibleStateImageBehavior = false;
this.lvHosts.View = System.Windows.Forms.View.Details;
this.lvHosts.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ListView_MouseDown);
//
// resultsMenuStrip
//
this.resultsMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.importHTTPToolStripMenuItem,
this.importHTTPSToolStripMenuItem,
this.importRDPToolStripMenuItem,
this.importRloginToolStripMenuItem,
this.importSSH2ToolStripMenuItem,
this.importTelnetToolStripMenuItem,
this.importVNCToolStripMenuItem});
this.resultsMenuStrip.Name = "resultsMenuStrip";
this.resultsMenuStrip.Size = new System.Drawing.Size(153, 180);
//
// importHTTPToolStripMenuItem
//
this.importHTTPToolStripMenuItem.Name = "importHTTPToolStripMenuItem";
this.importHTTPToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.importHTTPToolStripMenuItem.Text = "Import HTTP";
this.importHTTPToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// importHTTPSToolStripMenuItem
//
this.importHTTPSToolStripMenuItem.Name = "importHTTPSToolStripMenuItem";
this.importHTTPSToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.importHTTPSToolStripMenuItem.Text = "Import HTTPS";
this.importHTTPSToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// importRDPToolStripMenuItem
//
this.importRDPToolStripMenuItem.Name = "importRDPToolStripMenuItem";
this.importRDPToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.importRDPToolStripMenuItem.Text = "Import RDP";
this.importRDPToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// importRloginToolStripMenuItem
//
this.importRloginToolStripMenuItem.Name = "importRloginToolStripMenuItem";
this.importRloginToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.importRloginToolStripMenuItem.Text = "Import Rlogin";
this.importRloginToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// importSSH2ToolStripMenuItem
//
this.importSSH2ToolStripMenuItem.Name = "importSSH2ToolStripMenuItem";
this.importSSH2ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.importSSH2ToolStripMenuItem.Text = "Import SSH2";
this.importSSH2ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// importTelnetToolStripMenuItem
//
this.importTelnetToolStripMenuItem.Name = "importTelnetToolStripMenuItem";
this.importTelnetToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.importTelnetToolStripMenuItem.Text = "Import Telnet";
this.importTelnetToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// importVNCToolStripMenuItem
//
this.importVNCToolStripMenuItem.Name = "importVNCToolStripMenuItem";
this.importVNCToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.importVNCToolStripMenuItem.Text = "Import VNC";
this.importVNCToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// btnImport
//
@@ -317,6 +391,7 @@ namespace mRemoteNG.UI.Window
this.TabText = "Port Scan";
this.Text = "Port Scan";
this.Load += new System.EventHandler(this.PortScan_Load);
this.resultsMenuStrip.ResumeLayout(false);
this.pnlPorts.ResumeLayout(false);
this.pnlPorts.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.portEnd)).EndInit();
@@ -329,5 +404,15 @@ namespace mRemoteNG.UI.Window
}
internal System.Windows.Forms.Panel pnlImport;
#endregion
}
private System.Windows.Forms.ContextMenuStrip resultsMenuStrip;
private System.ComponentModel.IContainer components;
private System.Windows.Forms.ToolStripMenuItem importHTTPToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem importHTTPSToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem importRDPToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem importRloginToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem importSSH2ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem importTelnetToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem importVNCToolStripMenuItem;
}
}

62
mRemoteV1/UI/Window/PortScanWindow.cs
View File

@@ -1,8 +1,11 @@
using System.Collections.Generic;
using System;
using System.Drawing;
using System.Windows.Forms;
using WeifenLuo.WinFormsUI.Docking;
using mRemoteNG.App;
using mRemoteNG.Connection.Protocol;
using mRemoteNG.Messages;
using mRemoteNG.Tools;
using static mRemoteNG.Tools.MiscTools;
@@ -113,14 +116,14 @@ namespace mRemoteNG.UI.Window
}
else
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, Language.strCannotStartPortScan);
Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, Language.strCannotStartPortScan);
}
}
}
private void btnImport_Click(object sender, EventArgs e)
{
Connection.Protocol.ProtocolType protocol = (Connection.Protocol.ProtocolType)StringToEnum(typeof(Connection.Protocol.ProtocolType), Convert.ToString(cbProtocol.SelectedItem));
ProtocolType protocol = (ProtocolType)StringToEnum(typeof(ProtocolType), Convert.ToString(cbProtocol.SelectedItem));
List<ScanHost> hosts = new List<ScanHost>();
foreach (ListViewItem item in lvHosts.SelectedItems)
@@ -209,7 +212,7 @@ namespace mRemoteNG.UI.Window
private static void PortScanner_BeginHostScan(string host)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, "Scanning " + host, true);
Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, "Scanning " + host, true);
}
private delegate void PortScannerHostScannedDelegate(ScanHost host, int scannedCount, int totalCount);
@@ -221,7 +224,7 @@ namespace mRemoteNG.UI.Window
return ;
}
Runtime.MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, "Host scanned " + host.HostIp, true);
Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, "Host scanned " + host.HostIp, true);
ListViewItem listViewItem = host.ToListViewItem();
if (listViewItem != null)
@@ -243,11 +246,60 @@ namespace mRemoteNG.UI.Window
return ;
}
Runtime.MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, Language.strPortScanComplete);
Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.strPortScanComplete);
_scanning = false;
SwitchButtonText();
}
#endregion
private void ListView_MouseDown(object sender, MouseEventArgs e)
{
if (e.Button == MouseButtons.Right)
{
var hitTestInfo = lvHosts.HitTest(e.X, e.Y);
if (hitTestInfo.Item != null)
{
var loc = e.Location;
loc.Offset(lvHosts.Location);
var lvi = lvHosts.GetItemAt(e.X, e.Y);
// Adjust context menu (or it's contents) based on hitTestInfo details
resultsMenuStrip.Show(this, loc);
}
}
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
List<ScanHost> hosts = new List<ScanHost>();
foreach (ListViewItem item in lvHosts.SelectedItems)
{
var scanHost = (ScanHost)item.Tag;
if (scanHost != null)
{
hosts.Add(scanHost);
}
}
if (hosts.Count < 1)
{
Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, "Could not import host(s) from port scan context menu");
return;
}
var toolStripMenuItem = (ToolStripMenuItem)sender;
string pText = null;
if (toolStripMenuItem != null)
pText = toolStripMenuItem.Text;
//TODO - rewrite this so it's not a hack. Put the import into it's own method and have different events for each protocol...
pText = pText?.Replace("Import", "");
ProtocolType protocol = (ProtocolType)StringToEnum(typeof(ProtocolType), pText);
Import.ImportFromPortScan(hosts, protocol);
}
}
}

3
mRemoteV1/UI/Window/PortScanWindow.resx
View File

@@ -117,6 +117,9 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="resultsMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>