Changeset 206 for trunk/src/sh_prelude.c

Timestamp:

Jan 8, 2009, 10:08:45 PM (16 years ago)

Author:

katerina

Message:

Fix for ticket #133 (improve port checking and its reporting to prelude).

File:

• trunk/src/sh_prelude.c (modified) (8 diffs)

trunk/src/sh_prelude.c

@@ -696 +696 @@
         int ret;
         long port;
-        char *ptr, *new, *tmp, *ip, *srv, *end;
+        char *ptr, *new, *tmp, *ip, *srv, *protocol, *end;
         prelude_string_t *str;
         idmef_address_t *address;
@@ -704 +704 @@
         idmef_service_t *service;
         idmef_source_t *source = idmef_alert_get_next_source(alert, NULL);
+        struct passwd *pw;
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
+        struct passwd pwd;
+        char buffer[SH_PWBUF_SIZE];
+#endif
 
         new = sh_util_strdup(msg);
@@ -778 +783 @@
         if ( *ptr && *end == '\0' && port >= 0 && port < 65536) {
 
+                char * tmpw;
+
                 if ( ! source ) {
                         ret = idmef_alert_new_source(alert, &source, IDMEF_LIST_APPEND);
                         if ( ret < 0 ) {
-                                free(srv);
                                 SH_FREE( new );
                                 return ret;
@@ -789 +795 @@
                 ret = idmef_source_new_service(source, &service);
                 if ( ret < 0 ) {
-                        free(srv);
                         SH_FREE( new );
                         return ret;
@@ -795 +800 @@
 
                 idmef_service_set_port(service, port);
+
+                ret = idmef_service_new_protocol(service, &str);
+                if ( ret < 0 ) {
+                        SH_FREE( new );
+                        return ret;
+                }
+                
+                ++tmp; 
+                if (*tmp) { 
+                        char * tmpw = tmp;
+                        char tmpw_store;
+                        while (*tmpw && !isblank((int) *tmpw)) ++tmpw;
+                        tmpw_store = *tmpw; *tmpw = '\0';
+                        protocol = strdup(tmp);
+                        *tmpw = tmpw_store;
+                        prelude_string_set_nodup(str, protocol);
+                }
+
         }
 
@@ -850 +873 @@
         SH_FREE( new );
 
-        ptr = get_value(msg, _("user"), NULL);
+        ptr = get_value(msg, _("userid"), NULL);
 
         if ( ptr ) {
 
+                idmef_user_id_t * user_id;
+
                 ret = idmef_source_new_user(source, &user);
                 if ( ret < 0 ) {
@@ -860 +885 @@
                 }
 
-                ret = idmef_user_new_ident(user, &str);
-                if ( ret < 0 ) {
-                        free(ptr);
-                        return ret;
-                }
+                idmef_user_set_category(user, IDMEF_USER_CATEGORY_APPLICATION);
+                
+                ret = idmef_user_new_user_id(user, &user_id, IDMEF_LIST_APPEND);
+                if ( ret < 0 ) {
+                        free(ptr);
+                        return ret;
+                }
+                
+                idmef_user_id_set_type(user_id, IDMEF_USER_ID_TYPE_CURRENT_USER);
+
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
+                sh_getpwnam_r(ptr, &pwd, buffer, sizeof(buffer), &pw);
+#else
+                pw = sh_getpwnam(ptr);
+#endif
+                if ( pw )
+                        idmef_user_id_set_number(user_id, pw->pw_uid);
+
+                ret = idmef_user_id_new_name(user_id, &str);
+                if ( ret < 0 ) {
+                        free(ptr);
+                        return ret;
+                }
                 prelude_string_set_nodup(str, ptr);
+
         }
 
         ptr = get_value(msg, _("path"), NULL);
+        tmp = get_value(msg, _("pid"), NULL);
 
         if ( ptr ) {
@@ -889 +934 @@
                 prelude_string_set_nodup(str, ptr);
 
-                ptr = strrchr(ptr, '/');
-                if ( ptr ) {
+                
+                if ( NULL != strrchr(ptr, '/') ) {
                         ret = idmef_process_new_name(process, &str);
                         if ( ret == 0 ) {
+                                ptr = strrchr(ptr, '/');
                                 prelude_string_set_dup(str, ptr + 1);
                         }
-                }
-        }
+                } else {
+                        ret = idmef_process_new_name(process, &str);
+                        if ( ret == 0 ) {
+                                prelude_string_set_dup(str, ptr);
+                        }
+                }
+
+                idmef_process_set_pid(process, strtoul(tmp, NULL, 0));
+        }
+
+        if (tmp)
+          free(tmp);
 
         return 0;