updating readme, discord integ, merged PRs, examples fixed

.github/workflows/python-windows-exe.yml

@@ -69,13 +69,18 @@ jobs:
       with:
         webhook: ${{ secrets.DISCORD_WEBHOOK }}
         status: ${{ job.status }}
-        content: "Hey <@here>! New build happened for project ${{ github.event.repository.name }}!"
-        title: "build"
-        description: |
-          Version ${{ github.event.release.tag_name }}
-          Click [here](${{ github.event.release.html_url }}) to download!
-        #image: ${{ secrets.EMBED_IMAGE }}
-        color: 0x0000ff
+        content: |
+          ${{ github.event_name == 'push' && format('Hey @here! A new commit was pushed to {0}!', github.repository) || '' }}
+          ${{ github.event_name == 'pull_request' && format('Hey @here! A new pull request has been opened on {0}!', github.repository) || '' }}
+          ${{ github.event_name == 'release' && format('Hey @here! A new release was created for project {0}!', github.event.repository.name) || '' }}
+        title: |
+          ${{ github.event_name == 'push' && 'Push Notification' || '' }}
+          ${{ github.event_name == 'pull_request' && 'Pull Request Notification' || '' }}
+          ${{ github.event_name == 'release' && 'Release Notification' || '' }}
+        color: |
+          ${{ github.event_name == 'push' && '0x00ff00' || '' }}
+          ${{ github.event_name == 'pull_request' && '0xff0000' || '' }}
+          ${{ github.event_name == 'release' && '0x0000ff' || '' }}
         url: "${{ github.server_url }}/${{ github.repository }}"
         username: GitHub Actions
         avatar_url: "https://avatars.githubusercontent.com/u/19204702"

README.md

@@ -2,15 +2,17 @@
 
 ## :triangular_flag_on_post: Sponsors
 
-If you like this project, consider sponsoring it on GitHub! [Sponsors](https://github.com/sponsors/skelsec/)
+If you like this project, consider purchasing licenses of [OctoPwn](https://octopwn.com/), our full pentesting suite that runs in your browser!  
+For notifications on new builds/releases and other info, hop on to our [Discord](https://discord.gg/PM8utcNxMS)
 
 # msldap
 LDAP library for MS AD
 ![Documentation Status](https://user-images.githubusercontent.com/19204702/81515211-3761e880-9333-11ea-837f-bcbe2a67ee48.gif )
 
-## :triangular_flag_on_post: Sponsors
+## :triangular_flag_on_post: Runs in the browser
 
-If you want to sponsor this project, you can do it on GitHub now!
+This project, alongside with many other pentester tools runs in the browser with the power of OctoPwn!  
+Check out the community version at [OctoPwn - Live](https://live.octopwn.com/)
 
 # Documentation
 [Awesome documentation here!](https://msldap.readthedocs.io/en/latest/)
@@ -98,9 +100,9 @@ Detailed explanation with examples:
 	ldap+plain://TEST\\victim:<password>@10.10.10.2 (SASL SIMPLE auth)
 	ldap+ntlm-password://TEST\\victim:<password>@10.10.10.2
 	ldap+ntlm-nt://TEST\\victim:<nthash>@10.10.10.2
-	ldap+kerberos-password://TEST\\victim:<password>@10.10.10.2
-	ldap+kerberos-rc4://TEST\\victim:<rc4key>@10.10.10.2
-	ldap+kerberos-aes://TEST\\victim:<aes>@10.10.10.2
+	ldap+kerberos-password://TEST\\victim:<password>@<hostname>/?dc=10.10.10.2
+	ldap+kerberos-rc4://TEST\\victim:<rc4key>@<hostname>/?dc=10.10.10.2
+	ldap+kerberos-aes://TEST\\victim:<aes>@<hostname>/?dc=10.10.10.2
 	ldap://TEST\\victim:[email protected]/DC=test,DC=corp/
 	ldap://TEST\\victim:[email protected]/DC=test,DC=corp/?timeout=99&proxytype=socks5&proxyhost=127.0.0.1&proxyport=1080&proxytimeout=44
 ```

msldap/examples/msldapclient.py

@@ -1686,23 +1686,23 @@ def main():
 Username and password authentication using NTLM over SSL/TLS:
 	ldaps+ntlm-password://TEST\\victim:[email protected]
 Username and password authentication using Kerberos over plaintext LDAP:
-	ldap+kerberos-password://TEST\\victim:password@10.10.10.2/?dc=10.10.10.2
+	ldap+kerberos-password://TEST\\victim:password@<hostname>/?dc=10.10.10.2
 Username and password authentication using Kerberos over SSL/TLS:
-	ldaps+kerberos-password://TEST\\victim:password@10.10.10.2/?dc=10.10.10.2
+	ldaps+kerberos-password://TEST\\victim:password@<hostname>/?dc=10.10.10.2
 NTLM authentication using the NT hash over plaintext LDAP:
 	ldap+ntlm-nt://TEST\\victim:<NThash>@10.10.10.2
 Kerberos authentication using the RC4 key over plaintext LDAP:
-	ldap+kerberos-rc4://TEST\\victim:<RC4key>@10.10.10.2/?dc=10.10.10.2
+	ldap+kerberos-rc4://TEST\\victim:<RC4key>@<hostname>/?dc=10.10.10.2
 SICILY authentication using the NT hash over plaintext LDAP:
 	ldap+sicily-nt://TEST\\victim:<NThash>@10.10.10.2
 Kerberos authentication using AES key over plaintext LDAP:
-	ldap+kerberos-aes://TEST\\victim:<AESkey>@10.10.10.2/?dc=10.10.10.2
+	ldap+kerberos-aes://TEST\\victim:<AESkey>@<hostname>/?dc=10.10.10.2
 Kerberos authentication using CCACHE file over plaintext LDAP:
-	ldap+kerberos-ccache://TEST\\victim:<CCACHEfile>@10.10.10.2/?dc=10.10.10.2
+	ldap+kerberos-ccache://TEST\\victim:<CCACHEfile>@<hostname>/?dc=10.10.10.2
 Kerberos authentication using keytab file over plaintext LDAP:
-	ldap+kerberos-keytab://TEST\\victim:<KEYTABfile>@10.10.10.2/?dc=10.10.10.2
+	ldap+kerberos-keytab://TEST\\victim:<KEYTABfile>@<hostname>/?dc=10.10.10.2
 Kerberos authentication using P12 or PFX file over plaintext LDAP (notice that keyfile password is at the 'password' filed):
-	ldap+kerberos-pfx://TEST\\victim:admin@10.10.10.2/?dc=10.10.10.2&keydata=<P12file>
+	ldap+kerberos-pfx://TEST\\victim:admin@<hostname>/?dc=10.10.10.2&keydata=<P12file>
 SSL authentication using P12 or PFX file over plaintext LDAP, automatically performs STARTTLS:
 	ldap+ssl://10.10.10.2/?sslcert=<P12file>&sslpassword=<P12password>'
 SSL authentication using P12 or PFX file over SSL/TLS LDAP: