Merge pull request #2525 in SNORT/snort3 from ~ARMANDAV/snort3:rna_client_username...

Squashed commit of the following:

commit 96f5c71451caa4bed79b5d6a2d8410ea11ae9a32
Author: Arun Mandava <armandav@cisco.com>
Date:   Thu Oct 1 16:54:40 2020 -0400

    rna: User discovery for successful login

commit 31414872a2d2354ef17ac4c1a371c704eea40a3b
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Thu Sep 3 18:07:49 2020 -0400

    appid: Create events for client user name, id and login success

diff --git a/src/host_tracker/host_tracker.cc b/src/host_tracker/host_tracker.cc
index 98fc6a659d5a2d4a269609a4ab83107386fa9365..e17a0a72ff6e56cd22a7c900f67dd745a2cf2bf8 100644 (file)
--- a/src/host_tracker/host_tracker.cc
+++ b/src/host_tracker/host_tracker.cc
@@ -410,6 +410,27 @@ bool HostTracker::update_service_info(HostApplication& ha, const char* vendor,
     return false;
 }
 
+bool HostTracker::update_service_user(Port port, IpProtocol proto, const char* user)
+{
+    host_tracker_stats.service_finds++;
+    lock_guard<mutex> lck(host_tracker_lock);
+
+    for ( auto& s : services )
+    {
+        if ( s.port == port and s.proto == proto )
+        {
+            if ( user and strncmp(user, s.user, INFO_SIZE) )
+            {
+                strncpy(s.user, user, INFO_SIZE);
+                s.user[INFO_SIZE-1] = '\0';
+                return true;
+            }
+            return false;
+        }
+    }
+    return false;
+}
+
 void HostTracker::remove_inferred_services()
 {
     lock_guard<mutex> lck(host_tracker_lock);

diff --git a/src/host_tracker/host_tracker.h b/src/host_tracker/host_tracker.h
index 1904e6cfa568eb020aaf70f1623ee10208702160..d3b175872993dec5164a98b772bf9f77b30acd62 100644 (file)
--- a/src/host_tracker/host_tracker.h
+++ b/src/host_tracker/host_tracker.h
@@ -91,6 +91,7 @@ struct HostApplication
     bool inferred_appid = false;
     uint32_t hits = 0;
     uint32_t last_seen = 0;
+    char user[INFO_SIZE] = { 0 };
 
     std::vector<HostApplicationInfo, HostAppInfoAllocator> info;
 };
@@ -235,6 +236,7 @@ public:
     void update_service(const HostApplication& ha);
     bool update_service_info(HostApplication& ha, const char* vendor, const char* version,
         uint16_t max_info);
+    bool update_service_user(Port, IpProtocol, const char* username);
     void remove_inferred_services();
 
     size_t get_client_count();

diff --git a/src/network_inspectors/appid/app_info_table.cc b/src/network_inspectors/appid/app_info_table.cc
index 4cbe0eac05d9bb7fa64c4a45fd9ad2c9095799cd..7f9ee4c31b36fed1ce7f93216918e303f4c3f423 100644 (file)
--- a/src/network_inspectors/appid/app_info_table.cc
+++ b/src/network_inspectors/appid/app_info_table.cc
@@ -617,7 +617,7 @@ void AppInfoManager::load_odp_config(OdpContext& odp_ctxt, const char* path)
     fclose(config_file);
 }
 
-void AppInfoManager::dump_appid_configurations(std::string file_path)
+void AppInfoManager::dump_appid_configurations(const std::string& file_path) const
 {
     std::ifstream conf_file(file_path);
     if (!conf_file.is_open())

diff --git a/src/network_inspectors/appid/app_info_table.h b/src/network_inspectors/appid/app_info_table.h
index 0d30e6cfb6f25e5b89159ba104fd51f3388b3ffb..daad804eaaf80b4b336e847b268fd77b96106e21 100644 (file)
--- a/src/network_inspectors/appid/app_info_table.h
+++ b/src/network_inspectors/appid/app_info_table.h
@@ -138,7 +138,7 @@ public:
     void cleanup_appid_info_table();
     void dump_app_info_table();
     SnortProtocolId add_appid_protocol_reference(const char* protocol, snort::SnortConfig*);
-    void dump_appid_configurations(std::string);
+    void dump_appid_configurations(const std::string&) const;
 
 private:
     void load_odp_config(OdpContext&, const char* path);

diff --git a/src/network_inspectors/appid/appid_app_descriptor.cc b/src/network_inspectors/appid/appid_app_descriptor.cc
index 2986c59cddd2be012468a35b15306fe1ea92c711..2430e38a6fa8e994068a8d1db1d34b1d7f25896d 100644 (file)
--- a/src/network_inspectors/appid/appid_app_descriptor.cc
+++ b/src/network_inspectors/appid/appid_app_descriptor.cc
@@ -72,16 +72,22 @@ void ServiceAppDescriptor::set_id(AppId app_id, OdpContext& odp_ctxt)
     }
 }
 
-void ClientAppDescriptor::update_user(AppId app_id, const char* username)
+void ClientAppDescriptor::update_user(AppId app_id, const char* username, AppidChangeBits& change_bits)
 {
     if ( my_username != username )
+    {
         my_username = username;
+        change_bits.set(APPID_CLIENT_USERNAME_BIT);
+    }
 
     if ( my_user_id != app_id )
     {
         my_user_id = app_id;
         if ( app_id > APP_ID_NONE )
+        {
             AppIdPegCounts::inc_user_count(app_id);
+            change_bits.set(APPID_CLIENT_USERID_BIT);
+        }
     }
 }
 

diff --git a/src/network_inspectors/appid/appid_app_descriptor.h b/src/network_inspectors/appid/appid_app_descriptor.h
index 2ea26b7a887131ff4f6d1ae13aa72ba218fa4a23..6210a11afd4bfe0240d8fdd55f474f53261a1754 100644 (file)
--- a/src/network_inspectors/appid/appid_app_descriptor.h
+++ b/src/network_inspectors/appid/appid_app_descriptor.h
@@ -198,7 +198,7 @@ public:
         my_user_id = APP_ID_NONE;
     }
 
-    void update_user(AppId app_id, const char* username);
+    void update_user(AppId app_id, const char* username, AppidChangeBits& change_bits);
 
     AppId get_user_id() const
     {

diff --git a/src/network_inspectors/appid/appid_detector.cc b/src/network_inspectors/appid/appid_detector.cc
index 9296eb0b0f5884cde853fb2a0c4e90902fdc1b40..f5c681517327fefe5555a1d76ad126ebc798373f 100644 (file)
--- a/src/network_inspectors/appid/appid_detector.cc
+++ b/src/network_inspectors/appid/appid_detector.cc
@@ -78,13 +78,14 @@ int AppIdDetector::data_add(AppIdSession& asd, void* data, AppIdFreeFCN fcn)
     return asd.add_flow_data(data, flow_data_index, fcn);
 }
 
-void AppIdDetector::add_user(AppIdSession& asd, const char* username, AppId appId, bool success)
+void AppIdDetector::add_user(AppIdSession& asd, const char* username, AppId appId, bool success,
+    AppidChangeBits& change_bits)
 {
-    asd.set_client_user(appId, username);
+    asd.set_client_user(appId, username, change_bits);
     if ( success )
-        asd.set_session_flags(APPID_SESSION_LOGIN_SUCCEEDED);
+        change_bits.set(APPID_CLIENT_LOGIN_SUCCEEDED_BIT);
     else
-        asd.clear_session_flags(APPID_SESSION_LOGIN_SUCCEEDED);
+        change_bits.reset(APPID_CLIENT_LOGIN_SUCCEEDED_BIT);
 }
 
 void AppIdDetector::add_payload(AppIdSession& asd, AppId payload_id)

diff --git a/src/network_inspectors/appid/appid_detector.h b/src/network_inspectors/appid/appid_detector.h
index c2e34d67402aa7c86cb6fd03e36f579ced1127e2..62bc2831b44e9cfe5b20ce44e71275def86ab81a 100644 (file)
--- a/src/network_inspectors/appid/appid_detector.h
+++ b/src/network_inspectors/appid/appid_detector.h
@@ -119,7 +119,7 @@ public:
 
     virtual void* data_get(AppIdSession&);
     virtual int data_add(AppIdSession&, void*, AppIdFreeFCN);
-    virtual void add_user(AppIdSession&, const char*, AppId, bool);
+    virtual void add_user(AppIdSession&, const char*, AppId, bool, AppidChangeBits&);
     virtual void add_payload(AppIdSession&, AppId);
     virtual void add_app(AppIdSession& asd, AppId service_id, AppId client_id, const char* version, AppidChangeBits& change_bits)
     {

diff --git a/src/network_inspectors/appid/appid_http_session.cc b/src/network_inspectors/appid/appid_http_session.cc
index d1933ef0c55f2ec78ac2f5ffd7208d169e985955..816d605dc80b7dfc60d0fffd10a095abcaf3e3ea 100644 (file)
--- a/src/network_inspectors/appid/appid_http_session.cc
+++ b/src/network_inspectors/appid/appid_http_session.cc
@@ -377,11 +377,11 @@ void AppIdHttpSession::process_chp_buffers(AppidChangeBits& change_bits, HttpPat
         if ( user )
         {
             if (app_type_flags & APP_TYPE_SERVICE)
-                client.update_user(chp_final, user);
+                client.update_user(chp_final, user, change_bits);
             else
-                client.update_user(asd.get_service_id(), user);
+                client.update_user(asd.get_service_id(), user, change_bits);
             user = nullptr;
-            asd.set_session_flags(APPID_SESSION_LOGIN_SUCCEEDED);
+            change_bits.set(APPID_CLIENT_LOGIN_SUCCEEDED_BIT);
         }
 
         chp_candidate = 0;

diff --git a/src/network_inspectors/appid/appid_session.h b/src/network_inspectors/appid/appid_session.h
index 4a7f5c8665bb904684762c166b7b900337713d3a..b6364058ae63a14d4517f6cabfdb9baa60d8cdae 100644 (file)
--- a/src/network_inspectors/appid/appid_session.h
+++ b/src/network_inspectors/appid/appid_session.h
@@ -517,9 +517,9 @@ public:
         return api.client.get_user_id();
     }
 
-    void set_client_user(AppId id, const char* username)
+    void set_client_user(AppId id, const char* username, AppidChangeBits& change_bits)
     {
-        api.client.update_user(id, username);
+        api.client.update_user(id, username, change_bits);
     }
 
     AppId get_payload_id() const

diff --git a/src/network_inspectors/appid/appid_session_api.cc b/src/network_inspectors/appid/appid_session_api.cc
index adfb0f03888081725cc02afac8720a20d7d5567b..84f97f7027fa503837213acb798d70afb9776213 100644 (file)
--- a/src/network_inspectors/appid/appid_session_api.cc
+++ b/src/network_inspectors/appid/appid_session_api.cc
@@ -56,6 +56,12 @@ void AppIdSessionApi::get_service_info(const char*& vendor, const char*& version
     subtype = service.get_subtype();
 }
 
+const char* AppIdSessionApi::get_client_info(AppId& service) const
+{
+    service = client.get_user_id();
+    return client.get_username();
+}
+
 AppId AppIdSessionApi::get_misc_app_id(uint32_t stream_index) const
 {
     if (get_service_app_id() == APP_ID_HTTP2)

diff --git a/src/network_inspectors/appid/appid_session_api.h b/src/network_inspectors/appid/appid_session_api.h
index bf4d5bb5e8699818808429e3c5f787134bcc014a..972ef7d59eef104f873583934a877c7f90c8b7da 100644 (file)
--- a/src/network_inspectors/appid/appid_session_api.h
+++ b/src/network_inspectors/appid/appid_session_api.h
@@ -77,22 +77,21 @@ namespace snort
 #define APPID_SESSION_RESPONDER_CHECKED     (1ULL << 26)
 #define APPID_SESSION_INITIATOR_CHECKED     (1ULL << 27)
 #define APPID_SESSION_SSL_SESSION           (1ULL << 28)
-#define APPID_SESSION_LOGIN_SUCCEEDED       (1ULL << 29)
-#define APPID_SESSION_SPDY_SESSION          (1ULL << 30)
-#define APPID_SESSION_ENCRYPTED             (1ULL << 31)
-#define APPID_SESSION_APP_REINSPECT         (1ULL << 32)
-#define APPID_SESSION_RESPONSE_CODE_CHECKED (1ULL << 33)
-#define APPID_SESSION_REXEC_STDERR          (1ULL << 34)
-#define APPID_SESSION_CHP_INSPECTING        (1ULL << 35)
-#define APPID_SESSION_STICKY_SERVICE        (1ULL << 36)
-#define APPID_SESSION_APP_REINSPECT_SSL     (1ULL << 37)
-#define APPID_SESSION_NO_TPI                (1ULL << 38)
-#define APPID_SESSION_FUTURE_FLOW_IDED      (1ULL << 39)
-#define APPID_SESSION_OOO_CHECK_TP          (1ULL << 40)
-#define APPID_SESSION_PAYLOAD_SEEN          (1ULL << 41)
-#define APPID_SESSION_HOST_CACHE_MATCHED    (1ULL << 42)
-#define APPID_SESSION_DECRYPT_MONITOR       (1ULL << 43)
-#define APPID_SESSION_HTTP_TUNNEL           (1ULL << 44)
+#define APPID_SESSION_SPDY_SESSION          (1ULL << 29)
+#define APPID_SESSION_ENCRYPTED             (1ULL << 30)
+#define APPID_SESSION_APP_REINSPECT         (1ULL << 31)
+#define APPID_SESSION_RESPONSE_CODE_CHECKED (1ULL << 32)
+#define APPID_SESSION_REXEC_STDERR          (1ULL << 33)
+#define APPID_SESSION_CHP_INSPECTING        (1ULL << 34)
+#define APPID_SESSION_STICKY_SERVICE        (1ULL << 35)
+#define APPID_SESSION_APP_REINSPECT_SSL     (1ULL << 36)
+#define APPID_SESSION_NO_TPI                (1ULL << 37)
+#define APPID_SESSION_FUTURE_FLOW_IDED      (1ULL << 38)
+#define APPID_SESSION_OOO_CHECK_TP          (1ULL << 39)
+#define APPID_SESSION_PAYLOAD_SEEN          (1ULL << 40)
+#define APPID_SESSION_HOST_CACHE_MATCHED    (1ULL << 41)
+#define APPID_SESSION_DECRYPT_MONITOR       (1ULL << 42)
+#define APPID_SESSION_HTTP_TUNNEL           (1ULL << 43)
 #define APPID_SESSION_IGNORE_ID_FLAGS \
     (APPID_SESSION_FUTURE_FLOW | \
     APPID_SESSION_NOT_A_SERVICE | \
@@ -107,6 +106,7 @@ public:
     AppId get_service_app_id() const;
     void get_service_info(const char*& vendor, const char*& version,
         const AppIdServiceSubtype*& subtype) const;
+    const char* get_client_info(AppId& service) const;
     AppId get_misc_app_id(uint32_t stream_index = 0) const;
     AppId get_client_app_id(uint32_t stream_index = 0) const;
     AppId get_payload_app_id(uint32_t stream_index = 0) const;

diff --git a/src/network_inspectors/appid/client_plugins/client_app_aim.cc b/src/network_inspectors/appid/client_plugins/client_app_aim.cc
index 57c2e68ed2c4e3de9b7db5af845d2b97095f490d..7ce86d7a3012ff97fa7dddf53d1b316c9ffb2e36 100644 (file)
--- a/src/network_inspectors/appid/client_plugins/client_app_aim.cc
+++ b/src/network_inspectors/appid/client_plugins/client_app_aim.cc
@@ -198,7 +198,7 @@ int AimClientDetector::validate(AppIdDiscoveryArgs& args)
                         char username[USERNAME_LEN];
 
                         if ( check_username(cur, tlv, username, username + USERNAME_LEN - 1) )
-                            add_user(args.asd, username, APP_ID_AOL_INSTANT_MESSENGER, true);
+                            add_user(args.asd, username, APP_ID_AOL_INSTANT_MESSENGER, true, args.change_bits);
                     }
                     break;
                 case 0x0003:

diff --git a/src/network_inspectors/appid/client_plugins/client_app_tns.cc b/src/network_inspectors/appid/client_plugins/client_app_tns.cc
index fd715d28e79f654c1a371fdb48002bebcdad31f3..025b5cabefb460ad35d45a920b0b24eca9ae2cba 100644 (file)
--- a/src/network_inspectors/appid/client_plugins/client_app_tns.cc
+++ b/src/network_inspectors/appid/client_plugins/client_app_tns.cc
@@ -340,7 +340,7 @@ done:
             user_size = TNS_MAX_INFO_SIZE;
         memcpy(username, &args.data[user_start], user_size);
         username[user_size] = 0;
-        add_user(args.asd, username, APP_ID_ORACLE_DATABASE, true);
+        add_user(args.asd, username, APP_ID_ORACLE_DATABASE, true, args.change_bits);
     }
     return APPID_SUCCESS;
 }

diff --git a/src/network_inspectors/appid/client_plugins/test/client_plugin_mock.h b/src/network_inspectors/appid/client_plugins/test/client_plugin_mock.h
index d978a82d8cbdb7e644f48f43cde27a0a2bb7a43f..439ec9db153c2439f1322823ee4c1c64120d50c4 100644 (file)
--- a/src/network_inspectors/appid/client_plugins/test/client_plugin_mock.h
+++ b/src/network_inspectors/appid/client_plugins/test/client_plugin_mock.h
@@ -79,7 +79,7 @@ int AppIdDetector::initialize(){return 0;}
 void AppIdDetector::reload() { }
 int AppIdDetector::data_add(AppIdSession&, void*, AppIdFreeFCN){return 0;}
 void* AppIdDetector::data_get(AppIdSession&) {return nullptr;}
-void AppIdDetector::add_user(AppIdSession&, const char*, AppId, bool){}
+void AppIdDetector::add_user(AppIdSession&, const char*, AppId, bool, AppidChangeBits&){}
 void AppIdDetector::add_payload(AppIdSession&, AppId){}
 void AppIdDetector::add_app(const snort::Packet&, AppIdSession&, AppidSessionDirection, AppId, AppId, const char*, AppidChangeBits&){}
 void AppIdDiscovery::add_pattern_data(AppIdDetector*, snort::SearchTool&, int,

diff --git a/src/network_inspectors/appid/detector_plugins/detector_imap.cc b/src/network_inspectors/appid/detector_plugins/detector_imap.cc
index 71f3558f44c583f0420abecdb966e5cc4db9ed41..4fd863f42d1a8b34922f5bf43dd5027477a660c7 100644 (file)
--- a/src/network_inspectors/appid/detector_plugins/detector_imap.cc
+++ b/src/network_inspectors/appid/detector_plugins/detector_imap.cc
@@ -180,7 +180,7 @@ static int isImapTagChar(uint8_t tag)
 }
 
 static int imap_server_validate(ImapDetectorData* dd, const uint8_t* data, uint16_t size,
-    AppIdSession& asd, AppIdDetector* detector)
+    AppIdSession& asd, AppidChangeBits& change_bits, AppIdDetector* detector)
 {
     const uint8_t* end = data + size;
     ImapServiceData* id = &dd->server;
@@ -350,7 +350,7 @@ static int imap_server_validate(ImapDetectorData* dd, const uint8_t* data, uint1
         case IMAP_STATE_MID_OK_LOGIN:
             // add user successful - note: use  of LOGIN cmd implies no  IMAPS
             if ((id->flags & IMAP_FLAG_RESULT_OK) && dd->client.username[0])
-                detector->add_user(asd, dd->client.username, APP_ID_IMAP, true);
+                detector->add_user(asd, dd->client.username, APP_ID_IMAP, true, change_bits);
 
             id->state = IMAP_STATE_MID_LINE;
             break;
@@ -381,7 +381,7 @@ static int imap_server_validate(ImapDetectorData* dd, const uint8_t* data, uint1
                     id->state = IMAP_STATE_ALNUM_CODE_TERM;
                     // add user login failed - note: use  of LOGIN cmd implies no  IMAPS
                     if ((id->flags & IMAP_FLAG_RESULT_NO) && dd->client.username[0])
-                        detector->add_user(asd, dd->client.username, APP_ID_IMAP, false);
+                        detector->add_user(asd, dd->client.username, APP_ID_IMAP, false, change_bits);
                 }
             }
             else
@@ -587,7 +587,7 @@ int ImapClientDetector::validate(AppIdDiscoveryArgs& args)
 
     if (args.dir == APP_ID_FROM_RESPONDER)
     {
-        if (imap_server_validate(dd, args.data, args.size, args.asd, this))
+        if (imap_server_validate(dd, args.data, args.size, args.asd, args.change_bits, this))
             args.asd.clear_session_flags(APPID_SESSION_CLIENT_GETS_SERVER_PACKETS);
         return APPID_INPROCESS;
     }
@@ -886,7 +886,7 @@ int ImapServiceDetector::validate(AppIdDiscoveryArgs& args)
             return APPID_SUCCESS;
     }
 
-    if (!imap_server_validate(dd, args.data, args.size, args.asd, this))
+    if (!imap_server_validate(dd, args.data, args.size, args.asd, args.change_bits, this))
     {
         if ((id->flags & IMAP_FLAG_RESULT_OK) &&
             dd->client.state == IMAP_CLIENT_STATE_STARTTLS_CMD)

diff --git a/src/network_inspectors/appid/detector_plugins/detector_kerberos.cc b/src/network_inspectors/appid/detector_plugins/detector_kerberos.cc
index 454cb21cb6305371c1ec1781df15de4231d16c88..2dd7fa1796b79d9877594b6cc3f7f9e1207896e8 100644 (file)
--- a/src/network_inspectors/appid/detector_plugins/detector_kerberos.cc
+++ b/src/network_inspectors/appid/detector_plugins/detector_kerberos.cc
@@ -421,11 +421,11 @@ static int krb_walk_server_packet(KRBState* krbs, const uint8_t* s, const uint8_
             {
                 krb_service_detector->add_user(asd,
                     (krbs->flags & KRB_FLAG_USER_DETECTED) ? krbs->cname : reqCname,
-                    APP_ID_LDAP, false);
+                    APP_ID_LDAP, false, change_bits);
             }
         }
         else if (krbs->flags & KRB_FLAG_USER_DETECTED)
-            krb_service_detector->add_user(asd, krbs->cname, APP_ID_LDAP, true);
+            krb_service_detector->add_user(asd, krbs->cname, APP_ID_LDAP, true, change_bits);
 
         krbs->flags = 0;
     }

