Skip to content

Bugfix: resolve invalid references #145

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
jullrich merged 2 commits into from
Mar 26, 2020
Merged

Bugfix: resolve invalid references #145

jullrich merged 2 commits into from
Mar 26, 2020

Conversation

@lightswitch05
Copy link
Contributor

@lightswitch05 lightswitch05 commented Mar 16, 2020

Fix Traceback in /srv/dshield/fwlogparser.py

Checking my syslog, I noticed a traceback in fwlogparser.py:

Mar 16 00:00:22 honeypot systemd[1]: Starting Rotate log files...
Mar 16 00:00:23 honeypot logrotate[19452]: Traceback (most recent call last):
Mar 16 00:00:23 honeypot logrotate[19452]:   File "/srv/dshield/fwlogparser.py", line 106, in <module>
Mar 16 00:00:23 honeypot logrotate[19452]:     d = DshieldSubmit('')
Mar 16 00:00:23 honeypot logrotate[19452]:   File "/srv/dshield/DShield.py", line 49, in __init__
Mar 16 00:00:23 honeypot logrotate[19452]:     self.readconfig(filename)
Mar 16 00:00:23 honeypot logrotate[19452]:   File "/srv/dshield/DShield.py", line 162, in readconfig
Mar 16 00:00:23 honeypot logrotate[19452]:     if os.path.isfile(home+'/etc/dshield.ini'):
Mar 16 00:00:23 honeypot logrotate[19452]: TypeError: unsupported operand type(s) for +: 'NoneType' and 'str'
Mar 16 00:00:23 honeypot logrotate[19452]: error: error running non-shared prerotate script for /var/log/dshield.log of '/var/log/dshield.log
Mar 16 00:00:23 honeypot logrotate[19452]: '

By providing a default value for HOME, the type error will no longer occur.

Correct log reference when using an alt config

I have not experienced issues with this fix, but I noticed that s is never defined. I corrected the log message to use the value from args['-c']

@lightswitch05
Copy link
Contributor Author

lightswitch05 commented Mar 26, 2020 •
edited
Loading

Any comments on this change?

@jullrich
Copy link
Contributor

jullrich commented Mar 26, 2020

sorry I missed these. So thanks for the "bump". Just approved them / merging them now.

@jullrich jullrich merged commit 057c932 into DShield-ISC:master Mar 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jullrich jullrich jullrich approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@lightswitch05 @jullrich