Commit Graph

107 Commits

Author SHA1 Message Date
Anders Broman bec8475743 LDAP with -T
svn path=/trunk/; revision=23353
2007-11-04 17:16:01 +00:00
Anders Broman 92ba89b5d1 LDAP wasn't 'fixed' to handle -T option...
svn path=/trunk/; revision=23335
2007-11-01 22:29:02 +00:00
Anders Broman dbcabb1938 Get rid of most of the legacy oid stuff.
svn path=/trunk/; revision=23333
2007-11-01 22:07:43 +00:00
Anders Broman 9492700608 Change:
get_oid_str_name() -> oid_resolved_from_string()
get_oid_name() -> oid_resolved_from_encoded()

svn path=/trunk/; revision=23331
2007-11-01 19:36:39 +00:00
Anders Broman 7329ae8ac6 Use oid_add_from_string for adding names.
fix compil of gsmmap and inap.
Note xcopy of gsmmap does not work(rename packet-gsm_map -> packet-gsmmap ?)

svn path=/trunk/; revision=23325
2007-10-31 23:11:15 +00:00
Anders Broman 6d1791db07 Fix:
packet-ldap-template.c(1330) : error C2220: warning treated as error - no object  file generated
packet-ldap-template.c(1330) : warning C4101: 'gss_len' : unreferenced local var iable NMAKE : fatal error U1077: 'cl' :

svn path=/trunk/; revision=22956
2007-09-25 16:51:49 +00:00
Ronnie Sahlberg 84b28f1399 only set ldap_info->first_auth_frame to 0 first time we see the
authentication packet or else we will get inconsistent dissection when 
clicking on packets.
(inconsistent as in :  a certain packet might/might not be dissected as 
LDAP/SASL depending on which packets we clicked on previously)
  

svn path=/trunk/; revision=22949
2007-09-25 08:05:17 +00:00
Ronnie Sahlberg dea0c3c9de not all SASL protected blobs use a GSS wrapper for the payload so we
cant check that the payload starts with BER tag 0x60 and an oid.
instead  check that the length byte (first 4 bytes) look sane and if 
SASL authentication has been negotiated on the connection

also, sometimes clients will mix both non-SASL and SASL protected LDAP 
traffic on the same tcp connection   by initially performing simple 
unauthenticated searches on the database before performing the Bind.



svn path=/trunk/; revision=22948
2007-09-25 07:47:00 +00:00
Ronnie Sahlberg 3acb5a0975 add support for yet another random combination of authentication
wrappers that can be used when connecting with sasl


svn path=/trunk/; revision=22945
2007-09-25 04:15:30 +00:00
Luis Ontanon 00c5e48a17 get users of oid_resolv to use the new oids, rollout packet-snmp.c
svn path=/trunk/; revision=22651
2007-08-25 01:14:24 +00:00
Jörg Mayer b312e64f6a get_ber_length doesn't need the tree argument, get rid of it.
Rebuild asn1 dissectors.

svn path=/trunk/; revision=22627
2007-08-24 07:12:04 +00:00
Jeff Morriss ffec5b8896 Convert a couple tvb_get_string()'s into tvb_get_ephemeral_string(). In the one remaining use of tvb_get_string(), g_free the old entry if the pointer is *not* NULL.
svn path=/trunk/; revision=22518
2007-08-15 22:41:49 +00:00
Ronnie Sahlberg 45b5adb97b remove some compiler warning due to unused pinfo parameter
a SASL encapsulated ldap blob can contain more than one LDAP message so 
the rest_is_pad parameter is bogus and thus removed.

make dissect_ldap_pdu handle when we have more than one LDAP message 
inside one sasl blob


svn path=/trunk/; revision=22181
2007-06-24 17:23:55 +00:00
Ronnie Sahlberg 35f3ff0246 add code to handle new insanity in how spnego and gss wrap
eachother



svn path=/trunk/; revision=22165
2007-06-22 19:32:02 +00:00
Tomas Kukosa 1dcf2aaef0 use ASN.1 type names in #.FN_BODY (instead of Wireshark type names)
svn path=/trunk/; revision=22054
2007-06-06 08:12:27 +00:00
Anders Broman 8673ae26d3 - LDAP generated with -X option
- a minor update to MobileDomainDefinitions.asn adding ID and a document reference.

svn path=/trunk/; revision=22010
2007-05-30 21:50:31 +00:00
Anders Broman 4b2284cc35 Clean up the .cnf file a bit.
svn path=/trunk/; revision=21992
2007-05-29 19:08:26 +00:00
Tomas Kukosa b20af30b48 few BER dissectors regenerated
svn path=/trunk/; revision=21920
2007-05-24 12:36:41 +00:00
Anders Broman dca634c4de Prepare for the use of the new -X parameter for BER encoded protocols.
svn path=/trunk/; revision=21889
2007-05-22 16:17:54 +00:00
Anders Broman f08cd1e5e3 actx in the rest of dissect_ber..()l
svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
Anders Broman c01f382974 Second step in introducing asn context to BER dissectors just like in PER.
svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
Anders Broman 4c692a62b6 Start introducing actx to ber functions.
svn path=/trunk/; revision=21705
2007-05-06 22:34:05 +00:00
Anders Broman 1cf1f16391 Split out common asn1 stuff to asn1.h and include that where needed.
svn path=/trunk/; revision=21635
2007-05-01 22:05:11 +00:00
Ronnie Sahlberg 8920a7e7f2 change the signature that asn2wrs generates for functions to marm all parameters as _U_
to reduce the number of compiler warnings.

update some template and cnf files to use _U_ as well 


svn path=/trunk/; revision=21088
2007-03-21 10:22:22 +00:00
Graeme Lunt c55b754264 Tidy ups for SASL/GSSAPI support:
1) Handle empty (zero length) saslCredentials
2) Handle "GSSAPI" auth_mech when identified from the bind
3) Annotate column info to show SASL service applied to LDAP operation


svn path=/trunk/; revision=20830
2007-02-17 11:06:25 +00:00
Jaap Keuter c9f25a4143 From Stefan Metzmacher:
I created two patches:
1.) move the handling of the compressed strings in CLDAP 'netlogon' replies into a generic place.
2.) implement dissection of SMB_NETLOGON cmd's 0x17 and 0x19

svn path=/trunk/; revision=19970
2006-11-24 07:09:38 +00:00
Jaap Keuter 066cab237e Don't remove a preference, make it obsolete instead.
svn path=/trunk/; revision=19818
2006-11-06 11:41:02 +00:00
Graeme Lunt 326773f754 Tidy up of information column for NTLM authentication.
Related to Bug 1148.


svn path=/trunk/; revision=19810
2006-11-05 12:15:52 +00:00
Graeme Lunt e15d91a592 General updates to:
*) Remove maximum LDAP PDU size check - they can get large with either large attributes (e.g. CRLs, SPIFs) or with lots of results (see http://www.wireshark.org/lists/wireshark-users/200610/msg00197.html). The max size preference is also removed.
*) Support for dissecting LDAP controls including server side sorting and paged results. A new BER function is introduced to see if there is a dissector for a given OID.
*) Remove reference to removed BER preference in the LDAP reassembly preference.
*) Mark a LDAPURL as a URL


svn path=/trunk/; revision=19792
2006-11-04 09:14:54 +00:00
Ronnie Sahlberg 2d1bb39121 change the signature for the get_pdu_len() function pointer passed to tcp_dissect_pdus() to also include a packet_info pointer.
there are many reasons why some protocols actually need to be able to access the pinfo structure while determining the pdu size



svn path=/trunk/; revision=19751
2006-10-31 09:29:07 +00:00
Ronnie Sahlberg daa7210867 fix for 1148
pretty horrible hack to store an ntlmssp blob inside an ldap string

the info column is not entirely pretty but   the payload is at least decoded


svn path=/trunk/; revision=19490
2006-10-11 08:18:14 +00:00
Graeme Lunt 3001ad5169 When dissecting LDAP, the assumption was made that the maximum LDAP PDU size will be 65535. Anything bigger than this was considered not to be LDAP. However, LDAP can have PDU sizes bigger than this - a CRL can easily grow to be bigger than this, for example.
This patch makes the the maximum valid LDAP PDU size a preference. The default value for this new preference is 65535 for backwards compatibility.