diff --git a/src/network_inspectors/appid/detector_plugins/detector_pop3.cc b/src/network_inspectors/appid/detector_plugins/detector_pop3.cc
index 81cf8ec897ac2c0296f654ce5ad5848e68aacea6..e0e59b1677d2bd4d05cb8933860a0313b3f59923 100644 (file)
--- a/src/network_inspectors/appid/detector_plugins/detector_pop3.cc
+++ b/src/network_inspectors/appid/detector_plugins/detector_pop3.cc
@@ -355,13 +355,13 @@ static int pop3_server_validate(POP3DetectorData* dd, const uint8_t* data, uint1
         {
             if (pd->error)
             {
-                pop3_service_detector->add_user(asd, dd->client.username, APP_ID_POP3, false);
+                pop3_service_detector->add_user(asd, dd->client.username, APP_ID_POP3, false, change_bits);
                 snort_free(dd->client.username);
                 dd->client.username = nullptr;
             }
             else
             {
-                pop3_service_detector->add_user(asd, dd->client.username, APP_ID_POP3, true);
+                pop3_service_detector->add_user(asd, dd->client.username, APP_ID_POP3, true, change_bits);
                 snort_free(dd->client.username);
                 dd->client.username = nullptr;
                 dd->need_continue = 0;

diff --git a/src/network_inspectors/appid/detector_plugins/detector_sip.cc b/src/network_inspectors/appid/detector_plugins/detector_sip.cc
index 0c47136373ece80d1481a9e63c9451c77d30da03..13c06e1487a98c4c7b827007c7fd45e0f257cdc8 100644 (file)
--- a/src/network_inspectors/appid/detector_plugins/detector_sip.cc
+++ b/src/network_inspectors/appid/detector_plugins/detector_sip.cc
@@ -393,7 +393,7 @@ success:
         client->add_app(asd, APP_ID_SIP, client_id, client_version, change_bits);
 
     if ( !fd->user_name.empty() )
-        client->add_user(asd, fd->user_name.c_str(), APP_ID_SIP, true);
+        client->add_user(asd, fd->user_name.c_str(), APP_ID_SIP, true, change_bits);
 }
 
 void SipEventHandler::service_handler(SipEvent& sip_event, AppIdSession& asd,

diff --git a/src/network_inspectors/appid/detector_plugins/test/detector_plugins_mock.h b/src/network_inspectors/appid/detector_plugins/test/detector_plugins_mock.h
index a07e2530b0fa113176062dd9f34ac4ade8d249f6..0889e28fa0b92bd7f3b9ca72ddd64535654eb0ff 100644 (file)
--- a/src/network_inspectors/appid/detector_plugins/test/detector_plugins_mock.h
+++ b/src/network_inspectors/appid/detector_plugins/test/detector_plugins_mock.h
@@ -213,7 +213,7 @@ bool AppIdReloadTuner::tune_resources(unsigned int)
 void ApplicationDescriptor::set_id(AppId){}
 void ServiceAppDescriptor::set_id(AppId, OdpContext&){}
 void ServiceAppDescriptor::update_stats(AppId, bool){}
-void ClientAppDescriptor::update_user(AppId, const char*){}
+void ClientAppDescriptor::update_user(AppId, const char*, AppidChangeBits&){}
 void ClientAppDescriptor::update_stats(AppId, bool) {}
 void PayloadAppDescriptor::update_stats(AppId, bool) {}
 void ServiceDiscovery::initialize() {}

diff --git a/src/network_inspectors/appid/lua_detector_api.cc b/src/network_inspectors/appid/lua_detector_api.cc
index 405fab6aacac127fe8f476f6ed9fbaa869f8f7d7..a644a7742d4782b460e72b346d00ec80edcb749b 100644 (file)
--- a/src/network_inspectors/appid/lua_detector_api.cc
+++ b/src/network_inspectors/appid/lua_detector_api.cc
@@ -967,7 +967,8 @@ static int client_add_user(lua_State* L)
     const char* userName = lua_tostring(L, 2);
     unsigned int service_id = lua_tonumber(L, 3);
     ud->cd->add_user(*lsd->ldp.asd, userName,
-        ud->get_odp_ctxt().get_app_info_mgr().get_appid_by_service_id(service_id), true);
+        ud->get_odp_ctxt().get_app_info_mgr().get_appid_by_service_id(service_id), true,
+        *lsd->ldp.change_bits);
     lua_pushnumber(L, 0);
     return 1;
 }

diff --git a/src/network_inspectors/appid/service_plugins/service_mdns.cc b/src/network_inspectors/appid/service_plugins/service_mdns.cc
index 2fe2d3fb6a452c29c52cf127115d0414579a2d00..b7d0bea757d061650a96a874acb60db92a99a7e7 100644 (file)
--- a/src/network_inspectors/appid/service_plugins/service_mdns.cc
+++ b/src/network_inspectors/appid/service_plugins/service_mdns.cc
@@ -136,7 +136,7 @@ int MdnsServiceDetector::validate(AppIdDiscoveryArgs& args)
             if (args.asd.get_odp_ctxt().mdns_user_reporting)
             {
                 MatchedPatterns* pattern_list = nullptr;
-                analyze_user(args.asd, args.pkt, args.size, pattern_list);
+                analyze_user(args.asd, args.pkt, args.size, args.change_bits, pattern_list);
                 destroy_match_list(pattern_list);
                 goto success;
             }
@@ -251,7 +251,7 @@ int MdnsServiceDetector::reference_pointer(const char* start_ptr, const char** r
                3. Calls the function which does the Username reporting along with the host
   MDNS User Analysis*/
 int MdnsServiceDetector::analyze_user(AppIdSession& asd, const Packet* pkt, uint16_t size,
-    MatchedPatterns*& pattern_list)
+    AppidChangeBits& change_bits, MatchedPatterns*& pattern_list)
 {
     int start_index = 0;
     uint16_t data_size = size;
@@ -304,7 +304,7 @@ int MdnsServiceDetector::analyze_user(AppIdSession& asd, const Packet* pkt, uint
                     user_index++;
                 }
 
-                add_user(asd, user_name, APP_ID_MDNS, true);
+                add_user(asd, user_name, APP_ID_MDNS, true, change_bits);
                 break;
             }
 
@@ -358,7 +358,7 @@ int MdnsServiceDetector::analyze_user(AppIdSession& asd, const Packet* pkt, uint
                             memcpy(user_name, user_name_bkp + user_index,
                                 user_name_len - user_index);
                             user_name[ user_name_len - user_index ] = '\0';
-                            add_user(asd, user_name, APP_ID_MDNS, true);
+                            add_user(asd, user_name, APP_ID_MDNS, true, change_bits);
                             return 1;
                         }
                         else

diff --git a/src/network_inspectors/appid/service_plugins/service_mdns.h b/src/network_inspectors/appid/service_plugins/service_mdns.h
index 309270b5af2fd88b8d2bf3683b7c45abbce11d15..10eee3679522fa02f876f6d1dd3a2b27eb5c7d5a 100644 (file)
--- a/src/network_inspectors/appid/service_plugins/service_mdns.h
+++ b/src/network_inspectors/appid/service_plugins/service_mdns.h
@@ -46,7 +46,7 @@ private:
     void destroy_match_list(MatchedPatterns*& pattern_list);
     int validate_reply(const uint8_t* data, uint16_t size);
     int analyze_user(AppIdSession&, const snort::Packet*, uint16_t size,
-        MatchedPatterns*& pattern_list);
+        AppidChangeBits& change_bits, MatchedPatterns*& pattern_list);
     int reference_pointer(const char* start_ptr, const char** resp_endptr, int* start_index,
         uint16_t data_size, uint8_t* user_name_len, unsigned size, MatchedPatterns*& pattern_list);
 

diff --git a/src/network_inspectors/appid/service_plugins/test/service_plugin_mock.h b/src/network_inspectors/appid/service_plugins/test/service_plugin_mock.h
index afb49ca687ef0cecb96bffea245017fb6267dc80..bb7ec22bff5e00603a74956bcb1382f435379036 100644 (file)
--- a/src/network_inspectors/appid/service_plugins/test/service_plugin_mock.h
+++ b/src/network_inspectors/appid/service_plugins/test/service_plugin_mock.h
@@ -92,13 +92,13 @@ int AppIdDetector::initialize(){return 0;}
 void AppIdDetector::reload() { }
 int AppIdDetector::data_add(AppIdSession&, void*, AppIdFreeFCN){return 0;}
 void* AppIdDetector::data_get(AppIdSession&) {return nullptr;}
-void AppIdDetector::add_user(AppIdSession&, const char*, AppId, bool){}
+void AppIdDetector::add_user(AppIdSession&, const char*, AppId, bool, AppidChangeBits&){}
 void AppIdDetector::add_payload(AppIdSession&, AppId){}
 void AppIdDetector::add_app(const snort::Packet&, AppIdSession&, AppidSessionDirection, AppId, AppId, const char*, AppidChangeBits&){}
 void ApplicationDescriptor::set_id(AppId){}
 void ServiceAppDescriptor::set_id(AppId, OdpContext&){}
 void ServiceAppDescriptor::update_stats(AppId, bool){}
-void ClientAppDescriptor::update_user(AppId, const char*){}
+void ClientAppDescriptor::update_user(AppId, const char*, AppidChangeBits&){}
 void ClientAppDescriptor::update_stats(AppId, bool) {}
 void PayloadAppDescriptor::update_stats(AppId, bool) {}
 void AppIdDiscovery::add_pattern_data(AppIdDetector*, snort::SearchTool&, int,

diff --git a/src/network_inspectors/appid/test/appid_api_test.cc b/src/network_inspectors/appid/test/appid_api_test.cc
index 17600de619b1f85ca8eef783ecab710c5027c32c..86be99e10dfb137a8be723c33ed0d4a275855f96 100644 (file)
--- a/src/network_inspectors/appid/test/appid_api_test.cc
+++ b/src/network_inspectors/appid/test/appid_api_test.cc
@@ -321,7 +321,7 @@ TEST(appid_api, ssl_app_group_id_lookup)
     CHECK_EQUAL(service, APPID_UT_ID);
     CHECK_EQUAL(client, APPID_UT_ID);
     CHECK_EQUAL(payload, APPID_UT_ID);
-    STRCMP_EQUAL("Published change_bits == 00000000000000000", test_log);
+    STRCMP_EQUAL("Published change_bits == 00000000000000000000", test_log);
 
     service = APP_ID_NONE;
     client = APP_ID_NONE;
@@ -334,7 +334,7 @@ TEST(appid_api, ssl_app_group_id_lookup)
     STRCMP_EQUAL(mock_session->tsession->get_tls_host(), APPID_UT_TLS_HOST);
     STRCMP_EQUAL(mock_session->tsession->get_tls_first_alt_name(), APPID_UT_TLS_HOST);
     STRCMP_EQUAL(mock_session->tsession->get_tls_cname(), APPID_UT_TLS_HOST);
-    STRCMP_EQUAL("Published change_bits == 00000000100011000", test_log);
+    STRCMP_EQUAL("Published change_bits == 00000000000100011000", test_log);
 
     mock_session->tsession->set_tls_host("www.cisco.com", 13, change_bits);
     mock_session->tsession->set_tls_cname("www.cisco.com", 13, change_bits);
@@ -350,7 +350,7 @@ TEST(appid_api, ssl_app_group_id_lookup)
     STRCMP_EQUAL(mock_session->tsession->get_tls_host(), APPID_UT_TLS_HOST);
     STRCMP_EQUAL(mock_session->tsession->get_tls_cname(), APPID_UT_TLS_HOST);
     STRCMP_EQUAL(mock_session->tsession->get_tls_org_unit(), "Cisco");
-    STRCMP_EQUAL("Published change_bits == 00000000100011000", test_log);
+    STRCMP_EQUAL("Published change_bits == 00000000000100011000", test_log);
 
     string host = "";
     val = appid_api.ssl_app_group_id_lookup(flow, (const char*)(host.c_str()), nullptr,
@@ -361,7 +361,7 @@ TEST(appid_api, ssl_app_group_id_lookup)
     STRCMP_EQUAL(mock_session->tsession->get_tls_host(), APPID_UT_TLS_HOST);
     STRCMP_EQUAL(mock_session->tsession->get_tls_cname(), APPID_UT_TLS_HOST);
     STRCMP_EQUAL(mock_session->tsession->get_tls_org_unit(), "Google");
-    STRCMP_EQUAL("Published change_bits == 00000000100000000", test_log);
+    STRCMP_EQUAL("Published change_bits == 00000000000100000000", test_log);
     mock().checkExpectations();
 }
 

diff --git a/src/network_inspectors/appid/test/appid_detector_test.cc b/src/network_inspectors/appid/test/appid_detector_test.cc
index 264f763399ab4066872a5720d31a2653931c53cd..2f7491dd3ce4301789fe36943acb25400fc68389 100644 (file)
--- a/src/network_inspectors/appid/test/appid_detector_test.cc
+++ b/src/network_inspectors/appid/test/appid_detector_test.cc
@@ -86,11 +86,10 @@ TEST(appid_detector_tests, add_user)
 {
     const char* username = "snorty";
     AppIdDetector* ad = new TestDetector;
-    ad->add_user(*mock_session, username, APPID_UT_ID, true);
+    AppidChangeBits cb;
+    ad->add_user(*mock_session, username, APPID_UT_ID, true, cb);
     STRCMP_EQUAL(mock_session->get_client_user(), username);
     CHECK_TRUE((mock_session->get_client_user_id() == APPID_UT_ID));
-    CHECK_TRUE((mock_session->get_session_flags(APPID_SESSION_LOGIN_SUCCEEDED)
-        & APPID_SESSION_LOGIN_SUCCEEDED));
     delete ad;
 }
 

diff --git a/src/network_inspectors/appid/test/appid_discovery_test.cc b/src/network_inspectors/appid/test/appid_discovery_test.cc
index c09f2c495cb2dcbffe72d0313afdbc4bb1cce38a..7d6c064ee8bfa4a670d054af77b98267ff5b26ee 100644 (file)
--- a/src/network_inspectors/appid/test/appid_discovery_test.cc
+++ b/src/network_inspectors/appid/test/appid_discovery_test.cc
@@ -136,7 +136,7 @@ void ServiceAppDescriptor::set_id(AppId app_id, OdpContext& odp_ctxt)
 }
 void ServiceAppDescriptor::update_stats(AppId, bool){}
 void ServiceAppDescriptor::set_port_service_id(AppId){}
-void ClientAppDescriptor::update_user(AppId, const char*){}
+void ClientAppDescriptor::update_user(AppId, const char*, AppidChangeBits&){}
 void ClientAppDescriptor::update_stats(AppId, bool) {}
 void PayloadAppDescriptor::update_stats(AppId, bool) {}
 
@@ -383,7 +383,7 @@ TEST(appid_discovery_tests, event_published_when_ignoring_flow)
 
     // Detect changes in service, client, payload, and misc appid
     mock().checkExpectations();
