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.

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

Http mixin default http header overwrites bot configuration #2137

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Http mixin default http header overwrites bot configuration #2137

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7011740
Merge pull request #1 from certtools/develop
Narzhan Jan 12, 2022
26eff3e
Fix for default overwriting the bot configration
Narzhan Jan 12, 2022
43e15d2
Fixed unreachable section of user agent substitution
Narzhan Jan 12, 2022
f06b8d4
Incorrect value check replaced
Narzhan Jan 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions intelmq/lib/mixins/http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ class HttpMixin:

def __init__(self, **kwargs):
self.logger.debug("Running HTTP Mixin initialization.")
self.http_header = {}
super().__init__()

def setup(self):
Expand All @@ -70,9 +69,9 @@ def setup(self):
self.__auth = (self.http_username, self.http_password)
self.__session.auth = self.__auth
# headers settings
if self.http_header is not None:
if self.http_header:
self.__session.headers.update(self.http_header)
elif self.http_user_agent is not None:
if self.http_user_agent:
self.__session.headers.update({"User-Agent": self.http_user_agent})

# proxy settings
Expand Down