From 4d60376cb166c1b41e4ba1530538be240a728181 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 20 Mar 2019 10:43:46 -0400 Subject: [PATCH 01/12] SPARK-2179 Spark login screen should show error message instead of blank --- src/client/spark/view/Shell/Login/LoginModel.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/client/spark/view/Shell/Login/LoginModel.cs b/src/client/spark/view/Shell/Login/LoginModel.cs index 20e770318..53377e9d3 100644 --- a/src/client/spark/view/Shell/Login/LoginModel.cs +++ b/src/client/spark/view/Shell/Login/LoginModel.cs @@ -106,7 +106,13 @@ namespace mbts.ui.shell { var auth = _ctx.locate(); var response = await auth.get_users_async(new GetUsersRequest()); if (response.success) { - Users = response.value.Users.Select(x => new User(x.Login,x.Id)).OrderBy(u => u.name).ToArray(); + if (!string.IsNullOrEmpty(response.value.Error)) { + ErrorMessage = response.value.Error; + HasFatalError = true; + } + else { + Users = response.value.Users.Select(x => new User(x.Login,x.Id)).OrderBy(u => u.name).ToArray(); + } } else { ErrorMessage = "Logon: " + response.error_message; From 25acf771ab73cb2faaba97924919c89ca913164a Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 2 Apr 2019 16:05:05 -0400 Subject: [PATCH 02/12] changes to conditionally start stunnel if the config file is present --- src/client/spark/App.xaml.cs | 28 ++++++++++++++++ .../core/NativeMethods/BTSNativeMethods.cs | 3 ++ src/client/spark_core/config/config.cs | 6 ++++ src/lib/os/os.cpp | 32 +++++++++++++++++++ src/lib/os/os.h | 2 ++ 5 files changed, 71 insertions(+) diff --git a/src/client/spark/App.xaml.cs b/src/client/spark/App.xaml.cs index d19652c96..07cb2e357 100644 --- a/src/client/spark/App.xaml.cs +++ b/src/client/spark/App.xaml.cs @@ -1,4 +1,6 @@ using System; +using System.IO; +using System.Diagnostics; using System.Collections.Generic; using System.ComponentModel; using System.Linq; @@ -72,10 +74,36 @@ namespace mbts.ui.shell base.OnExit(e); Environment.Exit(0); } + + Process _stunnel_process; + void init_stunnel(string[] argv) + { + var path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\BTS\\stunnel\\"; + if(File.Exists(path + "config\\stunnel.conf")) + { + try + { + BTSUINativeMethods.setup_process_job_object(); + _stunnel_process = Process.Start(path + "bin\\stunnel.exe"); + string config_error; bool success = false; + if(_stunnel_process != null) + { + for(int i = 0; i < 10; i++) + { + if(success = mbts.config.Configuration.try_initialize(out config_error)) + break; + System.Threading.Thread.Sleep(500); + } + } + } + catch {} //can't log here + } + } public new int Run() { var argv = Environment.GetCommandLineArgs(); try { + init_stunnel(argv); if (argv.Contains("-multiple") || _mutex == null || _mutex.WaitOne(TimeSpan.Zero, true)) { diff --git a/src/client/spark/core/NativeMethods/BTSNativeMethods.cs b/src/client/spark/core/NativeMethods/BTSNativeMethods.cs index 539f0d411..f522930b9 100644 --- a/src/client/spark/core/NativeMethods/BTSNativeMethods.cs +++ b/src/client/spark/core/NativeMethods/BTSNativeMethods.cs @@ -11,6 +11,9 @@ namespace mbts.ui.native [DllImport("libspark")] public static extern void enable_limits(); + [DllImport("libspark")] + public static extern void setup_process_job_object(); + [DllImport("libspark", CharSet = CharSet.Unicode)] public static extern void set_window_app_id(IntPtr hwnd, string stack_id); } diff --git a/src/client/spark_core/config/config.cs b/src/client/spark_core/config/config.cs index 287097bdd..abf97b268 100644 --- a/src/client/spark_core/config/config.cs +++ b/src/client/spark_core/config/config.cs @@ -51,6 +51,12 @@ namespace mbts.config reset(); initialize(); } + + public static bool try_initialize(out string error) + { + reset(); + return initialize(out error); + } //////////// /// private diff --git a/src/lib/os/os.cpp b/src/lib/os/os.cpp index d16966dcd..6aa71b92c 100755 --- a/src/lib/os/os.cpp +++ b/src/lib/os/os.cpp @@ -1000,6 +1000,38 @@ extern "C" BTS_EXPORT char *bts_data_path() { } extern "C" BTS_EXPORT void free_bts_data_path(char *dp) { delete[] dp; } + +extern "C" BTS_EXPORT void setup_process_job_object() +{ +#ifdef _WIN32 + if (IsDebuggerPresent()) + return; + HANDLE hjob = CreateJobObject(nullptr, nullptr); + if (hjob == nullptr) + { + //LOG(Warn, ui) << "Failed to create JOB object. Limits are not in force."; + return; + } + + JOBOBJECT_EXTENDED_LIMIT_INFORMATION jeli = {0}; + jeli.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE; + + BOOL success = SetInformationJobObject(hjob, JobObjectExtendedLimitInformation, &jeli, sizeof(jeli)); + DWORD error = GetLastError(); + if (!success) + { + //LOG(Warn, ui) << "Failed to set up limits - last error: " << error; + return; + } + success = AssignProcessToJobObject(hjob, GetCurrentProcess()); + error = GetLastError(); + // if (!success) + // { + // LOG(Warn, ui) << "Failed to assign job object. " << error; + // } +#endif +} + } } } // end namespaces diff --git a/src/lib/os/os.h b/src/lib/os/os.h index 5cfcbd910..d7312cc33 100755 --- a/src/lib/os/os.h +++ b/src/lib/os/os.h @@ -86,6 +86,8 @@ inline double nan () { return std::numeric_limits::quiet_NaN(); } BTS_EXPORT float fnan (); BTS_EXPORT bool is_finite(double d); int cache_size_l3_bytes(); + +extern "C" BTS_EXPORT int setup_process_job_object(); }} #endif From 3cff5343a36f275536b38eb4f94a1ac0d539da09 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 2 Apr 2019 18:10:53 -0400 Subject: [PATCH 03/12] PR review and support of -multiple --- src/client/spark/App.xaml.cs | 17 ++++++++------ .../core/NativeMethods/BTSNativeMethods.cs | 2 +- .../spark/view/Shell/Login/LoginModel.cs | 4 ++-- src/lib/os/os.cpp | 23 +++++++------------ src/lib/os/os.h | 2 -- 5 files changed, 21 insertions(+), 27 deletions(-) diff --git a/src/client/spark/App.xaml.cs b/src/client/spark/App.xaml.cs index 07cb2e357..07eff0bb0 100644 --- a/src/client/spark/App.xaml.cs +++ b/src/client/spark/App.xaml.cs @@ -75,7 +75,8 @@ namespace mbts.ui.shell Environment.Exit(0); } - Process _stunnel_process; + Process _stunnel_process; + static internal string stunnel_job_error { get; private set;} void init_stunnel(string[] argv) { var path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\BTS\\stunnel\\"; @@ -83,7 +84,9 @@ namespace mbts.ui.shell { try { - BTSUINativeMethods.setup_process_job_object(); + uint job_error = BTSUINativeMethods.setup_process_job_object(); + if(job_error != 0) + stunnel_job_error = "Stunnel Job Error code: " + job_error; _stunnel_process = Process.Start(path + "bin\\stunnel.exe"); string config_error; bool success = false; if(_stunnel_process != null) @@ -102,11 +105,11 @@ namespace mbts.ui.shell public new int Run() { var argv = Environment.GetCommandLineArgs(); - try { - init_stunnel(argv); - if (argv.Contains("-multiple") || - _mutex == null || - _mutex.WaitOne(TimeSpan.Zero, true)) { + try { + if (argv.Contains("-multiple") || _mutex == null || _mutex.WaitOne(TimeSpan.Zero, true)) + { + if(_mutex == null || _mutex.WaitOne(TimeSpan.Zero, true)) + init_stunnel(argv); return base.Run(); } else { diff --git a/src/client/spark/core/NativeMethods/BTSNativeMethods.cs b/src/client/spark/core/NativeMethods/BTSNativeMethods.cs index f522930b9..baa11754c 100644 --- a/src/client/spark/core/NativeMethods/BTSNativeMethods.cs +++ b/src/client/spark/core/NativeMethods/BTSNativeMethods.cs @@ -12,7 +12,7 @@ namespace mbts.ui.native public static extern void enable_limits(); [DllImport("libspark")] - public static extern void setup_process_job_object(); + public static extern uint setup_process_job_object(); [DllImport("libspark", CharSet = CharSet.Unicode)] public static extern void set_window_app_id(IntPtr hwnd, string stack_id); diff --git a/src/client/spark/view/Shell/Login/LoginModel.cs b/src/client/spark/view/Shell/Login/LoginModel.cs index 20e770318..061add7e5 100644 --- a/src/client/spark/view/Shell/Login/LoginModel.cs +++ b/src/client/spark/view/Shell/Login/LoginModel.cs @@ -1,4 +1,4 @@ -using bts; + using bts; using bts.api; using bts.api.core; using bts.api.persistence; @@ -94,7 +94,7 @@ namespace mbts.ui.shell { Configuration.initialize(); } catch (ApplicationException e) { - ErrorMessage = e.Message; + ErrorMessage = (e.Message ?? string.Empty) + (App.stunnel_job_error ?? string.Empty); HasFatalError = true; return; } diff --git a/src/lib/os/os.cpp b/src/lib/os/os.cpp index 6aa71b92c..65f6437b0 100755 --- a/src/lib/os/os.cpp +++ b/src/lib/os/os.cpp @@ -1001,34 +1001,27 @@ extern "C" BTS_EXPORT char *bts_data_path() { extern "C" BTS_EXPORT void free_bts_data_path(char *dp) { delete[] dp; } -extern "C" BTS_EXPORT void setup_process_job_object() +extern "C" BTS_EXPORT unsigned int setup_process_job_object() { #ifdef _WIN32 if (IsDebuggerPresent()) - return; + return 0; HANDLE hjob = CreateJobObject(nullptr, nullptr); if (hjob == nullptr) - { - //LOG(Warn, ui) << "Failed to create JOB object. Limits are not in force."; - return; - } + return -1; //Failed to create JOB object. JOBOBJECT_EXTENDED_LIMIT_INFORMATION jeli = {0}; jeli.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE; BOOL success = SetInformationJobObject(hjob, JobObjectExtendedLimitInformation, &jeli, sizeof(jeli)); DWORD error = GetLastError(); - if (!success) - { - //LOG(Warn, ui) << "Failed to set up limits - last error: " << error; - return; - } + if(!success) + return error; success = AssignProcessToJobObject(hjob, GetCurrentProcess()); error = GetLastError(); - // if (!success) - // { - // LOG(Warn, ui) << "Failed to assign job object. " << error; - // } + if(!success) + return error; + return 0; #endif } diff --git a/src/lib/os/os.h b/src/lib/os/os.h index d7312cc33..5cfcbd910 100755 --- a/src/lib/os/os.h +++ b/src/lib/os/os.h @@ -86,8 +86,6 @@ inline double nan () { return std::numeric_limits::quiet_NaN(); } BTS_EXPORT float fnan (); BTS_EXPORT bool is_finite(double d); int cache_size_l3_bytes(); - -extern "C" BTS_EXPORT int setup_process_job_object(); }} #endif From 57fc50ce61c497cd95328299166eea80e17166f9 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 2 Apr 2019 18:12:05 -0400 Subject: [PATCH 04/12] typo --- src/client/spark/view/Shell/Login/LoginModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/view/Shell/Login/LoginModel.cs b/src/client/spark/view/Shell/Login/LoginModel.cs index 061add7e5..db5967be9 100644 --- a/src/client/spark/view/Shell/Login/LoginModel.cs +++ b/src/client/spark/view/Shell/Login/LoginModel.cs @@ -1,4 +1,4 @@ - using bts; +using bts; using bts.api; using bts.api.core; using bts.api.persistence; From 19c0b94803873275f705ddc861a000a5fbd12d0b Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 2 Apr 2019 18:13:31 -0400 Subject: [PATCH 05/12] unsigned... --- src/lib/os/os.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/os/os.cpp b/src/lib/os/os.cpp index 65f6437b0..05488954c 100755 --- a/src/lib/os/os.cpp +++ b/src/lib/os/os.cpp @@ -1008,7 +1008,7 @@ extern "C" BTS_EXPORT unsigned int setup_process_job_object() return 0; HANDLE hjob = CreateJobObject(nullptr, nullptr); if (hjob == nullptr) - return -1; //Failed to create JOB object. + return 100; //Failed to create JOB object. JOBOBJECT_EXTENDED_LIMIT_INFORMATION jeli = {0}; jeli.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE; From 01128639ceddf62cb22d1fe3efd709de6fe5ccd9 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 4 Apr 2019 13:05:40 -0400 Subject: [PATCH 06/12] improve error logging --- src/client/spark/App.xaml.cs | 36 +++++++++++-------- .../spark/view/Shell/Login/LoginModel.cs | 2 +- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/client/spark/App.xaml.cs b/src/client/spark/App.xaml.cs index 07eff0bb0..25aecff08 100644 --- a/src/client/spark/App.xaml.cs +++ b/src/client/spark/App.xaml.cs @@ -79,28 +79,36 @@ namespace mbts.ui.shell static internal string stunnel_job_error { get; private set;} void init_stunnel(string[] argv) { - var path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\BTS\\stunnel\\"; - if(File.Exists(path + "config\\stunnel.conf")) + try { - try + var path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\BTS\\stunnel\\"; + if (File.Exists(path + "config\\stunnel.conf")) { - uint job_error = BTSUINativeMethods.setup_process_job_object(); - if(job_error != 0) - stunnel_job_error = "Stunnel Job Error code: " + job_error; - _stunnel_process = Process.Start(path + "bin\\stunnel.exe"); - string config_error; bool success = false; - if(_stunnel_process != null) + uint job_error = BTSUINativeMethods.setup_process_job_object(); + if(job_error == 0) { - for(int i = 0; i < 10; i++) + _stunnel_process = Process.Start(path + "bin\\stunnel.exe"); + string config_error; bool success = false; + if(_stunnel_process != null) { - if(success = mbts.config.Configuration.try_initialize(out config_error)) - break; - System.Threading.Thread.Sleep(500); + for(int i = 0; i < 10; i++) + { + if(success = mbts.config.Configuration.try_initialize(out config_error)) + break; + System.Threading.Thread.Sleep(500); + } } + else + stunnel_job_error = "Stunnel Job Error code: " + job_error + " could not start stunnel"; } + else + stunnel_job_error = "Stunnel Job Error code: " + job_error; } - catch {} //can't log here } + catch(Exception ex) + { + stunnel_job_error = "Error starting stunnel: " + ex.Message; + } } public new int Run() { diff --git a/src/client/spark/view/Shell/Login/LoginModel.cs b/src/client/spark/view/Shell/Login/LoginModel.cs index db5967be9..c3a42f7fb 100644 --- a/src/client/spark/view/Shell/Login/LoginModel.cs +++ b/src/client/spark/view/Shell/Login/LoginModel.cs @@ -94,7 +94,7 @@ namespace mbts.ui.shell { Configuration.initialize(); } catch (ApplicationException e) { - ErrorMessage = (e.Message ?? string.Empty) + (App.stunnel_job_error ?? string.Empty); + ErrorMessage = (e.Message ?? string.Empty) + " " + (App.stunnel_job_error ?? string.Empty); HasFatalError = true; return; } From 3d37dc481f9d54e4126c6b70c7f337df6b87bb92 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 6 Apr 2019 14:39:39 -0500 Subject: [PATCH 07/12] SPARK-2192 NullRef when hitting enter in order ticket after typing in a qty then price --- .../spark/view/Extensions/TextElement/TextBoxBehavior.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/client/spark/view/Extensions/TextElement/TextBoxBehavior.cs b/src/client/spark/view/Extensions/TextElement/TextBoxBehavior.cs index 45ad9e0d8..e29b10a90 100644 --- a/src/client/spark/view/Extensions/TextElement/TextBoxBehavior.cs +++ b/src/client/spark/view/Extensions/TextElement/TextBoxBehavior.cs @@ -103,10 +103,8 @@ namespace mbts.ui { } static void tb_keydown(object sender, KeyEventArgs e) { - if (e.Key == Key.Enter) { - var binding = BindingOperations.GetBindingExpression(sender as DependencyObject, TextBox.TextProperty); - binding.UpdateSource(); - } + if (e.Key == Key.Enter) + BindingOperations.GetBindingExpression(sender as DependencyObject, TextBox.TextProperty)?.UpdateSource(); } public static bool GetCommitOnEnter(DependencyObject obj) => (bool)obj.GetValue(CommitOnEnterProperty); From 418a1078c2ca4592a6e215ae7c0bc84dce07b332 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Apr 2019 09:17:20 -0400 Subject: [PATCH 08/12] Updated release notes. --- doc/user/content/release_notes/_index.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 71d637fd7..7456cf4fd 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -4,6 +4,9 @@ weight = 3 sort_by = "weight" insert_anchor_links = "right" +++ +## 1.5.8 +### User Visible Changes + - Fixed a bug where it was possible to crash the UI by entering an order through the order ticket if Enter was used to dismiss the dialog. ## 1.5.7 ### User Visible Changes - New videos have been added to the manual describing the [Algo Studio](./bts_spark/Trading/index.md#algo-studio) and [Spreader](./bts_spark/Spreader/index.md) From f0d3cabd14364a084c510bf1e78bf092ea1fb289 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Apr 2019 09:19:50 -0400 Subject: [PATCH 09/12] Updated release notes. --- doc/user/content/release_notes/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 7456cf4fd..03f1c3830 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -7,6 +7,7 @@ insert_anchor_links = "right" ## 1.5.8 ### User Visible Changes - Fixed a bug where it was possible to crash the UI by entering an order through the order ticket if Enter was used to dismiss the dialog. + - Fixed a spreader reporting bug which could cause the server to crash if an algo was used to control certain types of synthetics ## 1.5.7 ### User Visible Changes - New videos have been added to the manual describing the [Algo Studio](./bts_spark/Trading/index.md#algo-studio) and [Spreader](./bts_spark/Spreader/index.md) From b0c52f542a399d6bb73f23432a7bae93ee288019 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Apr 2019 09:23:21 -0400 Subject: [PATCH 10/12] Updated release notes. --- doc/user/content/release_notes/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 03f1c3830..99cdec8e9 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -8,6 +8,7 @@ insert_anchor_links = "right" ### User Visible Changes - Fixed a bug where it was possible to crash the UI by entering an order through the order ticket if Enter was used to dismiss the dialog. - Fixed a spreader reporting bug which could cause the server to crash if an algo was used to control certain types of synthetics + - Improved user message when the UI fails to login ## 1.5.7 ### User Visible Changes - New videos have been added to the manual describing the [Algo Studio](./bts_spark/Trading/index.md#algo-studio) and [Spreader](./bts_spark/Spreader/index.md) From b570762054e5e54c91b8861d33dbe0713b2604ae Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Apr 2019 09:56:39 -0400 Subject: [PATCH 11/12] Updated release notes. --- doc/user/content/release_notes/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 99cdec8e9..db2b50254 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -9,6 +9,7 @@ insert_anchor_links = "right" - Fixed a bug where it was possible to crash the UI by entering an order through the order ticket if Enter was used to dismiss the dialog. - Fixed a spreader reporting bug which could cause the server to crash if an algo was used to control certain types of synthetics - Improved user message when the UI fails to login + - Integrated stunnel into UI to make VPN setup unnecessary in unsecured environments. ## 1.5.7 ### User Visible Changes - New videos have been added to the manual describing the [Algo Studio](./bts_spark/Trading/index.md#algo-studio) and [Spreader](./bts_spark/Spreader/index.md) From 5b118d8fa06d3d2f72e4a06b2733477624b0e1ab Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Apr 2019 09:56:46 -0400 Subject: [PATCH 12/12] Fixed build. --- src/lib/os/os.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/os/os.cpp b/src/lib/os/os.cpp index 05488954c..3c8560047 100755 --- a/src/lib/os/os.cpp +++ b/src/lib/os/os.cpp @@ -1021,8 +1021,8 @@ extern "C" BTS_EXPORT unsigned int setup_process_job_object() error = GetLastError(); if(!success) return error; - return 0; #endif + return 0; } }