From daa4487a92fb773bd090ded8cf5006ab1daa2f1a Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Sat, 11 Jun 2022 10:07:52 -0700 Subject: [PATCH] Changes to Confluence access log parser for pyparsing 2.4 #4137 (#4138) --- plaso/parsers/confluence_access.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plaso/parsers/confluence_access.py b/plaso/parsers/confluence_access.py index a7a8630730..621deff8e1 100644 --- a/plaso/parsers/confluence_access.py +++ b/plaso/parsers/confluence_access.py @@ -97,7 +97,7 @@ class ConfluenceAccessParser(text_parser.PyparsingSingleLineTextParser): pyparsing.Word(pyparsing.alphanums + '-').setResultsName('thread_name') ) - _USER_AGENT = pyparsing.rest_of_line.setResultsName('user_agent') + _USER_AGENT = pyparsing.restOfLine.setResultsName('user_agent') _USER_NAME = ( pyparsing.Word(pyparsing.alphanums + '@' + pyparsing.alphanums + '.') | @@ -105,7 +105,7 @@ class ConfluenceAccessParser(text_parser.PyparsingSingleLineTextParser): pyparsing.Literal('-')).setResultsName('user_name') _HTTP_METHOD = ( - pyparsing.one_of( + pyparsing.oneOf( ['CONNECT', 'DELETE', 'GET', 'HEAD', 'OPTIONS', 'PATCH', 'POST', 'PUT', 'TRACE'])).setResultsName('http_method')