Skip to content

updating to current BD release for issue #86 #15

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 76 commits into from
Dec 30, 2019
Merged

updating to current BD release for issue #86 #15

merged 76 commits into from
Dec 30, 2019

Conversation

russhaun
Copy link
Owner

No description provided.

captainwasabi and others added 30 commits June 9, 2019 21:20
@captainwasabi
Add log message text as a config setting
6c7a038
@captainwasabi
add log messages as config vars
f0b66fb
Merge pull request #77 from captainwasabi/master
6f0a557 
Add log messages as config variables
@corelanc0d3r
adding feature to block class C ranges instead of individual IP addre…
e1f95e6 
…sses
@corelanc0d3r
Update config
fcf9dbe 
add config to allow blocking class C ranges instead of individual IP addresses
@corelanc0d3r
create folder if it doesn't exist already
f59f68c
@corelanc0d3r
≈Merge branch 'master' of https://github.com/corelan/artillery
ff7bd6b
@corelanc0d3r
additional changes
28915a1
@corelanc0d3r
verbose error message
f607e43
@corelanc0d3r
avoid inet_aton issues
03cf7fb
@corelanc0d3r
avoid crash if no UDPPORTS is empty
fb9b9f5
@corelanc0d3r
updated README
961727c
@corelanc0d3r
minor update
8efb767
@corelanc0d3r
updated gitignore
e9da7cd
@corelanc0d3r
updated gitignore
aa351a6
@corelanc0d3r
print exception info when unable to connect to mail server
e274247
@corelanc0d3r
print host:port in error message
5425738
Merge pull request #80 from corelan/master
a4d0aa6 
Added feature to block entire class C network instead of individual IP
@HackingDave
remove config from gitignore
00ccafe
@corelanc0d3r
changed way how banlist.txt gets loaded into iptables, added some lin…
51b46cb 
…es to console logging
@corelanc0d3r
improvements, verbose logging
93cfcdd
@corelanc0d3r
add entry to syslog when opening port for honeypot
0a4dc57
@corelanc0d3r
correct index
3ebe47c
@corelanc0d3r
minor improvements
ebc675f
@corelanc0d3r
wait for flush to finish
1745a76
@corelanc0d3r
add hostname in email subject field
5792f55
Merge pull request #81 from corelan/master
29103cd 
changed the way banlist.txt gets loaded in iptables chain - (performance improvement)
@corelanc0d3r
send email when Artillery is not able to bind to tcp or udp port
0ea2cee
Merge pull request #82 from corelan/master
46ccd4e 
send email when Artillery is not able to bind to tcp or udp port
@corelanc0d3r
log error in syslog if artillery fails to start
209c6b2
corelanc0d3r and others added 28 commits December 24, 2019 12:21
@corelanc0d3r
change syslog message format
9c275a4
@corelanc0d3r
check if IP is whitelisted before banning during initial massload
8bbf808
@corelanc0d3r
also check whitelist in ban() function
4da2020
@corelanc0d3r
threat server: allow multiple files
38ce2aa
@corelanc0d3r
create banner in localbanlist.txt
842202d
@corelanc0d3r
print full path
d4c2dee
@corelanc0d3r
allow reading feed from a local file. simply provide the full path as…
d82b2cf 
… part of the THREAT_FEED config variable
@corelanc0d3r
update syslog message
4c980ff
@corelanc0d3r
easy on the logging :)
1a86113
@corelanc0d3r
change syslog message format
3bc1456
@corelanc0d3r
Add support for %time%, %ip% and %port% variables in log_message_ban …
a7e3cd0 
…and log_message_alert
@corelanc0d3r
Add support for %time%, %ip% and %port% variables in log_message_ban …
88ddb4d 
…and log_message_alert
@corelanc0d3r
small code change
ec21847
@corelanc0d3r
add syslog message when honeypot sees a connection
85957f4
@corelanc0d3r
port, not 0.0.0.0 :)
df3bd6e
@corelanc0d3r
bug fix
540f49d
@corelanc0d3r
improve error message in syslog
731493b
@corelanc0d3r
avoid honeypot issues when unable to close the socket
28168cf
@corelanc0d3r
also load contents from localbanlist, if enabled
457fab8
@corelanc0d3r
tell log what we're doing
2484a96
@corelanc0d3r
Try to bind to a port a number of times before giving up
2ff9d64
@corelanc0d3r
better handling in case no TCPPORTS or UDPPORTS are set
2c666b6
Merge pull request #85 from corelan/master
6b5d2eb 
remove need to host "config" file from github
@HackingDave
remove config, no longer needed, is generated upon running artillery
969ef3d
@corelanc0d3r
attempt to detect and fix git pull merge conflicts - for those of you…
8960824 
… have have auto_update set to 'on'
@corelanc0d3r
update message
ee8f283
@corelanc0d3r
aaaargh - alerttype 2 of course
99f4ba6
Merge pull request #87 from corelan/master
b67b2eb 
attempt to detect and fix git pull merge conflicts - for those of you…
@ghost
Copy link

ghost commented Dec 30, 2019

DeepCode's analysis on #b67b2e found:

  • ❌ 1 critical issue. ⚠️ 2 warnings and 14 minor issues. ✔️ 5 issues were fixed.
  • We show critical issues and security vulnerabilities below 👇.

List of critical issues

Description of the issue ❌ Example fixes
Unsanitized input flows from data from a remote resource and is used as a shell command in subprocess.Popen. This may result in a Command Injection vulnerability. Occurrences: Example fixes 🔧

💬 This comment has been generated by the DeepCode bot, installed by the owner of the repository. The DeepCode bot protects your repository by detecting and commenting on security vulnerabilities or other critical issues.

☺️ If you want to provide feedback on our bot, here is how to contact us.

@russhaun russhaun merged commit b50293c into russhaun:issue_86_bd Dec 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@russhaun @captainwasabi @corelanc0d3r @HackingDave