Skip to content

Commit

Permalink
Merge pull request #277 from DeemOnSecurity/bug/access-log-parser-fixes
Browse files Browse the repository at this point in the history
Bug/access-log-parser-fixes
  • Loading branch information
jullrich authored Jul 31, 2023
2 parents 7db8a91 + b0aefda commit a99164e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 3 additions & 3 deletions srv/dshield/access_log_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
parseline = re.compile('^(\S+)\s(\S+) \S+ \S+ \[([^\]]+)\]\s"([^"]+)" ([0-9]{3}) [0-9]+ "[^"]+" "([^"]+)"$')
isip = re.compile('^([0-9\.]+)')
logs = []
starttime = None
starttime = 0
try:
with open("lastweblogtime.txt") as file:
starttime = file.read()
starttime = int(starttime.strip())
starttime = file.read().strip()
starttime = int(starttime)
except:
pass
if not starttime:
Expand Down
2 changes: 2 additions & 0 deletions srv/isc-agent/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ sqlalchemy = "~=1.4.31"
cryptography = "==3.4.6"
twisted = {extras = ["all_non_platform", "http2"], version = "~=22.10.0"}
defusedxml = "~=0.7.1"
python-dateutil="*"

[tool.poetry.group.dev.dependencies]
pytest = "*"
Expand All @@ -25,6 +26,7 @@ coverage = "*"
factory-boy = "*"
markdown = "*"
tox = "*"

[build-system]
requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api"

0 comments on commit a99164e

Please sign in to comment.