Teach teh sid snooping how to extract sid->name mappings from SAMR:QueryDispInfo
svn path=/trunk/; revision=7789
This commit is contained in:
Ronnie Sahlberg
parent
f2233623ea
commit
c9edc3ccee
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for snooping SID to name mappings
|
||||
* Copyright 2003, Ronnie Sahlberg
|
||||
*
|
||||
* $Id: packet-smb-sidsnooping.c,v 1.6 2003/05/22 11:48:28 sahlberg Exp $
|
||||
* $Id: packet-smb-sidsnooping.c,v 1.7 2003/06/05 11:02:19 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -34,6 +34,7 @@
|
|||
#include "epan/proto.h"
|
||||
#include "tap.h"
|
||||
#include "packet-dcerpc.h"
|
||||
#include "packet-dcerpc-nt.h"
|
||||
#include "register.h"
|
||||
#include "smb.h"
|
||||
#include "packet-smb-sidsnooping.h"
|
||||
|
|
@ -43,6 +44,10 @@ static int hf_lsa_info_level = -1;
|
|||
static int hf_lsa_opnum = -1;
|
||||
static int hf_lsa_domain = -1;
|
||||
static int hf_lsa_domain_sid = -1;
|
||||
static int hf_samr_hnd = -1;
|
||||
static int hf_samr_rid = -1;
|
||||
static int hf_samr_acct_name = -1;
|
||||
static int hf_samr_level = -1;
|
||||
|
||||
|
||||
|
||||
|
|
@ -54,7 +59,15 @@ typedef struct _sid_name {
|
|||
static GMemChunk *sid_name_chunk = NULL;
|
||||
static int sid_name_init_count = 200;
|
||||
|
||||
|
||||
|
||||
static GMemChunk *ctx_handle_chunk = NULL;
|
||||
static int ctx_handle_init_count = 200;
|
||||
static GHashTable *ctx_handle_table = NULL;
|
||||
|
||||
|
||||
static void *lsa_policy_information_flag = NULL;
|
||||
static void *samr_query_dispinfo_flag = NULL;
|
||||
|
||||
|
||||
char *
|
||||
|
|
@ -89,6 +102,125 @@ add_sid_name_mapping(char *sid, char *name)
|
|||
g_hash_table_insert(sid_name_table, sn, sn);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* QueryDispInfo :
|
||||
* level 1 : user displayinfo 1
|
||||
*/
|
||||
static int
|
||||
samr_query_dispinfo(void *dummy _U_, packet_info *pinfo, epan_dissect_t *edt, void *pri)
|
||||
{
|
||||
dcerpc_info *ri=pri;
|
||||
void *old_ctx=NULL;
|
||||
char *pol_name;
|
||||
char *sid;
|
||||
int sid_len;
|
||||
int num_rids;
|
||||
int num_names;
|
||||
GPtrArray *gp;
|
||||
GPtrArray *gp_rids;
|
||||
GPtrArray *gp_names;
|
||||
field_info *fi;
|
||||
field_info *fi_rid;
|
||||
field_info *fi_name;
|
||||
char sid_name[256];
|
||||
int info_level;
|
||||
|
||||
gp=proto_get_finfo_ptr_array(edt->tree, hf_samr_level);
|
||||
if(!gp || gp->len!=1){
|
||||
return 0;
|
||||
}
|
||||
fi=gp->pdata[0];
|
||||
info_level=fi->value->value.integer;
|
||||
|
||||
if(info_level!=1){
|
||||
return 0;
|
||||
}
|
||||
|
||||
if(!ri){
|
||||
return 0;
|
||||
}
|
||||
if(!ri->call_data){
|
||||
return 0;
|
||||
}
|
||||
if(ri->request){
|
||||
gp=proto_get_finfo_ptr_array(edt->tree, hf_samr_hnd);
|
||||
if(!gp || gp->len!=1){
|
||||
return 0;
|
||||
}
|
||||
fi=gp->pdata[0];
|
||||
|
||||
old_ctx=g_hash_table_lookup(ctx_handle_table, (gpointer)pinfo->fd->num);
|
||||
if(old_ctx){
|
||||
g_hash_table_remove(ctx_handle_table, (gpointer)pinfo->fd->num);
|
||||
}
|
||||
if(!old_ctx){
|
||||
old_ctx=g_mem_chunk_alloc(ctx_handle_chunk);
|
||||
memcpy(old_ctx, fi->value->value.bytes->data, 20);
|
||||
}
|
||||
g_hash_table_insert(ctx_handle_table, (gpointer)pinfo->fd->num, old_ctx);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
if(!ri->call_data->req_frame){
|
||||
return 0;
|
||||
}
|
||||
|
||||
old_ctx=g_hash_table_lookup(ctx_handle_table, (gpointer)ri->call_data->req_frame);
|
||||
if(!old_ctx){
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!dcerpc_smb_fetch_pol(old_ctx, &pol_name, NULL, NULL)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
sid=strstr(pol_name,"S-1-5");
|
||||
if(!sid){
|
||||
return 0;
|
||||
}
|
||||
|
||||
for(sid_len=4;1;sid_len++){
|
||||
if((sid[sid_len]>='0') && (sid[sid_len]<='9')){
|
||||
continue;
|
||||
}
|
||||
if(sid[sid_len]=='-'){
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
gp_rids=proto_get_finfo_ptr_array(edt->tree, hf_samr_rid);
|
||||
if(!gp_rids || gp_rids->len<1){
|
||||
return 0;
|
||||
}
|
||||
num_rids=gp_rids->len;
|
||||
gp_names=proto_get_finfo_ptr_array(edt->tree, hf_samr_acct_name);
|
||||
if(!gp_names || gp_names->len<1){
|
||||
return 0;
|
||||
}
|
||||
num_names=gp_names->len;
|
||||
|
||||
if(num_rids>num_names){
|
||||
num_rids=num_names;
|
||||
}
|
||||
|
||||
for(;num_rids;num_rids--){
|
||||
int len=sid_len;
|
||||
|
||||
fi_rid=gp_rids->pdata[num_rids-1];
|
||||
fi_name=gp_names->pdata[num_rids-1];
|
||||
strncpy(sid_name, sid, len);
|
||||
sid_name[len++]='-';
|
||||
len+=sprintf(sid_name+len,"%d",fi_rid->value->value.integer);
|
||||
sid_name[len]=0;
|
||||
add_sid_name_mapping(sid_name, fi_name->value->value.string);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* PolicyInformation :
|
||||
* level 3 : PRIMARY_DOMAIN_INFO lsa.domain_sid -> lsa.domain
|
||||
|
|
@ -173,6 +305,30 @@ sid_name_hash(gconstpointer k)
|
|||
return sum;
|
||||
}
|
||||
|
||||
|
||||
static gboolean
|
||||
free_all_ctx_handle(gpointer key_arg _U_, gpointer value _U_, gpointer user_data _U_)
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
static gint
|
||||
ctx_handle_equal(gconstpointer k1, gconstpointer k2)
|
||||
{
|
||||
int sn1 = (int)k1;
|
||||
int sn2 = (int)k2;
|
||||
|
||||
return sn1==sn2;
|
||||
}
|
||||
|
||||
static guint
|
||||
ctx_handle_hash(gconstpointer k)
|
||||
{
|
||||
int sn = (int)k;
|
||||
|
||||
return sn;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
sid_snooping_init(void)
|
||||
{
|
||||
|
|
@ -183,6 +339,10 @@ sid_snooping_init(void)
|
|||
remove_tap_listener(lsa_policy_information_flag);
|
||||
lsa_policy_information_flag=NULL;
|
||||
}
|
||||
if(samr_query_dispinfo_flag){
|
||||
remove_tap_listener(samr_query_dispinfo_flag);
|
||||
samr_query_dispinfo_flag=NULL;
|
||||
}
|
||||
|
||||
if(sid_name_table){
|
||||
g_hash_table_foreach_remove(sid_name_table, free_all_sid_names, NULL);
|
||||
|
|
@ -192,6 +352,14 @@ sid_snooping_init(void)
|
|||
g_mem_chunk_destroy(sid_name_chunk);
|
||||
sid_name_chunk=NULL;
|
||||
}
|
||||
if(ctx_handle_table){
|
||||
g_hash_table_foreach_remove(ctx_handle_table, free_all_ctx_handle, NULL);
|
||||
ctx_handle_table=NULL;
|
||||
}
|
||||
if(ctx_handle_chunk){
|
||||
g_mem_chunk_destroy(ctx_handle_chunk);
|
||||
ctx_handle_chunk=NULL;
|
||||
}
|
||||
|
||||
|
||||
if(!sid_name_snooping){
|
||||
|
|
@ -206,6 +374,13 @@ sid_snooping_init(void)
|
|||
G_ALLOC_ONLY);
|
||||
|
||||
|
||||
ctx_handle_table=g_hash_table_new(ctx_handle_hash, ctx_handle_equal);
|
||||
ctx_handle_chunk = g_mem_chunk_new("ctx_handle_chunk",
|
||||
20, /* our dcerpc context handles are 20 bytes */
|
||||
ctx_handle_init_count * 20,
|
||||
G_ALLOC_ONLY);
|
||||
|
||||
|
||||
hf_lsa=proto_get_id_by_filter_name("lsa");
|
||||
|
||||
hfi=proto_registrar_get_byname("lsa.opnum");
|
||||
|
|
@ -228,6 +403,23 @@ sid_snooping_init(void)
|
|||
hf_lsa_info_level=hfi->id;
|
||||
}
|
||||
|
||||
hfi=proto_registrar_get_byname("samr.hnd");
|
||||
if(hfi){
|
||||
hf_samr_hnd=hfi->id;
|
||||
}
|
||||
hfi=proto_registrar_get_byname("samr.rid");
|
||||
if(hfi){
|
||||
hf_samr_rid=hfi->id;
|
||||
}
|
||||
hfi=proto_registrar_get_byname("samr.acct_name");
|
||||
if(hfi){
|
||||
hf_samr_acct_name=hfi->id;
|
||||
}
|
||||
hfi=proto_registrar_get_byname("samr.level");
|
||||
if(hfi){
|
||||
hf_samr_level=hfi->id;
|
||||
}
|
||||
|
||||
|
||||
|
||||
error_string=register_tap_listener("dcerpc", lsa_policy_information, "lsa.policy_information and ( lsa.info.level or lsa.domain or lsa.domain_sid )", NULL, lsa_policy_information, NULL);
|
||||
|
|
@ -240,6 +432,17 @@ sid_snooping_init(void)
|
|||
exit(1);
|
||||
}
|
||||
lsa_policy_information_flag=lsa_policy_information;
|
||||
|
||||
error_string=register_tap_listener("dcerpc", samr_query_dispinfo, "samr and samr.opnum==40 and ( samr.hnd or samr.rid or samr.acct_name or samr.level )", NULL, samr_query_dispinfo, NULL);
|
||||
if(error_string){
|
||||
/* error, we failed to attach to the tap. clean up */
|
||||
|
||||
fprintf(stderr, "tethereal: Couldn't register proto_reg_handoff_smb_sidsnooping()/samr_query_dispinfo tap: %s\n",
|
||||
error_string->str);
|
||||
g_string_free(error_string, TRUE);
|
||||
exit(1);
|
||||
}
|
||||
samr_query_dispinfo_flag=samr_query_dispinfo;
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
|||
Loading…
Reference in New Issue