-    STRCMP_EQUAL("Published change_bits == 00000000001111100", test_log);
+    STRCMP_EQUAL("Published change_bits == 00000000000001111100", test_log);
 
     delete &asd->get_api();
     delete asd;
@@ -415,7 +415,7 @@ TEST(appid_discovery_tests, event_published_when_processing_flow)
 
     // Detect changes in service, client, payload, and misc appid
     mock().checkExpectations();
-    STRCMP_EQUAL("Published change_bits == 00000000001111100", test_log);
+    STRCMP_EQUAL("Published change_bits == 00000000000001111100", test_log);
     delete &asd->get_api();
     delete asd;
     delete flow;
@@ -510,10 +510,11 @@ TEST(appid_discovery_tests, change_bits_to_string)
     change_bits.set();
     change_bits_to_string(change_bits, str);
     STRCMP_EQUAL(str.c_str(), "created, reset, service, client, payload, misc, referred, host,"
-        " tls-host, url, user-agent, response, referrer, dns-host, version, service-vendor, service-subtype");
+        " tls-host, url, user-agent, response, referrer, dns-host, version, service-vendor, service-subtype,"
+        " client-username, client-userid, client-login-succeeded");
 
     // Failure of this test is a reminder that enum is changed, hence translator needs update
-    CHECK_EQUAL(APPID_MAX_BIT, 17);
+    CHECK_EQUAL(APPID_MAX_BIT, 20);
 }
 
 int main(int argc, char** argv)

diff --git a/src/network_inspectors/appid/test/appid_mock_definitions.h b/src/network_inspectors/appid/test/appid_mock_definitions.h
index c862d8dd5bb8cce974148f2bc353c94dd40c0616..e0e6cca6f1e5b1807351cab0776449b04327e33b 100644 (file)
--- a/src/network_inspectors/appid/test/appid_mock_definitions.h
+++ b/src/network_inspectors/appid/test/appid_mock_definitions.h
@@ -63,10 +63,12 @@ void ApplicationDescriptor::set_id(AppId app_id){ my_id = app_id;}
 void ServiceAppDescriptor::set_id(AppId app_id, OdpContext&){ set_id(app_id); }
 void ServiceAppDescriptor::update_stats(AppId, bool){}
 void ServiceAppDescriptor::set_port_service_id(AppId app_id){ port_service_id = app_id;}
-void ClientAppDescriptor::update_user(AppId app_id, const char* username)
+void ClientAppDescriptor::update_user(AppId app_id, const char* username, AppidChangeBits& change_bits)
 {
     my_username = username;
     my_user_id = app_id;
+    change_bits.set(APPID_CLIENT_USERNAME_BIT);
+    change_bits.set(APPID_CLIENT_USERID_BIT);
 }
 void ClientAppDescriptor::update_stats(AppId, bool) {}
 void PayloadAppDescriptor::update_stats(AppId, bool) {}

diff --git a/src/network_inspectors/appid/test/appid_mock_session.h b/src/network_inspectors/appid/test/appid_mock_session.h
index 5c51fd5bd9292c33c2db9d7f82bae2d1e3f8db72..dcf295630ec9a135f0a921b957a314a6ee940506 100644 (file)
--- a/src/network_inspectors/appid/test/appid_mock_session.h
+++ b/src/network_inspectors/appid/test/appid_mock_session.h
@@ -87,7 +87,7 @@ AppIdSession::AppIdSession(IpProtocol proto, const SfIp* ip, uint16_t, AppIdInsp
     service_port = APPID_UT_SERVICE_PORT;
     AppidChangeBits change_bits;
 
-    set_client_user(APPID_UT_ID, APPID_UT_USERNAME);
+    set_client_user(APPID_UT_ID, APPID_UT_USERNAME, change_bits);
     set_client_version(APPID_UT_CLIENT_VERSION, change_bits);
 
     set_service_vendor(APPID_UT_SERVICE_VENDOR, change_bits);

diff --git a/src/network_inspectors/appid/test/service_state_test.cc b/src/network_inspectors/appid/test/service_state_test.cc
index e03b48f4765013faade0e3028d37f8c25834a876..cf686470713872922431d9b49a70408e5d40b217 100644 (file)
--- a/src/network_inspectors/appid/test/service_state_test.cc
+++ b/src/network_inspectors/appid/test/service_state_test.cc
@@ -79,7 +79,7 @@ void ApplicationDescriptor::set_id(AppId){}
 void ServiceAppDescriptor::set_id(AppId, OdpContext&){}
 void ServiceAppDescriptor::update_stats(AppId, bool){}
 void ServiceAppDescriptor::set_port_service_id(AppId){}
-void ClientAppDescriptor::update_user(AppId, const char*){}
+void ClientAppDescriptor::update_user(AppId, const char*, AppidChangeBits&){}
 void ClientAppDescriptor::update_stats(AppId, bool) {}
 void PayloadAppDescriptor::update_stats(AppId, bool) {}
 AppIdConfig::~AppIdConfig() { }

diff --git a/src/network_inspectors/appid/tp_appid_utils.cc b/src/network_inspectors/appid/tp_appid_utils.cc
index e803b8208787a241570f716ceab239cd230c1c6a..9d58da55bc9910fa5355775e7c9f830a80a9acc1 100644 (file)
--- a/src/network_inspectors/appid/tp_appid_utils.cc
+++ b/src/network_inspectors/appid/tp_appid_utils.cc
@@ -484,15 +484,14 @@ static inline void process_ssl(AppIdSession& asd,
 }
 
 static inline void process_ftp_control(AppIdSession& asd,
-    ThirdPartyAppIDAttributeData& attribute_data)
+    ThirdPartyAppIDAttributeData& attribute_data, AppidChangeBits& change_bits)
 {
     const string* field=0;
     if (!asd.get_odp_ctxt().ftp_userid_disabled &&
         (field=attribute_data.ftp_command_user()) != nullptr)
     {
-        asd.set_client_user(APP_ID_FTP_CONTROL, field->c_str());
-        asd.set_session_flags(APPID_SESSION_LOGIN_SUCCEEDED);
-        // attribute_data.ftpCommandUser = nullptr;
+        asd.set_client_user(APP_ID_FTP_CONTROL, field->c_str(), change_bits);
+        change_bits.set(APPID_CLIENT_LOGIN_SUCCEEDED_BIT);
     }
 }
 
@@ -546,7 +545,7 @@ static inline void process_third_party_results(AppIdSession& asd, int confidence
         process_rtmp(asd, attribute_data, confidence, change_bits);
 
     else if (contains(proto_list, APP_ID_FTP_CONTROL))
-        process_ftp_control(asd, attribute_data);
+        process_ftp_control(asd, attribute_data, change_bits);
 
     else if (contains(proto_list, APP_ID_QUIC))
         process_quic(asd, attribute_data, change_bits);

diff --git a/src/network_inspectors/rna/rna_app_discovery.cc b/src/network_inspectors/rna/rna_app_discovery.cc
index f8d021ec1df14f132552514112d5d271298d1d2d..b61ff9542e3207e6dcfc3ceb6735f55556543e95 100644 (file)
--- a/src/network_inspectors/rna/rna_app_discovery.cc
+++ b/src/network_inspectors/rna/rna_app_discovery.cc
@@ -80,7 +80,7 @@ void RnaAppDiscovery::process(AppidEvent* appid_event, DiscoveryFilter& filter,
                     src_mac, conf, logger, p->flow->client_port, service);
         }
 
-        if (appid_change_bits[APPID_CLIENT_BIT] and client > APP_ID_NONE
+        if ( appid_change_bits[APPID_CLIENT_BIT] and client > APP_ID_NONE
             and service > APP_ID_NONE )
         {
             const char* version = appid_session_api.get_client_version();
@@ -102,6 +102,17 @@ void RnaAppDiscovery::process(AppidEvent* appid_event, DiscoveryFilter& filter,
             service);
     }
 
+    // Appid supports only login success event. Change checks once login failure and
+    // logoff is supported
+    if ( appid_change_bits[APPID_CLIENT_LOGIN_SUCCEEDED_BIT] and filter.is_user_monitored(p) )
+    {
+        AppId service;
+        const char* username = appid_session_api.get_client_info(service);
+        if ( service > APP_ID_NONE and username and *username )
+            discover_user(p, ht, (const struct in6_addr*) src_ip->get_ip6_ptr(), src_mac,
+                logger, username, service, proto);
+    }
+
     if ( p->is_from_client() and ( appid_change_bits[APPID_HOST_BIT] or
         appid_change_bits[APPID_USERAGENT_BIT] ) )
     {
@@ -186,6 +197,17 @@ void RnaAppDiscovery::discover_client(const Packet* p, RnaTracker& rt,
     }
 }
 
+void RnaAppDiscovery::discover_user(const Packet* p, RnaTracker& rt,
+    const struct in6_addr* src_ip, const uint8_t* src_mac, RnaLogger& logger,
+    const char* username, AppId service, IpProtocol proto)
+{
+    if ( rt->update_service_user(p->flow->server_port, proto, username) )
+    {
+        logger.log(RUA_EVENT, CHANGE_USER_LOGIN, p, &rt, src_ip, src_mac, username,
+            service, (uint32_t) packet_time());
+    }
+}
+
 void RnaAppDiscovery::analyze_user_agent_fingerprint(const Packet* p, const char* host,
     const char* uagent, RnaTracker& rt, const SfIp* ip, const uint8_t* src_mac, RnaLogger& logger)
 {

diff --git a/src/network_inspectors/rna/rna_app_discovery.h b/src/network_inspectors/rna/rna_app_discovery.h
index 513e5251d6a44c96678fe2a817d702ee527a4bd4..19e53f47e0e395592f7015ea00ba1cf87cedd3ba 100644 (file)
--- a/src/network_inspectors/rna/rna_app_discovery.h
+++ b/src/network_inspectors/rna/rna_app_discovery.h
@@ -34,6 +34,9 @@ public:
     static void discover_client(const snort::Packet* p, RnaTracker& rt,
         const struct in6_addr* src_ip, const uint8_t* src_mac, RnaConfig* conf,
         RnaLogger& logger, const char* version, AppId client, AppId service);
+
+    static void discover_user(const snort::Packet*, RnaTracker&, const struct in6_addr*,
+        const uint8_t* src_mac, RnaLogger&, const char* username, AppId, IpProtocol);
 private:
     static void update_service_info(const snort::Packet* p, IpProtocol proto, const char* vendor,
         const char* version, RnaTracker& rt, const snort::SfIp* ip, const uint8_t* src_mac,

diff --git a/src/network_inspectors/rna/rna_logger.cc b/src/network_inspectors/rna/rna_logger.cc
index 242527fab5e0ddd25ebaba3e67d387e8b7d367ba..6503b61d4e5dfa9eb61058d0995a692e6255e7da 100644 (file)
--- a/src/network_inspectors/rna/rna_logger.cc
+++ b/src/network_inspectors/rna/rna_logger.cc
@@ -58,9 +58,9 @@ static inline void rna_logger_message(const RnaLoggerEvent& rle)
         ip.set(rle.ip); // using this instead of packet's ip to support ARP
         debug_logf(rna_trace, nullptr, "RNA log: type %u, subtype %u, mac %s, ip %s\n",
             rle.type, rle.subtype, macbuf, ip.ntop(ipbuf));
-        if (rle.hc)
+        if ( rle.hc )
         {
-            if (rle.hc->version[0] != '\0')
+            if ( rle.hc->version[0] != '\0' )
                 debug_logf(rna_trace, nullptr,
                     "RNA client log: client %u, service %u, version %s\n",
                     rle.hc->id, rle.hc->service, rle.hc->version);
@@ -68,23 +68,30 @@ static inline void rna_logger_message(const RnaLoggerEvent& rle)
                 debug_logf(rna_trace, nullptr, "RNA client log: client %u, service %u\n",
                     rle.hc->id, rle.hc->service);
         }
-        if (rle.ha)
+        if ( rle.ha )
         {
             debug_logf(rna_trace, nullptr,
                 "RNA Service Info log: appid: %d proto %u, port: %u\n",
                 rle.ha->appid, (uint32_t)rle.ha->proto, rle.ha->port);
 
-            for (auto& s: rle.ha->info)
+            for ( auto& s: rle.ha->info )
             {
-                if (s.vendor[0] != '\0')
+                if ( s.vendor[0] != '\0' )
                     debug_logf(rna_trace, nullptr, "RNA Service Info log: vendor: %s\n",
                         s.vendor);
 
-                if (s.version[0] != '\0')
+                if ( s.version[0] != '\0' )
                     debug_logf(rna_trace, nullptr, "RNA Service Info log: version: %s\n",
                         s.version);
             }
         }
+
+        if ( rle.user )
+        {
+            if ( rle.user and *rle.user )
+                debug_logf(rna_trace, nullptr,
+                    "RNA user login: service %u, user name %s\n", rle.appid, rle.user);
+        }
     }
     else
         debug_logf(rna_trace, nullptr, "RNA log: type %u, subtype %u, mac %s\n",
@@ -96,7 +103,15 @@ void RnaLogger::log(uint16_t type, uint16_t subtype, const Packet* p, RnaTracker
    const struct in6_addr* src_ip, const uint8_t* src_mac, const HostApplication* ha)
 {
     log(type, subtype, src_ip, src_mac, ht, p, 0, 0,
-        nullptr, ha, nullptr, nullptr, nullptr);
+        nullptr, ha);
+}
+
+void RnaLogger::log(uint16_t type, uint16_t subtype, const Packet* p, RnaTracker* ht,
+   const struct in6_addr* src_ip, const uint8_t* src_mac, const char* user, AppId appid,
+   uint32_t event_time)
+{
+    log(type, subtype, src_ip, src_mac, ht, p, event_time, 0,
+        nullptr, nullptr, nullptr, nullptr, nullptr, user, appid);
 }
 
 void RnaLogger::log(uint16_t type, uint16_t subtype, const Packet* p, RnaTracker* ht,
@@ -111,48 +126,46 @@ void RnaLogger::log(uint16_t type, uint16_t subtype, const Packet* p, RnaTracker
     uint32_t event_time)
 {
     log(type, subtype, src_ip, src_mac, ht, p, event_time, 0,
-        nullptr, nullptr, fp, nullptr, nullptr);
+        nullptr, nullptr, fp);
 }
 
 void RnaLogger::log(uint16_t type, uint16_t subtype, const Packet* p, RnaTracker* ht,
     const struct in6_addr* src_ip, const uint8_t* src_mac, uint32_t event_time)
 {
-    log(type, subtype, src_ip, src_mac, ht, p, event_time, 0,
-        nullptr, nullptr, nullptr, nullptr, nullptr);
+    log(type, subtype, src_ip, src_mac, ht, p, event_time);
 }
 
 void RnaLogger::log(uint16_t type, uint16_t subtype, const Packet* p, RnaTracker* ht,
     const struct in6_addr* src_ip, const uint8_t* src_mac, const HostMac* hm, uint32_t event_time)
 {
-    log(type, subtype, src_ip, src_mac, ht, p, event_time, 0,
-        hm, nullptr, nullptr, nullptr, nullptr);
+    log(type, subtype, src_ip, src_mac, ht, p, event_time, 0, hm);
 }
 
 void RnaLogger::log(uint16_t type, uint16_t subtype, const Packet* p, RnaTracker* ht,
     uint16_t proto, const uint8_t* src_mac, const struct in6_addr* src_ip, uint32_t event_time)
 {
-    log(type, subtype, src_ip, src_mac, ht, p, event_time, proto,
-        nullptr, nullptr, nullptr, nullptr, nullptr);
+    log(type, subtype, src_ip, src_mac, ht, p, event_time, proto);
 }
 
 void RnaLogger::log(uint16_t type, uint16_t subtype, const Packet* p, const uint8_t* src_mac,
     const struct in6_addr* src_ip, RnaTracker* ht, uint32_t event_time, void* cond_var)
 {
     log(type, subtype, src_ip, src_mac, ht, p, event_time, 0,
-        nullptr, nullptr, nullptr, cond_var, nullptr);
+        nullptr, nullptr, nullptr, cond_var);
 }
 
 bool RnaLogger::log(uint16_t type, uint16_t subtype, const struct in6_addr* src_ip,
     const uint8_t* src_mac, RnaTracker* ht, const Packet* p, uint32_t event_time,
     uint16_t proto, const HostMac* hm, const HostApplication* ha,
-    const FpFingerprint* fp, void* cond_var, const HostClient* hc)
+    const FpFingerprint* fp, void* cond_var, const HostClient* hc,
+    const char* user, AppId appid)
 {
     if ( !enabled )
         return false;
 
     assert(ht);
 
-    RnaLoggerEvent rle(type, subtype, src_mac, ht, hm, proto, cond_var, ha, fp, hc);
+    RnaLoggerEvent rle(type, subtype, src_mac, ht, hm, proto, cond_var, ha, fp, hc, user, appid);
     if ( src_ip and (!IN6_IS_ADDR_V4MAPPED(src_ip) or src_ip->s6_addr32[3]) )
         rle.ip = src_ip;
     else

diff --git a/src/network_inspectors/rna/rna_logger.h b/src/network_inspectors/rna/rna_logger.h
index 86f98edd49c5892b8f7bf9904fa6c31a5da457f6..21ff30e4be866481c17dd1a18157b9167150c819 100644 (file)
--- a/src/network_inspectors/rna/rna_logger.h
+++ b/src/network_inspectors/rna/rna_logger.h
@@ -37,9 +37,9 @@ struct RnaLoggerEvent : public Event
 {
     RnaLoggerEvent (uint16_t t, uint16_t st, const uint8_t* mc, const RnaTracker* rt,
         const snort::HostMac* hmp, uint16_t pr, void* cv, const snort::HostApplication* hap,
-        const snort::FpFingerprint* fpr, const snort::HostClient* hcp) : type(t), subtype(st),
-            mac(mc), ht(rt), hm(hmp), proto(pr), cond_var(cv), ha(hap), fp(fpr), hc(hcp)
-    { }
+        const snort::FpFingerprint* fpr, const snort::HostClient* hcp, const char* u,
+        int32_t app) : type(t), subtype(st), mac(mc), ht(rt), hm(hmp),
+        proto(pr), cond_var(cv), ha(hap), fp(fpr), hc(hcp), user(u), appid(app) { }
 
     uint32_t event_time = 0;
     uint16_t type;
@@ -53,6 +53,8 @@ struct RnaLoggerEvent : public Event
     const snort::HostApplication* ha;
     const snort::FpFingerprint* fp;
     const snort::HostClient* hc;
+    const char* user;
+    AppId appid;
 };
 
 class RnaLogger