svn path=/trunk/; revision=19288
2006-09-22 15:19:32 +00:00
Ronnie Sahlberg 7bed417e5e make dissect_nt_sid return ep allocated memory and thus fix a few memory leaks
(this function is often called from dcerpc dissectors)


svn path=/trunk/; revision=19243
2006-09-16 09:20:34 +00:00
Ronnie Sahlberg cf6d4692aa in LDAP over TCP
use tcp_dissect_pdus() which works    insterad of trying to do the pdu tracking and signalling for reassembly manually.
This makes ldap pdu tracking and reassembly work properly for cases when hosts are streaming lpad over tcp and there is little or none alignlemt of pdus to the start of a segment



svn path=/trunk/; revision=18965
2006-08-20 06:00:16 +00:00
Guy Harris 338f7ede99 Squelch a compiler warning.
svn path=/trunk/; revision=18954
2006-08-19 02:56:16 +00:00
Tomas Kukosa 5cd8c719e6 ASN.1 dissectors regenerated with new asn2wrs to get updated field blurb
svn path=/trunk/; revision=18921
2006-08-16 05:58:39 +00:00
Ronnie Sahlberg 5f8e067936 for sec descriptors found inside ldap
decode the specific bits of the accessmask as the ldap specific accessmask bits

bit definitions from samba4


svn path=/trunk/; revision=18881
2006-08-11 07:59:58 +00:00
Ronnie Sahlberg 8969e45027 marik the request_in/response_to/time as generated fields
svn path=/trunk/; revision=18846
2006-08-07 10:35:26 +00:00
Ronnie Sahlberg 5a5dcdc8ad dissect nTSecurityDescriptor attribute as a security descriptor
svn path=/trunk/; revision=18845
2006-08-07 10:29:39 +00:00
Ronnie Sahlberg 5823354433 objectSid attribute contains a sid so decode it nively as a sid
svn path=/trunk/; revision=18844
2006-08-07 10:19:37 +00:00
Ronnie Sahlberg 2d5ec44674 add some more oid's
svn path=/trunk/; revision=18843
2006-08-06 14:31:58 +00:00
Ronnie Sahlberg b446810939 the ldap values for supportedControl and supportedCapabilities is an oid in ascii format.
resolve it into a anme if possible and present it.




svn path=/trunk/; revision=18842
2006-08-06 14:04:07 +00:00
Ronnie Sahlberg 3ef9bcfa26 "objectGUID" should be dissected as a GUID
also change the name of one of the strings we keep around since it is more generic than just used for attributeassertions



svn path=/trunk/; revision=18841
2006-08-06 13:13:42 +00:00
Gerald Combs d4819d4690 Make sure our strings aren't null before we pass them to strncmp().
svn path=/trunk/; revision=18723
2006-07-12 18:12:15 +00:00
Ronnie Sahlberg ed3e02ed61 prettify dissection od ldap attributes
special case some common special attributes such as DomainSid and DomainGuid
and dissect them as SIDs and GUIDs

examples of these special attributes can be seen in Xiaoguang Liu's email to wireshark dev



svn path=/trunk/; revision=18719
2006-07-12 09:02:00 +00:00
Gerald Combs e212e73354 Reset ldm_tree in dissect_ldap_pdu(). Fixes a couple of the current fuzz
bugs.

svn path=/trunk/; revision=18697
2006-07-10 13:42:59 +00:00
Gerald Combs 3ec4dc74e8 Fix a format string bug. This should fix some of the current fuzz
crashes.

svn path=/trunk/; revision=18666
2006-07-05 19:14:59 +00:00
Ronnie Sahlberg d0aae6dd3e from metze
prettify dissection of filters containing substring and extensiblematch



svn path=/trunk/; revision=18617
2006-06-29 21:04:37 +00:00
Gerald Combs 835afe4a96 Reset ldm_tree to NULL each time we dissect an LDAP packet. This should
fix a current Buildbot crash.  Fix up whitespace.

svn path=/trunk/; revision=18601
2006-06-28 22:07:23 +00:00
Tomas Kukosa 56d7db0c08 remove functions register_ber_oid_name() and get_ber_oid_name() from packet-ber.c, they were only OID but not BER related
use add_oid_str_name() and get_oid_str_name() instead of them

svn path=/trunk/; revision=18595
2006-06-28 14:19:08 +00:00