Merge pull request #981 from Macmod/master

Adding information about godap & ldapx.

network-services-pentesting/pentesting-ldap.md

@@ -345,7 +345,19 @@ By default is is installed in: _/opt/jxplorer_
 
 ### Godap
 
-You can access it in [https://github.com/Macmod/godap](https://github.com/Macmod/godap)
+Godap is an interactive terminal user interface for LDAP that can be used to interact with objects and attributes in AD and other LDAP servers. It is available for Windows, Linux and MacOS and supports simple binds, pass-the-hash, pass-the-ticket & pass-the-cert, along with several other specialized features such as searching/creating/changing/deleting objects, adding/removing users from groups, changing passwords, editing object permissions (DACLs), modifying Active-Directory Integrated DNS (ADIDNS), exporting to JSON files, etc.
+
+![](<../.gitbook/assets/godap.png>)
+
+You can access it in [https://github.com/Macmod/godap](https://github.com/Macmod/godap). For usage examples and instructions read the [Wiki](https://github.com/Macmod/godap/wiki).
+
+### Ldapx
+
+Ldapx is a flexible LDAP proxy that can be used to inspect & transform LDAP traffic from other tools. It can be used to obfuscate LDAP traffic to attempt to bypass identity protection & LDAP monitoring tools and implements most of the methods presented in the [MaLDAPtive](https://www.youtube.com/watch?v=mKRS5Iyy7Qo) talk.
+
+![](<../.gitbook/assets/ldapx.png>)
+
+You can get it from [https://github.com/Macmod/ldapx](https://github.com/Macmod/ldapx).
 
 ## Authentication via kerberos