@@ -68,6 +70,11 @@ public:
     void log(uint16_t type, uint16_t subtype, const snort::Packet* p, RnaTracker* ht,
         const struct in6_addr* src_ip, const uint8_t* src_mac, const snort::HostClient* hcp);
 
+    // for host user
+    void log(uint16_t type, uint16_t subtype, const snort::Packet*, RnaTracker*,
+        const struct in6_addr*, const uint8_t* src_mac, const char* user,
+        AppId appid, uint32_t event_time);
+
     // for fingerprint
     void log(uint16_t type, uint16_t subtype, const snort::Packet* p, RnaTracker* ht,
         const struct in6_addr* src_ip, const uint8_t* src_mac, const snort::FpFingerprint* fp,
@@ -93,10 +100,11 @@ public:
 
     // for all
     bool log(uint16_t type, uint16_t subtype, const struct in6_addr* src_ip,
-        const uint8_t* src_mac, RnaTracker* ht, const snort::Packet* p,
-        uint32_t event_time, uint16_t proto, const snort::HostMac* hm,
-        const snort::HostApplication* ha, const snort::FpFingerprint* fp,
-        void* cond_var, const snort::HostClient* hc);
+        const uint8_t* src_mac, RnaTracker* ht, const snort::Packet* p = nullptr,
+        uint32_t event_time = 0, uint16_t proto = 0, const snort::HostMac* hm = nullptr,
+        const snort::HostApplication* ha = nullptr, const snort::FpFingerprint* fp = nullptr,
+        void* cond_var = nullptr, const snort::HostClient* hc = nullptr, 
+        const char* user = nullptr, AppId appid = APP_ID_NONE);
 
 private:
     const bool enabled;

diff --git a/src/network_inspectors/rna/rna_logger_common.h b/src/network_inspectors/rna/rna_logger_common.h
index 9f6a9757c0da809d954ca92b9b915f21969fc4ba..3ffc509e42d257fb71796aeb41380c105cf0c42b 100644 (file)
--- a/src/network_inspectors/rna/rna_logger_common.h
+++ b/src/network_inspectors/rna/rna_logger_common.h
@@ -40,4 +40,7 @@
     #define CHANGE_HOST_TYPE           16
     #define CHANGE_VLAN_TAG            18
 
+#define RUA_EVENT         1004
+    #define CHANGE_USER_LOGIN    2
+
 #endif

diff --git a/src/pub_sub/appid_events.h b/src/pub_sub/appid_events.h
index d387654b836e4e4d4bf405d7d7893d7ddf70fc53..25a8c28e37b370e44e7cd13981954b68031f9c79 100644 (file)
--- a/src/pub_sub/appid_events.h
+++ b/src/pub_sub/appid_events.h
@@ -62,6 +62,9 @@ enum AppidChangeBit
     APPID_VERSION_BIT,
     APPID_SERVICE_VENDOR_BIT,
     APPID_SERVICE_SUBTYPE_BIT,
+    APPID_CLIENT_USERNAME_BIT,
+    APPID_CLIENT_USERID_BIT,
+    APPID_CLIENT_LOGIN_SUCCEEDED_BIT,
 
     APPID_MAX_BIT
 };
@@ -106,6 +109,12 @@ inline void change_bits_to_string(AppidChangeBits& change_bits, std::string& str
         --n? str.append("service-vendor, ") : str.append("service-vendor");
     if (change_bits.test(APPID_SERVICE_SUBTYPE_BIT))
         --n? str.append("service-subtype, ") : str.append("service-subtype");
+    if (change_bits.test(APPID_CLIENT_USERNAME_BIT))
+        --n? str.append("client-username, ") : str.append("client-username");
+    if (change_bits.test(APPID_CLIENT_USERID_BIT))
+        --n? str.append("client-userid, ") : str.append("client-userid");
+    if (change_bits.test(APPID_CLIENT_LOGIN_SUCCEEDED_BIT))
+        --n? str.append("client-login-succeeded, ") : str.append("client-login-succeeded");
     if (n != 0) // make sure all bits from AppidChangeBit enum get translated
         str.append("change_bits_to_string error!");
 }