Merge branch 'future' into refactoring_crypto

wallix · Jan 25, 2016 · 09daac4 · 09daac4
2 parents c532759 + c23c461
commit 09daac4
Show file tree

Hide file tree

Showing 107 changed files with 681 additions and 518 deletions.
diff --git a/Jamroot b/Jamroot
@@ -967,12 +967,12 @@ unit-test test_finally : tests/utils/test_finally.cpp libboost_unit_test : $(TES
 
 unit-test test_verifier : tests/test_verifier.cpp program_options libboost_unit_test openssl crypto snappy dl z :  $(TEST_DEPENDENCIES) ;
 
-#explicit test_rdp_Qt.o front_Qt.o bitmap_data_allocator.o test_rdp_Qt ;
+#explicit front_Qt.o bitmap_data_allocator.o test_rdp_Qt ; #
 explicit test_rdp_Qt.o front_Qt.o bitmap_data_allocator.o test_rdp_Qt ;
 
 using qt : /usr ;
 
-obj test_rdp_Qt.o : tests/mod/rdp/test_rdp_Qt.cpp : <include>/usr/include/qt4 ;
+obj test_rdp_Qt.o : tests/mod/rdp/test_rdp_Qt.cpp : <include>/usr/include/qt4 ; #
 obj front_Qt.o : src/front/front_Qt.cpp : <include>/usr/include/qt4 ;
 obj bitmap_data_allocator.o : src/utils/bitmap_data_allocator.cpp ;
 

diff --git a/src/acl/module_manager.hpp b/src/acl/module_manager.hpp
@@ -849,6 +849,8 @@ class ModuleManager : public MMIni
                                                                    = this->ini.get<cfg::mod_rdp::session_probe_launch_fallback_timeout>();
                 mod_rdp_params.session_probe_on_launch_failure     = this->ini.get<cfg::mod_rdp::session_probe_on_launch_failure>();
                 mod_rdp_params.session_probe_keepalive_timeout     = this->ini.get<cfg::mod_rdp::session_probe_keepalive_timeout>();
+                mod_rdp_params.session_probe_on_keepalive_timeout_disconnect_user =
+                                                                     this->ini.get<cfg::mod_rdp::session_probe_on_keepalive_timeout_disconnect_user>();
                 mod_rdp_params.session_probe_end_disconnected_session
                                                                    = this->ini.get<cfg::mod_rdp::session_probe_end_disconnected_session>();
                 mod_rdp_params.session_probe_customize_executable_name

diff --git a/src/capture/new_kbdcapture.hpp b/src/capture/new_kbdcapture.hpp
@@ -415,7 +415,7 @@ struct NewKbdCapture : public RDPCaptureDevice
     virtual void session_update(const timeval & now, const char * message)
             override {
         this->is_driven_by_ocr          = true;
-        this->is_probe_enabled_session  = true;
+        this->is_probe_enabled_session  = (::strcmp(message, "Probe.Status=Unknown") != 0);
 
         if (!this->session_data.get_offset()) return;
 

diff --git a/src/configs/autogen/configs/autogen/authid.hpp b/src/configs/autogen/configs/autogen/authid.hpp
@@ -19,6 +19,7 @@ enum authid_t {
     AUTHID_MOD_RDP_IGNORE_AUTH_CHANNEL,
     AUTHID_MOD_RDP_ALTERNATE_SHELL,
     AUTHID_MOD_RDP_SHELL_WORKING_DIRECTORY,
+    AUTHID_MOD_RDP_USE_CLIENT_PROVIDED_ALTERNATE_SHELL,
     AUTHID_MOD_RDP_ENABLE_SESSION_PROBE,
     AUTHID_MOD_RDP_ENABLE_SESSION_PROBE_LOADING_MASK,
     AUTHID_MOD_RDP_SESSION_PROBE_ON_LAUNCH_FAILURE,
@@ -118,6 +119,7 @@ constexpr char const * const authstr[] = {
     "ignore_auth_channel",
     "alternate_shell",
     "shell_working_directory",
+    "use_client_provided_alternate_shell",
     "session_probe",
     "enable_session_probe_loading_mask",
     "session_probe_on_launch_failure",

diff --git a/src/configs/autogen/configs/autogen/set_value.tcc b/src/configs/autogen/configs/autogen/set_value.tcc
@@ -325,6 +325,9 @@ inline void Inifile::ConfigurationHolder::set_value(const char * context, const
         else if (0 == strcmp(key, "session_probe_keepalive_timeout")) {
             ::configs::parse(static_cast<cfg::mod_rdp::session_probe_keepalive_timeout&>(this->variables).value, value);
         }
+        else if (0 == strcmp(key, "session_probe_on_keepalive_timeout_disconnect_user")) {
+            ::configs::parse(static_cast<cfg::mod_rdp::session_probe_on_keepalive_timeout_disconnect_user&>(this->variables).value, value);
+        }
         else if (0 == strcmp(key, "session_probe_end_disconnected_session")) {
             ::configs::parse(static_cast<cfg::mod_rdp::session_probe_end_disconnected_session&>(this->variables).value, value);
         }