Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kippo Honeypot Detect #174

Merged
merged 24 commits into from Jul 9, 2018
Merged

Kippo Honeypot Detect #174

merged 24 commits into from Jul 9, 2018

Conversation

pradeepjairamani
Copy link
Contributor

@pradeepjairamani pradeepjairamani commented Jun 28, 2018

Checklist

  • I have followed the Contributor Guidelines.
  • I have added the relevant documentation.
  • My branch is up-to-date with the Upstream master branch.

Changes proposed in this pull request

  • Kippo Honeypot Detection payload
  • updated requirements.txt with updated modules
  • New info for admin scan
  • Added POP3 Service scanner signature
  • Added XMPP service scanner signature
  • Updated nettacker update mechanism to daily basis instead of doing it on every scan by saving and fetching previous scan data.
  • header based blind sql injection payload added

Your development environment

  • OS: Kali
  • OS Version: 2.0
  • Python Version: 2.7.3

@Ali-Razmjoo
Copy link
Collaborator

Hi, thanks for your contribution, please add readme file and add a sample usage in it. also fix the config file (check for update should be true). regards.

@OWASP OWASP deleted a comment Jul 1, 2018
@OWASP OWASP deleted a comment Jul 1, 2018
@OWASP OWASP deleted a comment Jul 1, 2018
@OWASP OWASP deleted a comment Jul 1, 2018
@OWASP OWASP deleted a comment Jul 1, 2018
@OWASP OWASP deleted a comment Jul 1, 2018
@OWASP OWASP deleted a comment Jul 1, 2018
@OWASP OWASP deleted a comment Jul 1, 2018
@OWASP OWASP deleted a comment Jul 2, 2018
@OWASP OWASP deleted a comment Jul 2, 2018
@OWASP OWASP deleted a comment Jul 2, 2018
@OWASP OWASP deleted a comment Jul 4, 2018
@OWASP OWASP deleted a comment Jul 4, 2018
@OWASP OWASP deleted a comment Jul 4, 2018
@Ali-Razmjoo
Copy link
Collaborator

@shaddygarg please review @pradeepjairamani's code regarding this PR and confirm if it's ready to merge.

@shaddygarg
Copy link
Contributor

Sure @Ali-Razmjoo

Copy link
Contributor

@shaddygarg shaddygarg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please look at the review comments that I have made and let me know if I got it wrong somewhere!!

@@ -6,6 +6,10 @@

Base = declarative_base()

class Update_Log(Base):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pradeepjairamani, please add a docstring for class detailing what is meant to do. And every class in models.py should have a __repr__(self) function so that its representation is easier to see while debugging, please make one here.

{'HOST': target_to_host(target), 'USERNAME': '', 'PASSWORD': '', 'PORT': '', 'TYPE': 'admin_scan',
'DESCRIPTION': messages(language, "no_open_ports"), 'TIME': now(), 'CATEGORY': "scan", 'SCAN_ID': scan_id,
'SCAN_CMD': scan_cmd})
'DESCRIPTION': messages(language, "direcroty_file_404").format(target, "default_port"), 'TIME': now(), 'CATEGORY': "scan", 'SCAN_ID': scan_id,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pradeepjairamani, you have replaced "no_open_ports" with "direcroty_file_404". Is this done intentionally? If so, you have mistyped the spelling for directory as direcroty. Please correct this!!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was done intentionally and thanks for letting me know about the spelling mistake

core/update.py Outdated
except Exception:
save_update_log(language)
logs = (get_update_log(language))
logs2 = (logs[len(logs)-2].last_update_time)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pradeepjairamani, why have you used logs[len(logs)-2]?

@OWASP OWASP deleted a comment Jul 6, 2018
@pradeepjairamani
Copy link
Contributor Author

Hey @shaddygarg ,
I have made the changes Please review again

@OWASP OWASP deleted a comment Jul 6, 2018
Copy link
Contributor

@shaddygarg shaddygarg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. @Ali-Razmjoo I think this can be merged.

core/update.py Outdated
def _update(__version__, __code_name__, language, socks_proxy):
"""
update the framework

Args:
Args/:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did you mean Args:?

__version__: version number
__code_name__: code name
language: language
socks_proxy: socks proxy

Returns:
Returns:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

5 spaces?

database/db.py Outdated
@@ -15,7 +15,7 @@
from core import compatible
from api.api_core import __structure
from core.config import _database_config

from datetime import datetime
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

from core._time import now ?

import sys
import socket

def recv_all(s, limit=4196):
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you may use from lib.payload.scanner.service.engine import recv_all to prevent duplicated code, I should mention I used duplicate in ics_honeypot because it's standalone and run from another directory, but since it's a module please use from lib.payload.scanner.service.engine import recv_all

@OWASP OWASP deleted a comment Jul 7, 2018
@OWASP OWASP deleted a comment Jul 8, 2018
@OWASP OWASP deleted a comment Jul 8, 2018
@OWASP OWASP deleted a comment Jul 8, 2018
@OWASP OWASP deleted a comment Jul 8, 2018
@@ -1,287 +0,0 @@
#!/usr/bin/env python
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you removed the whole file by mistake!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes i did but I added it back again.

@Ali-Razmjoo Ali-Razmjoo merged commit 313da5a into OWASP:master Jul 9, 2018
Nettacker version 0.0.2 automation moved this from To do to Done Jul 9, 2018
@Ali-Razmjoo
Copy link
Collaborator

thanks @pradeepjairamani for your contribution, thanks @shaddygarg for reviewing, PR merged.

regards.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants